下单，退单及erp调试

fs-admin/src/main/resources/application.yml

@@ -10,5 +10,5 @@ spring:
 #    active: druid-sxjz
 #    active: druid-sft
 #    active: druid-fby
-    active: dev
+    active: dev-yjb
 

fs-service/src/main/java/com/fs/erp/service/IErpOrderService.java

@@ -16,7 +16,10 @@ public interface IErpOrderService
     ErpOrderResponse refundOrder(ErpRefundOrder order);
     ErpDeliverysResponse getDeliver(ErpDeliverysRequest param);
     ErpOrderQueryResponse getOrder(ErpOrderQueryRequert param);
+
     BaseResponse refundUpdate(ErpRefundUpdateRequest param);
+    BaseResponse refundUpdateScrm(ErpRefundUpdateRequest param);
+
     ErpOrderResponse finishOrder(ErpOrder order);
     //代服管家查物流状态
     void getOrderDeliveryStatus(FsStoreOrder order);

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

@@ -246,6 +246,11 @@ public class DfOrderServiceImpl implements IErpOrderService
         return refundOrder(erpRefundOrder);
     }
 
+    @Override
+    public BaseResponse refundUpdateScrm(ErpRefundUpdateRequest param) {
+        return null;
+    }
+
     @Override
     public ErpOrderResponse finishOrder(ErpOrder order) {
         return null;

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

@@ -134,6 +134,11 @@ public class ErpOrderServiceImpl implements IErpOrderService
         return response;
     }
 
