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

application/models/Business/Order/OrderService.php

@@ -886,6 +886,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     $orderContent['payway'] = \Our\DescribeConst::afterPay;
                 }
                 $orderContent['orderAmount'] = $order['order_amount'];
+                $orderContents[]=$orderContent;
             }
             $orderIds[] = $order['order_id'];
         }