diff --git a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java index f297393..20d36d1 100644 --- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java +++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java @@ -33,6 +33,7 @@ import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.WebUtil; @@ -41,6 +42,7 @@ import org.springblade.modules.auth.provider.TokenGranterBuilder; import org.springblade.modules.auth.provider.TokenParameter; import org.springblade.modules.auth.utils.TokenUtil; import org.springblade.modules.system.entity.UserInfo; +import org.springblade.weixin.entity.WeChatUser; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -105,6 +107,10 @@ public class BladeTokenEndPoint { return TokenUtil.createAuthInfo(userInfo); } + @PostMapping("/getToken") + public R getToken(@RequestBody WeChatUser weChatUser) { + return R.data(TokenUtil.createToken(weChatUser)); + } @GetMapping("/oauth/logout") @ApiOperation(value = "退出登录") diff --git a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java index 37496c1..835a740 100644 --- a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java +++ b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java @@ -29,6 +29,7 @@ import org.springblade.core.tool.utils.*; import org.springblade.modules.system.entity.Tenant; import org.springblade.modules.system.entity.User; import org.springblade.modules.system.entity.UserInfo; +import org.springblade.weixin.entity.WeChatUser; import javax.servlet.http.HttpServletResponse; import java.util.Date; @@ -127,6 +128,33 @@ public class TokenUtil { } } + public static Kv createToken(WeChatUser weChatUser) { + Kv authInfo = Kv.create(); + //设置jwt参数 + Map param = new HashMap<>(16); + param.put(TokenConstant.TOKEN_TYPE, TokenConstant.ACCESS_TOKEN); + param.put(TokenConstant.TENANT_ID, "000000"); + param.put(TokenConstant.USER_ID, weChatUser.getOpenId()); + param.put(TokenConstant.USER_NAME, weChatUser.getUsername()); + param.put("phone", weChatUser.getPhone()); + + //拼装accessToken + try { + TokenInfo accessToken = SecureUtil.createJWT(param, "audience", "issuser", TokenConstant.ACCESS_TOKEN); + //返回accessToken + return authInfo.set(TokenConstant.TENANT_ID, "000000") + .set(TokenConstant.USER_ID, weChatUser.getOpenId()) + .set(TokenConstant.USER_NAME, weChatUser.getUsername()) + .set(TokenConstant.ACCESS_TOKEN, accessToken.getToken()) + .set(TokenConstant.TOKEN_TYPE, TokenConstant.BEARER) + .set(TokenConstant.EXPIRES_IN, accessToken.getExpire()) + .set("phone", weChatUser.getPhone()) + .set(TokenConstant.LICENSE, TokenConstant.LICENSE_NAME); + } catch (Exception ex) { + return authInfo.set("error_code", HttpServletResponse.SC_UNAUTHORIZED).set("error_description", ex.getMessage()); + } + } + /** * 创建refreshToken * diff --git a/src/main/java/org/springblade/weixin/controller/WeChatUserController.java b/src/main/java/org/springblade/weixin/controller/WeChatUserController.java index 95d435a..2c3dbb4 100644 --- a/src/main/java/org/springblade/weixin/controller/WeChatUserController.java +++ b/src/main/java/org/springblade/weixin/controller/WeChatUserController.java @@ -1,5 +1,6 @@ package org.springblade.weixin.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; @@ -22,6 +23,14 @@ public class WeChatUserController { return R.data(weChatUserService.page(Condition.getPage(query), Wrappers.lambdaQuery(weChatUser))); } + /** + * 统计用户购买次数 + */ + @GetMapping("/buyCount") + public R> buyCount(WeChatUser weChatUser, Query query) { + return R.data(weChatUserService.buyCount(Condition.getPage(query), weChatUser)); + } + @PostMapping("/save") public R save(@RequestBody WeChatUser weChatUser) { weChatUserService.save(weChatUser); diff --git a/src/main/java/org/springblade/weixin/dto/BuyCount.java b/src/main/java/org/springblade/weixin/dto/BuyCount.java new file mode 100644 index 0000000..4c3171c --- /dev/null +++ b/src/main/java/org/springblade/weixin/dto/BuyCount.java @@ -0,0 +1,11 @@ +package org.springblade.weixin.dto; + +import lombok.Data; + +@Data +public class BuyCount { + + private String phone; + + private Integer count; +} diff --git a/src/main/java/org/springblade/weixin/entity/WeChatUser.java b/src/main/java/org/springblade/weixin/entity/WeChatUser.java index 42b4648..ff52513 100644 --- a/src/main/java/org/springblade/weixin/entity/WeChatUser.java +++ b/src/main/java/org/springblade/weixin/entity/WeChatUser.java @@ -1,5 +1,6 @@ package org.springblade.weixin.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; @@ -29,4 +30,9 @@ public class WeChatUser extends BaseEntity { */ private String avatar; + /** + * 购买次数 + */ + @TableField(exist = false) + private Integer count; } diff --git a/src/main/java/org/springblade/weixin/mapper/WeChatUserMapper.java b/src/main/java/org/springblade/weixin/mapper/WeChatUserMapper.java index 9b4749f..4a88ada 100644 --- a/src/main/java/org/springblade/weixin/mapper/WeChatUserMapper.java +++ b/src/main/java/org/springblade/weixin/mapper/WeChatUserMapper.java @@ -17,12 +17,16 @@ package org.springblade.weixin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.weixin.dto.BuyCount; import org.springblade.weixin.entity.WeChatUser; +import java.util.List; + /** * Mapper 接口 * @author BladeX */ public interface WeChatUserMapper extends BaseMapper { + List buyCount(); } diff --git a/src/main/java/org/springblade/weixin/mapper/WeChatUserMapper.xml b/src/main/java/org/springblade/weixin/mapper/WeChatUserMapper.xml index c498422..439d004 100644 --- a/src/main/java/org/springblade/weixin/mapper/WeChatUserMapper.xml +++ b/src/main/java/org/springblade/weixin/mapper/WeChatUserMapper.xml @@ -2,4 +2,10 @@ + diff --git a/src/main/java/org/springblade/weixin/service/IWeChatUserService.java b/src/main/java/org/springblade/weixin/service/IWeChatUserService.java index c2e9564..818ede8 100644 --- a/src/main/java/org/springblade/weixin/service/IWeChatUserService.java +++ b/src/main/java/org/springblade/weixin/service/IWeChatUserService.java @@ -16,6 +16,7 @@ */ package org.springblade.weixin.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.weixin.entity.WeChatUser; @@ -26,4 +27,5 @@ import org.springblade.weixin.entity.WeChatUser; */ public interface IWeChatUserService extends BaseService { + IPage buyCount(IPage page, WeChatUser weChatUser); } diff --git a/src/main/java/org/springblade/weixin/service/impl/WeChatUserServiceImpl.java b/src/main/java/org/springblade/weixin/service/impl/WeChatUserServiceImpl.java index 416cbb8..449e0e2 100644 --- a/src/main/java/org/springblade/weixin/service/impl/WeChatUserServiceImpl.java +++ b/src/main/java/org/springblade/weixin/service/impl/WeChatUserServiceImpl.java @@ -16,21 +16,57 @@ */ package org.springblade.weixin.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.modules.desk.entity.Order; +import org.springblade.modules.desk.mapper.OrderMapper; +import org.springblade.modules.desk.service.IOrderService; import org.springblade.modules.system.entity.ApiScope; import org.springblade.modules.system.mapper.ApiScopeMapper; import org.springblade.modules.system.service.IApiScopeService; +import org.springblade.weixin.dto.BuyCount; import org.springblade.weixin.entity.WeChatUser; import org.springblade.weixin.mapper.WeChatUserMapper; import org.springblade.weixin.service.IWeChatUserService; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * 服务实现类 - * * @author BladeX */ @Service +@AllArgsConstructor public class WeChatUserServiceImpl extends BaseServiceImpl implements IWeChatUserService { + private final WeChatUserMapper weChatUserMapper; + + @Override + public IPage buyCount(IPage page, WeChatUser weChatUser) { + IPage userIPage = this.page(page, Wrappers.lambdaQuery(weChatUser).select(WeChatUser::getUsername, WeChatUser::getPhone)); + List records = userIPage.getRecords(); + if (CollectionUtils.isNotEmpty(records)) { + List buyCount = weChatUserMapper.buyCount(); + Map collect = buyCount.stream().collect(Collectors.toMap(BuyCount::getPhone, BuyCount::getCount)); + + records.forEach(weChatUser1 -> { + Integer count = collect.get(weChatUser1.getPhone()); + weChatUser1.setCount(count != null ? count : 0); + }); + userIPage.setRecords(records); + } + return userIPage; + } + + } diff --git a/src/main/java/org/springblade/weixin/utils/WxPayUtils.java b/src/main/java/org/springblade/weixin/utils/WxPayUtils.java index 230d567..48895b1 100644 --- a/src/main/java/org/springblade/weixin/utils/WxPayUtils.java +++ b/src/main/java/org/springblade/weixin/utils/WxPayUtils.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder; import com.wechat.pay.contrib.apache.httpclient.auth.*; import com.wechat.pay.contrib.apache.httpclient.util.PemUtil; +import org.apache.commons.collections4.QueueUtils; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; @@ -12,6 +13,8 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springblade.core.tool.utils.SpringUtil; +import org.springblade.core.tool.utils.StringUtil; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -97,7 +100,7 @@ public class WxPayUtils { * https://pay.weixin.qq.com/wiki/doc/apiv3_partner/open/pay/chapter2_1.shtml */ public static String createOrderJSApiV3(String openId) { - payLoading(); +// payLoading(); //请求URL HttpPost httpPost = new HttpPost(JSApiPayUrl); // 请求body参数 @@ -109,6 +112,9 @@ public class WxPayUtils { //完成签名并执行请求 CloseableHttpResponse response = null; try { + if (httpClient == null) { + httpClient = SpringUtil.getBean(CloseableHttpClient.class); + } response = httpClient.execute(httpPost); int statusCode = response.getStatusLine().getStatusCode(); if (statusCode == 200) {