订单erp相关缺陷修复

fs-service/src/main/java/com/fs/his/utils/ConfigUtil.java

@@ -33,7 +33,7 @@ public class ConfigUtil {
 
     public FsErpConfig getErpConfig(){
         if (this.fsErpConfig==null){
-            SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("erp.config");
+            SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("his.config");
             String configValue = sysConfig.getConfigValue();
             FsErpConfig config = JSON.parseObject(configValue, FsErpConfig.class);
             this.fsErpConfig=config;

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

@@ -16,6 +16,8 @@ import com.fs.core.config.WxPayProperties;
 import com.fs.erp.dto.BaseResponse;
 import com.fs.erp.dto.ErpRefundUpdateRequest;
 import com.fs.erp.service.IErpOrderService;
+import com.fs.his.utils.ConfigUtil;
+import com.fs.hisStore.enums.SysConfigEnum;
 import com.fs.hisStore.param.*;
 import com.fs.huifuPay.domain.HuiFuRefundResult;
 import com.fs.huifuPay.sdk.opps.core.request.V2TradePaymentScanpayRefundRequest;
@@ -106,6 +108,9 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
     @Autowired
     private WxPayProperties wxPayProperties;
 
+    @Autowired
+    private ConfigUtil configUtil;
+
 
     /**
      * 查询售后记录
@@ -191,7 +196,8 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         if(order.getStatus()==0){
             return R.error("未支付订单不能申请售后");
         }
-        if(StringUtils.isEmpty(order.getExtendOrderId())){
+        if("1".equals(configUtil.generateConfigByKey(SysConfigEnum.HIS_CONFIG.getKey()).getString("erpOpen"))
+                && StringUtils.isEmpty(order.getExtendOrderId())){
             return R.error("仓库未生成订单,暂时不能申请退款,请联系客服");
         }
         if(order.getStatus()== OrderInfoEnum.STATUS_NE3.getValue()){