数云会员注册积分操作对接

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java

@@ -299,12 +299,8 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
         // TODO:调用数云接口获取最新的积分值（已完成，未保存操作记录）
         ShuYunMember shuYunMember = ShuYunApiUtils.queryMember(wxUserMember.getUnionid(), shuYunConfig.getPlatCode(), shuYunConfig.getShopId());
         loginUserVo.setCredit(Integer.valueOf(shuYunMember.getPoint()));
-        // TODO: 调用数云接口获取即将过期的积分值（未完成。。。。）
-        LocalDateTime now = LocalDateTime.now();
-        String startTime = now.plusHours(1).format(DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD_HH_MM_SS));
-        String endTime = now.with(TemporalAdjusters.lastDayOfYear()).with(LocalTime.MAX).format(DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD_HH_MM_SS));
-        // tenant 租户名称 数云说写死
-        Integer expireCredit = ShuYunApiUtils.pointWillDueSearch("zzsstest", wxUserMember.getUnionid(), "100000184001", "RELATIVE", startTime, endTime);
+        // TODO: 调用数云接口获取即将过期的积分值（已完成，未保存操作记录）
+        Integer expireCredit = ShuYunApiUtils.pointWillDueSearch(wxUserMember.getUnionid());
         loginUserVo.setExpireCredit(expireCredit);
 
         // 刷新缓存信息

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunApiUtils.java

@@ -8,6 +8,7 @@ import com.flossom.common.core.constant.CacheConstants;
 import com.flossom.common.core.domain.R;
 import com.flossom.common.core.domain.shuyun.*;
 import com.flossom.common.core.exception.ServiceException;
+import com.flossom.common.core.utils.DateUtils;
 import com.flossom.common.redis.service.RedisService;
 import com.flossom.miniProgram.utils.HttpClientUtils;
 import com.shuyun.open.sdk.bean.HttpMethod;
@@ -19,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.List;
 import java.util.Map;
 
@@ -279,14 +283,17 @@ public class ShuYunApiUtils {
      * 查询即将过期积分
      * https://open.shuyun.com/#/apidoc?type=41&apiId=249
      */
-    public static Integer pointWillDueSearch(String tenant, String platId, String cardPlanId, String timeType, String startTime, String endTime) {
+    public static Integer pointWillDueSearch(String platId) {
         Map<String, String> params = MapUtil.newHashMap();
-        params.put("tenant", tenant);
+        params.put("tenant", shuYunConfig.getTenant());
         params.put("platId", platId);
         params.put("platCode", shuYunConfig.getPlatCode());
         params.put("shopId", shuYunConfig.getShopId());
-        params.put("cardPlanId", cardPlanId);
-        params.put("timeType", timeType);
+        params.put("cardPlanId", shuYunConfig.getCardPlanId());
+        params.put("timeType", "RELATIVE");
+        LocalDateTime now = LocalDateTime.now();
+        String startTime = now.plusHours(1).format(DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD_HH_MM_SS));
+        String endTime = now.with(TemporalAdjusters.lastDayOfYear()).with(LocalTime.MAX).format(DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD_HH_MM_SS));
         params.put("startTime", startTime);
         params.put("endTime", endTime);
         try {

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunConfig.java

@@ -38,6 +38,17 @@ public class ShuYunConfig {
 
     private String shopId;
 
+    /**
+     * 租户名称
+     */
+    private String tenant;
+
+    /**
+     * 数云忠诚度卡ID
+     */
+    private String cardPlanId;
+
+
     private ActionMethod actionMethod;
 
 
@@ -96,4 +107,20 @@ public class ShuYunConfig {
     public void setAuthValue(String authValue) {
         this.authValue = authValue;
     }
+
+    public String getTenant() {
+        return tenant;
+    }
+
+    public void setTenant(String tenant) {
+        this.tenant = tenant;
+    }
+
+    public String getCardPlanId() {
+        return cardPlanId;
+    }
+
+    public void setCardPlanId(String cardPlanId) {
+        this.cardPlanId = cardPlanId;
+    }
 }

flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunApiUtils.java

@@ -8,6 +8,7 @@ import com.flossom.common.core.constant.CacheConstants;
 import com.flossom.common.core.domain.R;
 import com.flossom.common.core.domain.shuyun.*;
 import com.flossom.common.core.exception.ServiceException;
+import com.flossom.common.core.utils.DateUtils;
 import com.flossom.common.redis.service.RedisService;
 import com.flossom.system.utils.HttpClientUtils;
 import com.shuyun.open.sdk.bean.HttpMethod;
@@ -19,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.List;
 import java.util.Map;
 
@@ -279,14 +283,17 @@ public class ShuYunApiUtils {
      * 查询即将过期积分
      * https://open.shuyun.com/#/apidoc?type=41&apiId=249
      */
-    public static Integer pointWillDueSearch(String tenant, String platId, String cardPlanId, String timeType, String startTime, String endTime) {
+    public static Integer pointWillDueSearch(String platId) {
         Map<String, String> params = MapUtil.newHashMap();
-        params.put("tenant", tenant);
+        params.put("tenant", shuYunConfig.getTenant());
         params.put("platId", platId);
         params.put("platCode", shuYunConfig.getPlatCode());
         params.put("shopId", shuYunConfig.getShopId());
-        params.put("cardPlanId", cardPlanId);
-        params.put("timeType", timeType);
+        params.put("cardPlanId", shuYunConfig.getCardPlanId());
+        params.put("timeType", "RELATIVE");
+        LocalDateTime now = LocalDateTime.now();
+        String startTime = now.plusHours(1).format(DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD_HH_MM_SS));
+        String endTime = now.with(TemporalAdjusters.lastDayOfYear()).with(LocalTime.MAX).format(DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD_HH_MM_SS));
         params.put("startTime", startTime);
         params.put("endTime", endTime);
         try {

flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunConfig.java

@@ -38,6 +38,17 @@ public class ShuYunConfig {
 
     private String shopId;
 
+    /**
+     * 租户名称
+     */
+    private String tenant;
+
+    /**
+     * 数云忠诚度卡ID
+     */
+    private String cardPlanId;
+
+
     private ActionMethod actionMethod;
 
 
@@ -96,4 +107,20 @@ public class ShuYunConfig {
     public void setAuthValue(String authValue) {
         this.authValue = authValue;
     }
+
+    public String getTenant() {
+        return tenant;
+    }
+
+    public void setTenant(String tenant) {
+        this.tenant = tenant;
+    }
+
+    public String getCardPlanId() {
+        return cardPlanId;
+    }
+
+    public void setCardPlanId(String cardPlanId) {
+        this.cardPlanId = cardPlanId;
+    }
 }