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

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

@@ -293,7 +293,7 @@ public class HeliPayServiceImpl implements HeliPayService {
         // 更新订单支付状态
         payOrderMapper.updateOrderStatus(order);
         // 支付记录
-        //todo 子订单返佣？？？？
+        //todo sql的or条件子订单返佣？？？？
         List<DiscernReceiptVo> shopOrderDiscernReceiptList = orderCommonMapper.getShopOrderDiscernReceipt(shopOrderId);
         double shopOrderReceiptAmount = 0d;
         if (null != shopOrderDiscernReceiptList && shopOrderDiscernReceiptList.size() > 0) {

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

@@ -1720,9 +1720,9 @@ public class SubmitServiceImpl implements SubmitService {
             }
             orderShopPos.add(shopOrder);
             //把原shoporderlist拆分的shop剔除，加入拆分后的shop
-            shopOrderList.removeIf(s -> s.getShopId().equals(shopOrder.getShopId()));
+//            shopOrderList.removeIf(s -> s.getShopId().equals(shopOrder.getShopId()));
         }
-        shopOrderList.addAll(orderShopPos);
+        shopOrderList=orderShopPos;
     }
 
     /**