From a8edc2c4d11e993bc15624b5eb17507f3f7064d8 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Fri, 29 Mar 2024 14:06:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E4=BA=91=E4=BC=9A=E5=91=98=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E7=A7=AF=E5=88=86=E6=93=8D=E4=BD=9C=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxUserMemberServiceImpl.java | 8 ++---- .../utils/shuyun/ShuYunApiUtils.java | 15 ++++++++--- .../utils/shuyun/ShuYunConfig.java | 27 +++++++++++++++++++ .../system/utils/shuyun/ShuYunApiUtils.java | 15 ++++++++--- .../system/utils/shuyun/ShuYunConfig.java | 27 +++++++++++++++++++ 5 files changed, 78 insertions(+), 14 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java index 0dd744c..697466f 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java +++ b/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); // 刷新缓存信息 diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunApiUtils.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunApiUtils.java index 83e70ef..dae8f9d 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunApiUtils.java +++ b/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 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 { diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunConfig.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunConfig.java index f95d8d3..81b7fb3 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunConfig.java +++ b/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; + } } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunApiUtils.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunApiUtils.java index c3faf5d..1803029 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunApiUtils.java +++ b/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 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 { diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunConfig.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunConfig.java index d7d6c0a..15d4ff2 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunConfig.java +++ b/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; + } }