1

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

@@ -111,6 +111,9 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
     @Autowired
     @Qualifier("JSTErpOrderServiceImpl")
     private IErpOrderService jSTOrderService;
+    @Autowired
+    @Qualifier("k9OrderScrmServiceImpl")
+    private IErpOrderService k9OrderService;
 
     @Autowired
     private FsStorePaymentMapper fsStorePaymentMapper;
@@ -559,6 +562,8 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
                         dfOrderService.refundUpdate(request);
                     }else if(erpType == 5){
                         jSTOrderService.refundUpdate(request);
+                    }else if(erpType == 6){
+                        k9OrderService.refundUpdate(request);
                     }
                 }
             }

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

@@ -209,7 +209,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     @Autowired
     @Qualifier("JSTErpOrderServiceImpl")
     private IErpOrderService jSTOrderService;
-
+    @Autowired
+    @Qualifier("k9OrderScrmServiceImpl")
+    private IErpOrderService k9OrderService;
     @Autowired
     private IFsStoreAfterSalesService fsStoreAfterSalesService;
     @Autowired
@@ -1619,6 +1621,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                     erpOrderService = dfOrderService;
                 } else if (erpType == 5) {
                     erpOrderService = jSTOrderService;
+                }else if (erpType == 6) {
+                    erpOrderService = k9OrderService;
                 }
                 if (erpOrderService != null && StringUtils.isNotEmpty(order.getExtendOrderId())) {
                     if (!order.getExtendOrderId().equals("HIS")) {
@@ -1683,6 +1687,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             //聚水潭
             erpOrderService = jSTOrderService;
             erpOrder.setShop_code(sysConfig.getErpJstShopCode());
+        }else if (erpType == 6) {
+            erpOrderService = k9OrderService;
         } else {
             return;
         }
@@ -2026,6 +2032,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                 } else if (erpType == 5) {
                     //聚水潭
                     erpOrderService = jSTOrderService;
+                }else if (erpType == 6) {
+                    erpOrderService = k9OrderService;
                 }
                 ErpOrderQueryResponse response = erpOrderService.getOrder(request);
                 if (response.getOrders() != null && response.getOrders().size() > 0) {
@@ -3487,6 +3495,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                 } else if (erpType == 5) {
                     //聚水潭
                     erpOrderService = jSTOrderService;
+                }else if (erpType == 6) {
+                    erpOrderService = k9OrderService;
                 }
                 return erpOrderService;
 

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

@@ -124,6 +124,10 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
     @Autowired
     @Qualifier("JSTErpOrderServiceImpl")
     private IErpOrderService jSTOrderService;
+    @Autowired
+    @Qualifier("k9OrderScrmServiceImpl")
+    private IErpOrderService k9OrderService;
+
     @Autowired
     private ISysConfigService configService;
 
@@ -653,7 +657,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         if(order.getPayMoney().compareTo(BigDecimal.ZERO)==1){
             List<FsStorePaymentScrm> payments=paymentService.selectFsStorePaymentByOrderId(order.getId());
             if(payments!=null){
-                String json = configService.selectConfigByKey("store.pay");
+                String json = configService.selectConfigByKey("his.pay");
                 FsPayConfigScrm fsPayConfig = JSON.parseObject(json, FsPayConfigScrm.class);
                 for(FsStorePaymentScrm payment:payments){
                     if (payment.getPayMode()==null||payment.getPayMode().equals("wx")){
@@ -1404,6 +1408,8 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
                         dfOrderService.refundUpdate(request);
                     }else if(erpType == 5){
                         jSTOrderService.refundUpdate(request);
+                    }else if(erpType == 6){
+                        k9OrderService.refundUpdate(request);
                     }
                 }
             }

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

@@ -2035,7 +2035,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
             //将钱退还给用户
             List<FsStorePaymentScrm> payments=paymentService.selectFsStorePaymentByOrderId(order.getId());
             if(payments!=null){
-                String json = configService.selectConfigByKey("store.pay");
+                String json = configService.selectConfigByKey("his.pay");
                 FsPayConfigScrm fsPayConfig = JSON.parseObject(json, FsPayConfigScrm.class);
                 for(FsStorePaymentScrm payment:payments){
                     if (payment.getPayMode()==null||payment.getPayMode().equals("wx")){
@@ -2917,6 +2917,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
             } else if (erpType == 5){
                 //聚水潭
                 erpOrderService =  jSTOrderService;
+            }else if (erpType == 6){
+                //金博
+                erpOrderService = k9OrderService;
             }
         }
         return erpOrderService;
@@ -3557,6 +3560,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
                     erpOrderService = dfOrderService;
                 } else if (erpType == 5) {
                     erpOrderService = jSTOrderService;
+                }else if (erpType == 6) {
+                    erpOrderService = k9OrderService;
                 }
                 if (erpOrderService != null && StringUtils.isNotEmpty(order.getExtendOrderId())) {
                     if (!order.getExtendOrderId().equals("HIS")) {
@@ -3589,4 +3594,15 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
         return 1;
     }
 
+    @Override
+    public void importDeliveryNoteExpress(List<FsOrderDeliveryNoteDTO> dtoList, String miniAppId) {
+       try {
+           //获取微信token逻辑
+           final WxMaService wxService = WxMaConfiguration.getMaService(miniAppId);
+           String token = wxService.getAccessToken();
+           System.out.println("获取到的token------------->:"+token);
+       }catch (Exception e){
+           e.getStackTrace();
+       }
+    }
 }