Browse Source

商城支付配置调整

yfh 1 day ago
parent
commit
db4800f9a2

+ 1 - 4
fs-service/src/main/java/com/fs/hisStore/enums/SysConfigEnum.java

@@ -85,10 +85,7 @@ public enum SysConfigEnum {
     //红包流量,joinTime.switch.config
     JOIN_TIME_SWITCH_CONFIG("joinTime.switch.config", "红包流量"),
     //签到配置,store.sign
-    SIGN_CONFIG("store.sign", "签到配置"),
-    //商城支付配置,store.pay
-    STORE_PAY_CONFIG("store.pay", "商城支付配置");
-
+    SIGN_CONFIG("store.sign", "签到配置");
     private final String key;
     private final String name;
 

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

@@ -2152,12 +2152,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             //将钱退还给用户
             List<FsStorePaymentScrm> payments = paymentService.selectFsStorePaymentByOrderId(order.getId());
             if (payments != null) {
-                String json;
-                if (CloudHostUtils.hasCloudHostName("康年堂")) {
-                    json = configService.selectConfigByKey("his.pay");
-                } else {
-                    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")) {