订单erp相关缺陷修复

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

@@ -198,6 +198,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         }
         if("1".equals(configUtil.generateConfigByKey(SysConfigEnum.HIS_CONFIG.getKey()).getString("erpOpen"))
                 && StringUtils.isEmpty(order.getExtendOrderId())){
+            logger.info("erpOpen：{}",configUtil.generateConfigByKey(SysConfigEnum.HIS_CONFIG.getKey()).getString("erpOpen"));
             return R.error("仓库未生成订单,暂时不能申请退款,请联系客服");
         }
         if(order.getStatus()== OrderInfoEnum.STATUS_NE3.getValue()){
@@ -857,7 +858,9 @@ 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())){
+            logger.info("erpOpen：{}",configUtil.generateConfigByKey(SysConfigEnum.HIS_CONFIG.getKey()).getString("erpOpen"));
             return R.error("仓库未生成订单,暂时不能申请退款,请联系客服");
         }
         if(order.getStatus()== OrderInfoEnum.STATUS_NE3.getValue()){