feat: 对接erp

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

@@ -56,6 +56,12 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
     @Autowired
     private IFsStoreProductService fsStoreProductService;
 
+    @Autowired
+    private FsStoreDeliversMapper fsStoreDeliversMapper;
+
+    @Autowired
+    private FsStoreAfterSalesMapper fsStoreAfterSalesMapper;
+
     @Override
     public ErpOrderResponse addOrder(ErpOrder order) {
         FsStoreOrder fsStoreOrder = fsStoreOrderService.selectFsStoreOrderByOrderCode(order.getPlatform_code());
@@ -88,8 +94,10 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
         // 支付金额
         shopOrderDTO.setPayAmount(erpOrderPayment.getPayment());
         // 运费
-        if(ObjectUtils.isEmpty(order.getPost_fee())) {
+        if(ObjectUtil.isNotNull(fsStoreOrder.getPayPostage())) {
             shopOrderDTO.setFreight(Double.valueOf("0.00"));
+        } else {
+            shopOrderDTO.setFreight(fsStoreOrder.getPayPostage().doubleValue());
         }
         // 备注
         shopOrderDTO.setRemark(order.getBuyer_memo());
@@ -274,11 +282,7 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
         return erpOrder;
     }
 
-    @Autowired
-    private FsStoreDeliversMapper fsStoreDeliversMapper;
 
-    @Autowired
-    private FsStoreAfterSalesMapper fsStoreAfterSalesMapper;
     @Override
     public BaseResponse refundUpdate(ErpRefundUpdateRequest param) {
 
@@ -290,7 +294,7 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
 
         // 发货后退款
         if(ObjectUtil.isNotNull(byOrderCode)){
-            
+
         } else {
             // 如果是发货前退款，直接走取消订单流程
             // 如果是发货后退款，走售后流程

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -924,7 +924,7 @@ public interface FsStoreOrderMapper
 
     List<JSONObject> selectTuiMoneyCounts(Map<String, Object> map);
 
-    @Select("select * from fs_store_order where status = 1 and extend_order_id is not null and order_code='1935632146915917824'")
+    @Select("select * from fs_store_order where status = 1 and extend_order_id is not null")
     List<FsStoreOrder> selectUpdateExpress();
     @Select({"<script> " +
             "SELECT ANY_VALUE(json_info) json,SUM(num) num FROM fs_store_order_item   WHERE order_id IN (SELECT id FROM fs_store_order WHERE `status`>0  " +