统一设置多少积分抵扣一元

kmall-admin/src/main/java/com/kmall/admin/haikong/config/HaiKongConfig.java

@@ -25,7 +25,6 @@ public class HaiKongConfig {
         haiKongProperties.setMemberUrl(environment.getProperty("haikong.member.url"));
         haiKongProperties.setMemberAppId(environment.getProperty("haikong.member.appId"));
         haiKongProperties.setMemberAppSecret(environment.getProperty("haikong.member.appSecret"));
-        haiKongProperties.setMemberScoreLimit(Integer.parseInt(environment.getProperty("haikong.member.scoreLimit")));
         haiKongProperties.setRetry(Integer.parseInt(environment.getProperty("haikong.retry")));
         haiKongProperties.setVmcconnectUrl(environment.getProperty("haikong.vmcconnect.url"));
         haiKongProperties.setVmcconnectAppId(environment.getProperty("haikong.vmcconnect.appId"));

kmall-admin/src/main/java/com/kmall/admin/haikong/config/HaiKongProperties.java

@@ -13,8 +13,6 @@ public class HaiKongProperties {
 
     private String memberAppSecret;
 
-    private Integer memberScoreLimit;
-
     private Integer retry;
 
     /**
@@ -91,14 +89,6 @@ public class HaiKongProperties {
         this.memberAppSecret = memberAppSecret;
     }
 
-    public Integer getMemberScoreLimit() {
-        return memberScoreLimit;
-    }
-
-    public void setMemberScoreLimit(Integer memberScoreLimit) {
-        this.memberScoreLimit = memberScoreLimit;
-    }
-
     public Integer getRetry() {
         return retry;
     }

kmall-admin/src/main/java/com/kmall/admin/haikong/constant/Constants.java

@@ -19,6 +19,12 @@ public class Constants {
 
     /* --------------------------------------------------redis常量----------------------------------------------- */
 
+    /* --------------------------------------------------系统常量----------------------------------------------- */
+
+    public static final String HAIKONG_MEMBER_SCORE_LIMIT = "HAIKONG_MEMBER_SCORE_LIMIT";
+
+    /* --------------------------------------------------系统常量----------------------------------------------- */
+
 
     /* --------------------------------------------------支付宝常量----------------------------------------------- */
 

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -4643,7 +4643,13 @@ public class OrderServiceImpl implements OrderService {
         }
         // 2. 计算积分抵扣后的总价格
         if (isCalculateScorePrice.get()) {
-            Integer scoreLimit = haiKongProperties.getMemberScoreLimit();
+            // HAIKONG_MEMBER_SCORE_LIMIT 系统参数，海控平台统一30积分1块钱
+            String scoreLimitStr = sysConfigDao.queryByKey(Constants.HAIKONG_MEMBER_SCORE_LIMIT);
+            if (org.springframework.util.StringUtils.isEmpty(scoreLimitStr)) {
+                LOGGER.error("计算优惠价格时，未设置统一的抵扣规则！");
+                throw new ServiceException(String.format("请先设置统一的积分规则，设置方式：【系统管理】-->【系统参数】，参数名为：【%s】", Constants.HAIKONG_MEMBER_SCORE_LIMIT));
+            }
+            Integer scoreLimit = Integer.parseInt(scoreLimitStr);
             if (score < scoreLimit) {
                 LOGGER.error("用户【{}】的积分数量为：{}，最低需要{}积分才能抵扣！", memberCode, score, scoreLimit);
                 calculateOrderDiscountPriceResponseVO.setAfterScore(score);

kmall-manager/src/main/resources/conf/haikong.properties

@@ -3,8 +3,6 @@
 haikong.member.url=https://test-ump.greedc.com
 haikong.member.appId=mianshuitestzhanxiao
 haikong.member.appSecret=mianshuitestzhanxiao1029
-#### \u6D77\u63A7\u89C4\u5B9A\u7684\u591A\u5C11\u79EF\u5206\u62B5\u4E00\u5143
-haikong.member.scoreLimit=30
 haikong.retry=3
 haikong.ware.url=http://yjapi.highstore.cn:8202/esbcenter/api/esb
 haikong.ware.appId=GREE