Merge branch 'hotfix/making-order'

@@ -444,7 +444,8 @@ class IndexController extends WebAction
             $paymentId = $this->post('paymentId', 15); // 支付ID
             $paymentType = $this->post('paymentType', 1); // 默认在线支付
             $remark = $this->post('remark', ''); // 备注信息
-            $couponCode = $this->post('couponCode', null); // 优惠码
+            $couponCode = $this->post('couponCode', null); // 优惠券
+            $promotionCode = $this->post('promotionCode', null); // 优惠码
             $yohoCoin = $this->post('yohoCoin', 1); // YOHO币
             $isPreContact = $this->post('isPreContact', false); // 送货前是否联系
             $isPrintPrice = $this->post('isPrintPrice', true); // 是否打印价格
@@ -452,7 +453,7 @@ class IndexController extends WebAction
 
             // 调用下单接口
             $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTimeId, $deliveryWayId, $invoiceTitle, $invoiceId,
-                                          $paymentId, $paymentType, $remark, $couponCode, $yohoCoin, $isPreContact, $isPrintPrice, $redEnvelopes);
+                                          $paymentId, $paymentType, $remark, $couponCode, $promotionCode, $yohoCoin, $isPreContact, $isPrintPrice, $redEnvelopes);
             // 判断是否下单成功
             if (empty($result['data']['order_code'])) {
                 UdpLog::info('【结算信息】判断是否下单成功','order_code'.$result['data']['order_code']);