Merge branch 'zhongqi-discount' into dev

biz-hd/order/classes/OrderClass.php

@@ -296,6 +296,7 @@ class OrderClass extends BaseClass
                             $data['orderReachDiscountPrice'] = $cutAmount;
                             $data['actPrice'] = $actPrice;
                             $data['realPrice'] = $actPrice;
+                            $data['mainPay'] = $actPrice;
                         } else {
                             noticeUtil::push('订单金额不足满减金额，customId:' . $data['customId'], '15280215347');
                         }