Commit 338ec5ad authored by liuyuzhen's avatar liuyuzhen

订单支付结果

parent a3c34e56
...@@ -965,6 +965,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -965,6 +965,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderIds = array(); $orderIds = array();
$orderNos = array(); $orderNos = array();
$orderState = \Our\ApiConst::one; $orderState = \Our\ApiConst::one;
$dlyoPickupCode = \Our\NameConst::emptyString;
foreach ($orderList as $order) { foreach ($orderList as $order) {
$orderNos[] = $order['order_sn']; $orderNos[] = $order['order_sn'];
if ($order['order_state'] == \Our\ApiConst::orderStateWaitPay) { if ($order['order_state'] == \Our\ApiConst::orderStateWaitPay) {
...@@ -995,7 +996,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -995,7 +996,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderContent['payway'] = \Our\DescribeConst::afterPay; $orderContent['payway'] = \Our\DescribeConst::afterPay;
} }
$orderContent['orderAmount'] = $order['order_amount']; $orderContent['orderAmount'] = $order['order_amount'];
$orderContent['dlyoPickupCode'] = substr($order['order_sn'], ApiConst::positionPickupCodeBegin); $dlyoPickupCode = substr($order['order_sn'], ApiConst::positionPickupCodeBegin);
$orderContents[]=$orderContent; $orderContents[]=$orderContent;
} }
$orderIds[] = $order['order_id']; $orderIds[] = $order['order_id'];
...@@ -1024,6 +1025,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -1024,6 +1025,7 @@ class OrderServiceModel extends \Business\AbstractModel
$return['orderTips'] = $orderTips; $return['orderTips'] = $orderTips;
$return['orderSubTips'] = $orderSubTips; $return['orderSubTips'] = $orderSubTips;
$return['orderContents'] = $orderContents; $return['orderContents'] = $orderContents;
$return['dlyoPickupCode'] =$dlyoPickupCode;
$return['coupons'] = $this->getGiftCouponsByOrderIds($orderIds, $memberId); $return['coupons'] = $this->getGiftCouponsByOrderIds($orderIds, $memberId);
return $return; return $return;
} }
......
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