处理出台订单金额异常问题

fs-service/src/main/java/com/fs/erp/service/impl/JSTErpOrderServiceImpl.java

@@ -289,7 +289,8 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
             //注释掉总买家实付
             //shopOrderDTO.setBuyerPaidAmount(fsStoreOrder.getPayDelivery());
             //应付金额(货到付款= 订单总金额 - 已付金额)
-            shopOrderDTO.setPayAmount(fsStoreOrder.getTotalPrice().subtract(fsStoreOrder.getPayPrice()).doubleValue());
+//            shopOrderDTO.setPayAmount(fsStoreOrder.getTotalPrice().subtract(fsStoreOrder.getPayPrice()).doubleValue());已沟通改为实际支付金额
+            shopOrderDTO.setPayAmount(fsStoreOrder.getPayMoney().doubleValue());
 
             // 货到付款要推两次
             PaymentDTO paymentDTO2 = new PaymentDTO();

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -458,26 +458,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             log.error("修改商城订单地址推送到聚水潭ERP失败，orderId: {}", fsStoreOrder.getId(), e);
         }
 
-        FsStoreOrderScrm fsStoreOrderScrm = fsStoreOrderMapper.selectFsStoreOrderById(fsStoreOrder.getId());
-
-        //判断发货类型
-        if (fsStoreOrderScrm.getStatus() == 2 || fsStoreOrderScrm.getStatus() == 3) {//待收货
-            List<FsStoreOrderItemVO> scrmList = fsStoreOrderItemMapper.selectMyFsStoreOrderItemListByOrderId(fsStoreOrderScrm.getId());
-            if (!scrmList.isEmpty()) {
-                List<Long> orderItemIds = scrmList.stream().map(FsStoreOrderItemVO::getItemId).collect(Collectors.toList());
-                //获取溯源码，进行回退
-                List<FsStoreVerifyCodeScrm> verifyCodes = verifyCodeScrmMapper.selectList(new LambdaQueryWrapper<FsStoreVerifyCodeScrm>().eq(FsStoreVerifyCodeScrm::getOrderId, fsStoreOrder.getId()).in(FsStoreVerifyCodeScrm::getOrderItemId, orderItemIds).eq(FsStoreVerifyCodeScrm::getIsDel, "0"));
-                if (!verifyCodes.isEmpty()) {
-                    verifyCodes.forEach(v -> {
-                        v.setIsRecycle(0L);
-                    });
-                    //批量更新数据
-                    verifyCodeScrmService.updateBatchById(verifyCodes);
-                }
-
-            }
-        }
-
         return fsStoreOrderMapper.updateFsStoreOrder(fsStoreOrder);
     }