Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/models/Business/Order/OrderService.php

@@ -931,6 +931,14 @@ class OrderServiceModel extends \Business\AbstractModel
             }
             $orderIds[] = $order['order_id'];
         }
+        $waitOnelinePayAmount = \Our\ApiConst::zero;
+        if($orderState==\Our\ApiConst::zero){
+            foreach ($orderList as $order) {
+                if ($order['order_state'] == \Our\ApiConst::orderStateWaitPay) {
+                    $waitOnelinePayAmount += $order['order_amount'];
+                }
+            }
+        }
         $return['orderState'] = $orderState;
         if(isset($data['wxLitePayFlag'])&&$data['wxLitePayFlag']==\Our\ApiConst::one){
             $return['paySn'] = $data['paySn'];
@@ -943,6 +951,7 @@ class OrderServiceModel extends \Business\AbstractModel
 
         $return['orderNos'] = $orderNos;
         $return['totalOrderAmount'] = $totalOrderAmount;
+        $return['waitOnlinePayAmount'] = $waitOnelinePayAmount;
         $return['orderTips'] = $orderTips;
         $return['orderSubTips'] = $orderSubTips;
         $return['orderContents'] = $orderContents;