feat: 对接erp

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

@@ -150,15 +150,15 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
             shopOrderDTO.setPayAmount(fsStoreOrder.getPayPrice().doubleValue());
 
             // 货到付款要推两次
-            paymentDTO = new PaymentDTO();
+            PaymentDTO paymentDTO2 = new PaymentDTO();
             // 物流代收金额
-            paymentDTO.setAmount(fsStoreOrder.getPayDelivery().doubleValue());
-            paymentDTO.setOuterPayId(String.format("%s%d",order.getPlatform_code(),1));
-            paymentDTO.setPayDate(order.getDeal_datetime());
-            paymentDTO.setPayment("物流代收金额");
-            paymentDTO.setBuyerAccount(order.getBuyer_account());
-            paymentDTO.setSellerAccount("平台销售");
-            shopOrderDTO.setPay(paymentDTO);
+            paymentDTO2.setAmount(fsStoreOrder.getPayDelivery().doubleValue());
+            paymentDTO2.setOuterPayId(String.format("%s%d",order.getPlatform_code(),1));
+            paymentDTO2.setPayDate(order.getDeal_datetime());
+            paymentDTO2.setPayment("物流代收金额");
+            paymentDTO2.setBuyerAccount(order.getBuyer_account());
+            paymentDTO2.setSellerAccount("平台销售");
+            shopOrderDTO.setPay(paymentDTO2);
 
             FsJstCodPush fsJstCodPush = new FsJstCodPush();
             fsJstCodPush.setOrderId(fsStoreOrder.getOrderCode());
@@ -167,6 +167,8 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
             fsJstCodPush.setRetryCount(0);
             fsJstCodPush.setTaskStatus(TaskStatusEnum.PENDING.getCode());
             fsJstCodPushMapper.insert(fsJstCodPush);
+
+            shopOrderDTO.setPay(paymentDTO);
         }
 
         ErpOrderResponseDTO upload = jstErpHttpService.upload(shopOrderDTO);