商城代码，参数配置优化

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

@@ -589,7 +589,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
                         payConfig.setAppId(fsPayConfig.getAppId());
                         payConfig.setMchId(fsPayConfig.getWxMchId());
                         payConfig.setMchKey(fsPayConfig.getWxMchKey());
-                        payConfig.setKeyPath(wxPayProperties.getKeyPath());
+                        payConfig.setKeyPath(fsPayConfig.getKeyPath());
                         payConfig.setSubAppId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                         payConfig.setSubMchId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                         wxPayService.setConfig(payConfig);

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

@@ -1532,7 +1532,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
         FsStoreOrderScrm order=fsStoreOrderMapper.selectFsStoreOrderById(orderId);
         FsSysConfig erpConfig = configUtil.generateConfigByKey(SysConfigEnum.HIS_CONFIG.getKey(), FsSysConfig.class);
         List<Long> noErpCompany = erpConfig.getNoErpCompany();
-        if (noErpCompany.contains(order.getCompanyId())) {
+        if (noErpCompany != null && noErpCompany.contains(order.getCompanyId())) {
             log.info("订单:{},相关公司不推送erp", order.getOrderCode());
             return R.error("订单:" + order.getOrderCode() +",相关公司不推送erp");
         }
@@ -1593,14 +1593,14 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
         payments.add(payment);
         if(order.getCompanyId()!=null){
 
-            FsExpressScrm express=expressService.selectFsExpressByOmsCode("HISSCRMSTORESF");
+            FsExpressScrm express=expressService.selectFsExpressByOmsCode("SF.0235402855");
             erpOrder.setExpress_code(express.getOmsCode());
             order.setDeliveryName(express.getName());
             order.setDeliverySn(express.getCode());
 
         }
         else{
-            FsExpressScrm express=expressService.selectFsExpressByOmsCode("HISSCRMSTORESF");
+            FsExpressScrm express=expressService.selectFsExpressByOmsCode("SF.0235402855");
             erpOrder.setExpress_code(express.getOmsCode());
             order.setDeliveryName(express.getName());
             order.setDeliverySn(express.getCode());
@@ -1815,6 +1815,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
     @Transactional
     public R refundOrderMoney(Long orderId) {
         IErpOrderService erpOrderService = getErpService();
+        FsErpConfig erpConfig = configUtil.generateConfigByKey("his.config", FsErpConfig.class);
         FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderById(orderId);
         if(order.getStatus()==-2){
             return R.error("已退款");
@@ -1822,7 +1823,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
         if(order.getStatus()!=1&&order.getStatus()!=2){
             return R.error("非法操作");
         }
-        if (order.getExtendOrderId()==null){
+        if (erpConfig.getErpOpen() != null && erpConfig.getErpOpen() == 1 && order.getExtendOrderId()==null){
             return R.error("暂未推送至erp,请稍后再试！");
         }
         if(StringUtils.isNotEmpty(order.getExtendOrderId())){
@@ -1867,7 +1868,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
                         payConfig.setAppId(fsPayConfig.getAppId());
                         payConfig.setMchId(fsPayConfig.getWxMchId());
                         payConfig.setMchKey(fsPayConfig.getWxMchKey());
-                        payConfig.setKeyPath(wxPayProperties.getKeyPath());
+                        payConfig.setKeyPath(fsPayConfig.getKeyPath());
                         payConfig.setSubAppId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                         payConfig.setSubMchId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                         wxPayService.setConfig(payConfig);

fs-service/src/main/resources/application-config-druid-xzt.yml

@@ -91,6 +91,6 @@ jst:
   app_key: a4b1fab173c84f67b3873857eea11d90 #聚水潭2025-07-25
   app_secret: dfce1f8dc8a64ddc91212fc3fcdd9349 #聚水潭2025-07-25
   authorization_code: 666666
-  shop_code: "18461733"
+  shop_code: "18718209"