Merge remote-tracking branch 'origin/developer' into developerD

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

@@ -2194,26 +2194,6 @@ public class ReceiptServiceImpl implements ReceiptService {
         relation.setAssociateAmount(cmCost);
         baseMapper.insertOrderReceiptRelation(relation);
         if (1 == shopOrderById.getReceiptStatus()) {
-            // 为服务费造的线下凭证付款数据
-            ReceiptPo receiptPo = new ReceiptPo();
-            receiptPo.setPayWay(2);
-            receiptPo.setDelFlag(0);
-            receiptPo.setReceiptDate(DateUtils.getDateTime());
-            receiptPo.setUpdateDate(DateUtils.getDateTime());
-            receiptPo.setConfirmDate(DateUtils.getDateTime());
-            receiptPo.setPayType(31);
-            receiptPo.setReceiptType(1);
-            receiptPo.setReceiptStatus(3);
-            receiptPo.setConfirmUserPermissionId(receiptUserId);
-            receiptPo.setReceiptUserPermissionId(receiptUserId);
-            receiptPo.setReviewUserPermissionId(receiptUserId);
-            receiptPo.setReceiptAmount(shopOrderById.getNeedPayAmount());
-            receiptPo.setRebateRemarks("关联服务费，人工数据");
-            receiptMapper.insertReceipt(receiptPo);
-            relation.setRelationType(2);
-            relation.setReceiptId(receiptPo.getId());
-            relation.setAssociateAmount(shopOrderById.getNeedPayAmount());
-            baseMapper.insertOrderReceiptRelation(relation);
             // 修改订单状态为已付款
             receiptMapper.updateReceiptStatus(shopOrderId);
         }

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

@@ -534,7 +534,7 @@ public class SubmitServiceImpl implements SubmitService {
                  * todo 协销订单，在添加保存时子订单的协销Id应该保存下单协销的协销Id
                  *      21年改为保存下单人userId，会对订单后续处理产生疑惑，后续应该继续保存协销id
                  */
-                shopOrder.setSpId(orderParamBo.getBuyUserId());
+                shopOrder.setSpId(orderParamBo.getServiceProviderId());
             }
             // 商品总数量
             AtomicInteger shopProductCount = new AtomicInteger(0);
@@ -2422,6 +2422,8 @@ public class SubmitServiceImpl implements SubmitService {
         shopOrder.setShopTaxFee(shopTaxFee.get());
         // 付供应商 = (商品费 + 运费 + 税费)* 供应商比例
         shopOrder.setShouldPayShopAmount(shouldPayShopAmount.get());
+        // 均摊优惠后子订单待支付金额
+        shopOrder.setRealNeedPay(shopOrder.getNeedPayAmount());
 
         orderProductList.forEach(o -> submitMapper.updateOrderProduct(o));
         /**