From a5fcc876a0e5c9e704dac807706c8bc6815c0d04 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 28 Jul 2023 15:35:06 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=BE=AE=E4=BF=A1=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E8=8E=B7=E5=8F=96=E4=BB=A4?= =?UTF-8?q?=E7=89=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/api/uniapp/AgentDevController.java | 2 +- .../main/java/com/jsowell/service/AgentDevService.java | 9 +++++---- .../src/main/java/com/jsowell/service/MemberService.java | 6 +++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java index 1a036263d..bf97b38c1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java @@ -68,7 +68,7 @@ public class AgentDevController extends BaseController { * @return */ @PostMapping("/getComponentToken") - public RestApiResponse getComponentToken(GetComponentTokenDTO dto) { + public RestApiResponse getComponentToken(@RequestBody GetComponentTokenDTO dto) { logger.info("获取第三方平台令牌 params:{}", JSONObject.toJSONString(dto)); RestApiResponse response = null; try { diff --git a/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java b/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java index c2aacdc19..564017a01 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java @@ -124,7 +124,7 @@ public class AgentDevService { */ public String getComponentToken(GetComponentTokenDTO dto) { String verifyTicket = dto.getVerifyTicket(); - String redisKey = CacheConstants.COMPONENT_ACCESS_TOKEN + PLATFORM_APP_ID; + String redisKey = CacheConstants.COMPONENT_ACCESS_TOKEN + dto.getAppId(); // 先判断缓存中是否有 token String token = redisCache.getCacheObject(redisKey); if (StringUtils.isNotBlank(token)) { @@ -133,9 +133,10 @@ public class AgentDevService { } // 为空再去请求获取新令牌 String url = "https://api.weixin.qq.com/cgi-bin/component/api_component_token"; - if (verifyTicket == null) { + if (StringUtils.isBlank(verifyTicket)) { // 获取缓存中的票据 - verifyTicket = redisCache.getCacheObject(CacheConstants.COMPONENT_VERIFY_TICKET + PLATFORM_APP_ID); + verifyTicket = redisCache.getCacheObject(CacheConstants.COMPONENT_VERIFY_TICKET + dto.getAppId()); + logger.info("获取第三方平台缓存中票据:{}", verifyTicket); } JSONObject jsonObject = new JSONObject(); jsonObject.put("component_appid", dto.getAppId()); @@ -146,7 +147,7 @@ public class AgentDevService { JSONObject jsonResult = JSONObject.parseObject(result); logger.info("获取第三方平台 token 请求结果:{}", JSONObject.toJSONString(jsonResult)); // 获取返回值中的 token - token = jsonObject.getString("component_access_token"); + token = jsonResult.getString("component_access_token"); if (token == null) { throw new RuntimeException("获取第三方平台 token 异常！"); } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 3af5bd97a..06f28805f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -325,7 +325,11 @@ public class MemberService { // PageHelper.startPage(pageNum, pageSize); List list = memberBasicInfoService.getMemberWalletDetail(dto); // 总支出 - BigDecimal totalConsumption = list.stream().map(MemberWalletLogVO::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal totalConsumption = list.stream() + .map(MemberWalletLogVO::getOrderAmount) + .filter(Objects::nonNull) + .reduce(BigDecimal.ZERO, BigDecimal::add); + vo.setTotalConsumption(totalConsumption); // PageInfo pageInfo = new PageInfo<>(list);