Merge remote-tracking branch 'origin/developerC' into developerC

src/main/java/com/caimei365/order/mapper/PayOrderMapper.java

@@ -253,4 +253,6 @@ public interface PayOrderMapper {
     List<BankCodeVo> findB2CBankCode();
 
     String getSplitCodeByShopOrderId(Integer shopOrderId);
+
+    void updateBySplitStatusByNo(String orderRequestNo);
 }

src/main/java/com/caimei365/order/service/impl/HeliPayServiceImpl.java

@@ -753,7 +753,7 @@ public class HeliPayServiceImpl implements HeliPayService {
                 return "分账失败";
             }
             // 修改收款分账状态为1
-            payOrderMapper.updateBySplitStatus(orderRequestNo);
+            payOrderMapper.updateBySplitStatusByNo(orderRequestNo);
 
             List<SplitAccountPo> splitAccountList = payOrderMapper.getSplitAccountList(substring);
             if (splitAccountList != null && splitAccountList.size() > 0) {

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -1103,7 +1103,6 @@ public class SubmitServiceImpl implements SubmitService {
             //子订单分多子订单，满减分摊到原子订单分开的子订单，无满减重算佣金/应付
             //重组订单
             shopOrderList= findSplitShopOrder(orderProductList, shopOrderList, shops, orderParamBo);
-            log.info("赋值后的shop------------------》"+shopOrderList.toString());
             //线上支付分摊优惠总和到子订单
             //经理折扣+优惠券+满减 提交订单的时候无经理折扣
             double allDiscount = MathUtil.add(couponAmount, promotionFullReduction.get()).doubleValue();

src/main/resources/mapper/PayOrderMapper.xml

@@ -146,6 +146,9 @@
         receiptStatus = #{receiptStatus}, receiptAmount = #{receiptAmount},paySuccessCounter =#{paySuccessCounter}
         WHERE shopOrderID = #{shopOrderId}
     </update>
+    <update id="updateBySplitStatusByNo">
+        UPDATE cm_receipt_order_relation SET splitStatus = 1 WHERE orderRequestNo = #{orderRequestNo}
+    </update>
     <select id="getPayOnLineSwitch" resultType="java.lang.Integer">
         SELECT STATUS FROM cm_pay_online_switch WHERE id=1
     </select>