聚水潭ERP代码提交

fs-service/src/main/java/com/fs/his/config/FsSysConfig.java

@@ -38,6 +38,13 @@ public class FsSysConfig {
     String erpHzOMSItenantid;
     String erpHzOMTokenUrl;
     String erpHzOMBaseUrl;
+    //erp 聚水潭
+    String erpJstAppKey;
+    String erpJstAppsecret;
+    String erpJstSid;
+    String erpJstShopCode;
+    String erpJstBaseUrl;
+    String erpJstrehouseCode;
     //非erp 代服管家(多个账号) List<DFConfigVo>
     String dfAccounts;
 

fs-service/src/main/java/com/fs/his/service/impl/FsStoreAfterSalesServiceImpl.java

@@ -108,6 +108,10 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
     @Qualifier("wdtErpOrderServiceImpl")
     private IErpOrderService wdtErpOrderService;
 
+    @Autowired
+    @Qualifier("JSTErpOrderServiceImpl")
+    private IErpOrderService jSTOrderService;
+
     @Autowired
     private FsStorePaymentMapper fsStorePaymentMapper;
     @Autowired
@@ -553,6 +557,8 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
                         hzOMSerpOrderService.refundUpdate(request);
                     }  else if (erpType == 4) {
                         dfOrderService.refundUpdate(request);
+                    }else if(erpType == 5){
+                        jSTOrderService.refundUpdate(request);
                     }
                 }
             }
@@ -715,6 +721,8 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
                 response =  hzOMSerpOrderService.refundUpdate(request);
             } else if (erpType == 4) {
                 response =  dfOrderService.refundUpdate(request);
+            }else if(erpType == 5){
+                response=jSTOrderService.refundUpdate(request);
             }
             if (response.getSuccess()) {
                 return R.ok();

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -199,6 +199,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     @Qualifier("dfOrderServiceImpl")
     private IErpOrderService dfOrderService;
 
+    @Autowired
+    @Qualifier("JSTErpOrderServiceImpl")
+    private IErpOrderService jSTOrderService;
+
     @Autowired
     private IFsStoreAfterSalesService fsStoreAfterSalesService;
     @Autowired
@@ -1544,6 +1548,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 } else if (erpType == 4) {
                     //瀚智
                     erpOrderService = dfOrderService;
+                }else if(erpType == 5){
+                    erpOrderService=jSTOrderService;
                 }
                 if (erpOrderService != null && StringUtils.isNotEmpty(order.getExtendOrderId())) {
                     if (!order.getExtendOrderId().equals("HIS")) {
@@ -1601,8 +1607,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             erpOrderService = hzOMSOrderService;
         } else if (erpType == 4) {
             //代服
-            erpOrderService = dfOrderService;
-        } else {
+            erpOrderService =  dfOrderService;
+        } else if (erpType == 5){
+            //聚水潭
+            erpOrderService =  jSTOrderService;
+        }else {
             return;
         }
         FsStoreOrder order = fsStoreOrderMapper.selectFsStoreOrderByOrderId(orderId);
@@ -1932,6 +1941,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     erpOrderService = hzOMSOrderService;
                 } else if (erpType == 4) {
                     erpOrderService = dfOrderService;
+                }else if (erpType == 5){
+                    //聚水潭
+                    erpOrderService =  jSTOrderService;
                 }
                 ErpOrderQueryResponse response = erpOrderService.getOrder(request);
                 if (response.getOrders() != null && response.getOrders().size() > 0) {
@@ -3325,6 +3337,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 } else if (erpType == 4) {
                     //代服
                     erpOrderService = dfOrderService;
+                }else if (erpType == 5){
+                    //聚水潭
+                    erpOrderService =  jSTOrderService;
                 }
                 return erpOrderService;