+    @Override
+    public BaseResponse refundUpdateScrm(ErpRefundUpdateRequest param) {
+        return null;
+    }
+
     @Override
     public ErpOrderResponse finishOrder(ErpOrder order) {
         return null;

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

@@ -151,6 +151,11 @@ public class HzOMSErpOrderServiceImpl implements IErpOrderService {
         return res;
     }
 
+    @Override
+    public BaseResponse refundUpdateScrm(ErpRefundUpdateRequest param) {
+        return null;
+    }
+
     @Override
     public ErpOrderResponse finishOrder(ErpOrder order) {
         return null;

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

@@ -520,6 +520,34 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
         return baseResponse;
     }
 
+    @Override
+    public BaseResponse refundUpdateScrm(ErpRefundUpdateRequest param) {
+
+        FsStoreOrderScrm fsStoreOrder = fsStoreOrderScrmService.selectFsStoreOrderByOrderCode(param.getTid());
+        //todo 待合并
+//        FsStoreDelivers byOrderCode = fsStoreDeliversMapper.findByOrderCode(fsStoreOrder.getOrderCode());
+        //todo
+        // 发货后退款
+//        if(ObjectUtil.isNotNull(byOrderCode)){
+
+//        } else {
+        // 如果是发货前退款，直接走取消订单流程
+        // 如果是发货后退款，走售后流程
+        OrderCancelRequestDTO requestDTO = new OrderCancelRequestDTO();
+        requestDTO.setOIds(Collections.singletonList(Integer.valueOf(fsStoreOrder.getExtendOrderId())));
+        requestDTO.setCancelType("用户退款");
+        requestDTO.setRemark("用户退款");
+
+        jstErpHttpService.cancel(requestDTO);
+//        }
+
+
+        BaseResponse baseResponse = new BaseResponse();
+        baseResponse.setSuccess(true);
+
+        return baseResponse;
+    }
+
     @Override
     public ErpOrderResponse finishOrder(ErpOrder order) {
         return null;

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

@@ -131,6 +131,11 @@ public class K9OrderScrmServiceImpl implements IErpOrderService {
         return null;
     }
 
+    @Override
+    public BaseResponse refundUpdateScrm(ErpRefundUpdateRequest param) {
+        return null;
+    }
+
 
     /**
      * 退款 运单号已获取到

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

@@ -906,6 +906,11 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
         }
     }
 
+    @Override
+    public BaseResponse refundUpdateScrm(ErpRefundUpdateRequest param) {
+        return null;
+    }
+
     @Override
     public ErpOrderResponse finishOrder(ErpOrder order) {
         FsSysConfig sysConfig = configUtil.getSysConfig();

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

@@ -108,7 +108,8 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
     @Autowired
     private IFsStoreProductScrmService productService;
     @Autowired
-    IErpOrderService erpOrderService;
+    @Qualifier("erpOrderServiceImpl")
+    private IErpOrderService gyOrderService;
     @Autowired
     @Qualifier("hzOMSErpOrderServiceImpl")
     private IErpOrderService hzOMSerpOrderService;
@@ -367,21 +368,55 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         afterSalesStatusService.insertFsStoreAfterSalesStatus(storeAfterSalesStatus);
 
 //        //更新OMS
-//        ErpRefundUpdateRequest request=new ErpRefundUpdateRequest();
-//        request.setTid(order.getOrderCode());
-//        request.setOid(order.getOrderCode());
-//        request.setRefund_state(1);
-//        BaseResponse response=erpOrderService.refundUpdate(request);
-//        if(response.getSuccess()){
+        IErpOrderService erpOrderService = getErpService();
+        ErpRefundUpdateRequest request=new ErpRefundUpdateRequest();
+        request.setTid(order.getOrderCode());
+        request.setOid(order.getOrderCode());
+        request.setRefund_state(1);
+        BaseResponse response=erpOrderService.refundUpdateScrm(request);
+        if(response.getSuccess()){
             return R.ok();
-//        }
-//        else{
-//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-//            return R.error(response.getErrorDesc());
-//        }
+        }
+        else{
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return R.error(response.getErrorDesc());
+        }
 
     }
 
+    private IErpOrderService getErpService() {
+        FsSysConfig sysConfig = configUtil.getSysConfig();
+        Integer erpOpen = sysConfig.getErpOpen();
+        if (erpOpen != null && erpOpen == 1){
+            //判断erp类型
+            Integer erpType = sysConfig.getErpType();
+            if (erpType != null){
+                IErpOrderService erpOrderService = null;
+                if (erpType == 1){
+                    //管易
+                    erpOrderService =  gyOrderService;
+                } else if (erpType == 2){
+                    //旺店通
+                    erpOrderService =  wdtErpOrderService;
+                } else if (erpType == 3){
+                    //
+                    erpOrderService =  hzOMSerpOrderService;
+                } else if (erpType == 4){
+                    //代服
+                    erpOrderService =  dfOrderService;
+                }else if(erpType == 5){
+                    erpOrderService=jSTOrderService;
+                }else if(erpType == 6){
+                    erpOrderService=k9OrderService;
+                }
+                return erpOrderService;
+
+
+            }
+        }
+        return null;
+    }
+
     @Override
     @Transactional
     @Synchronized
@@ -1033,6 +1068,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         request.setTid(order.getOrderCode());
         request.setOid(order.getOrderCode());
         request.setRefund_state(1);
+        IErpOrderService erpOrderService = getErpService();
         BaseResponse response=erpOrderService.refundUpdate(request);
         if(response.getSuccess()){
             return R.ok();
@@ -1396,6 +1432,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
                     request.setStoreAfterSalesId(fsStoreAfterSales.getId());
                     FsSysConfig sysConfig = configUtil.getSysConfig();
                     Integer erpType = sysConfig.getErpType();
+                    IErpOrderService erpOrderService = getErpService();
                     if (erpType == 1) {
                         erpOrderService.refundUpdate(request);
                     }else if (erpType == 2) {

fs-service/src/main/resources/application-config-dev.yml

@@ -111,7 +111,9 @@ wx_miniapp_temp:
   inquiry_temp_id:
 # 聚水潭API配置
 jst:
-  app_key: a4b1fab173c84f67b3873857eea11d90 #聚水潭2025-07-25
-  app_secret: dfce1f8dc8a64ddc91212fc3fcdd9349 #聚水潭2025-07-25
+#  app_key: a4b1fab173c84f67b3873857eea11d90 #聚水潭2025-07-25
+  app_key: 871348458a964548a72bf8124cf917a4 #聚水潭2025-08-14
+  app_secret: 5b7d9369dbcd414db45089bc047ebe1a #聚水潭2025-08-14
+#  app_secret: dfce1f8dc8a64ddc91212fc3fcdd9349 #聚水潭2025-07-25
   authorization_code: 666666
   shop_code: "18461733"

fs-service/src/main/resources/application-dev-yjb.yml

@@ -164,3 +164,4 @@ token:
 openIM:
     secret: openIM123
     userID: imAdmin
+isNewWxMerchant: true