Commit f3274493 authored by liuyuzhen's avatar liuyuzhen

测试

parent 6ab52ae8
...@@ -889,7 +889,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -889,7 +889,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderSubTips = \Our\DescribeConst::payFailedSubTips; $orderSubTips = \Our\DescribeConst::payFailedSubTips;
$orderState = \Our\ApiConst::zero; $orderState = \Our\ApiConst::zero;
break; break;
} else if (($order['payment_type'] == \Our\ApiConst::payOffline&&$order['payment_type'] == \Our\ApiConst::payAog) && $order['order_state'] == \Our\ApiConst::orderStateWaitConfirm) {//已下单的待线上支付订单 } else if (($order['payment_type'] == \Our\ApiConst::payOffline||$order['payment_type'] == \Our\ApiConst::payAog) && $order['order_state'] == \Our\ApiConst::orderStateWaitConfirm) {//已下单的待线上支付订单
$orderTips = \Our\DescribeConst::addOrderSuccessTips; $orderTips = \Our\DescribeConst::addOrderSuccessTips;
$store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($order['store_id']), \Our\ApiConst::oneHour); $store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($order['store_id']), \Our\ApiConst::oneHour);
$orderContent['storeName'] = $store['store_name']; $orderContent['storeName'] = $store['store_name'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment