cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yshop2.0.3新增公众号获取微信地址权限,优化一些代码

Browse Source
This commit is contained in:
hupeng
2020-03-14 18:21:07 +08:00
parent ec863e471e
commit 6d114ac466
5 changed files with 32 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java
View File

@ -130,28 +130,19 @@ public class StoreOrderController extends BaseController {
other.setIntegralFull(systemConfigService.getData("integral_full"));
other.setIntegralMax(systemConfigService.getData("integral_max"));
//todo 拼团 砍价 秒杀
//拼团 砍价 秒杀
int combinationId = 0;
if(cartId.split(",").length == 1){
YxStoreCartQueryVo cartQueryVo = cartService.getYxStoreCartById(Integer
.valueOf(cartId));
combinationId = cartQueryVo.getCombinationId();
}
int secKillId = 0;
if(cartId.split(",").length == 1){
YxStoreCartQueryVo cartQueryVo = cartService.getYxStoreCartById(Integer
.valueOf(cartId));
secKillId = cartQueryVo.getSeckillId();
}
int bargainId = 0;
if(cartId.split(",").length == 1){
YxStoreCartQueryVo cartQueryVo = cartService.getYxStoreCartById(Integer
.valueOf(cartId));
combinationId = cartQueryVo.getCombinationId();
secKillId = cartQueryVo.getSeckillId();
bargainId = cartQueryVo.getBargainId();
}
//拼团砍价秒杀类产品不参与抵扣
if(combinationId > 0 || secKillId > 0 || bargainId > 0) confirmOrderDTO.setDeduction(true);

52
yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java
View File

@ -156,27 +156,20 @@ public class AuthController {
WxMpOAuth2AccessToken wxMpOAuth2AccessToken = wxService.oauth2getAccessToken(code);
WxMpUser wxMpUser = wxService.oauth2getUserInfo(wxMpOAuth2AccessToken, null);
String openid = wxMpUser.getOpenId();
YxWechatUser wechatUser = wechatUserService.getUserInfo(openid);
YxUser yxUser = userService.findByName(openid);
JwtUser jwtUser = null;
if (ObjectUtil.isNotNull(wechatUser)) {
YxUserQueryVo yxUserQueryVo = userService.getYxUserById(wechatUser.getUid());
if (ObjectUtil.isNotNull(yxUserQueryVo)) {
jwtUser = (JwtUser) userDetailsService.loadUserByUsername(wechatUser.getOpenid());
} else {
if (ObjectUtil.isNotNull(wechatUser)) {
wechatUserService.removeById(wechatUser.getUid());
}
if (ObjectUtil.isNotNull(yxUserQueryVo)) {
userService.removeById(yxUserQueryVo.getUid());
}
return ApiResult.fail(ApiCode.FAIL_AUTH, "授权失败");
}
if (ObjectUtil.isNotNull(yxUser)) {
jwtUser = (JwtUser) userDetailsService.loadUserByUsername(openid);
} else {
//如果后台删除了用户
YxWechatUser wechatUser = wechatUserService.getUserInfo(openid);
if(wechatUser != null){
wechatUserService.removeById(wechatUser.getUid());
}
//过滤掉表情
String nickname = EmojiParser.removeAllEmojis(wxMpUser.getNickname());
log.info("昵称：{}", nickname);
@ -293,27 +286,22 @@ public class AuthController {
wxMaConfig.setAppid(appId);
wxMaConfig.setSecret(secret);
wxMaService.setWxMaConfig(wxMaConfig);
WxMaJscode2SessionResult session = wxMaService.getUserService().getSessionInfo(code);
YxWechatUser wechatUser = wechatUserService.getUserAppInfo(session.getOpenid());
;
String openid = session.getOpenid();
YxUser yxUser = userService.findByName(openid);
JwtUser jwtUser = null;
if (ObjectUtil.isNotNull(wechatUser)) {
YxUserQueryVo yxUserQueryVo = userService.getYxUserById(wechatUser.getUid());
if (ObjectUtil.isNotNull(yxUserQueryVo)) {
jwtUser = (JwtUser) userDetailsService.loadUserByUsername(wechatUser.getRoutineOpenid());
} else {
if (ObjectUtil.isNotNull(wechatUser)) {
wechatUserService.removeById(wechatUser.getUid());
}
if (ObjectUtil.isNotNull(yxUserQueryVo)) {
userService.removeById(yxUserQueryVo.getUid());
}
return ApiResult.fail(ApiCode.FAIL_AUTH, "授权失败");
if (ObjectUtil.isNotNull(yxUser)) {
jwtUser = (JwtUser) userDetailsService.loadUserByUsername(openid);
} else {
//如果后台删除了用户
YxWechatUser wechatUser = wechatUserService.getUserAppInfo(openid);
if(wechatUser != null){
wechatUserService.removeById(wechatUser.getUid());
}
} else {
WxMaUserInfo wxMpUser = wxMaService.getUserService()
.getUserInfo(session.getSessionKey(), encryptedData, iv);
//过滤掉表情

5
yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java
View File

@ -13,6 +13,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.web.vo.Paging;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.order.service.YxStoreOrderService;
import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo;
import co.yixiang.modules.shop.service.YxStoreCouponUserService;
@ -423,13 +424,15 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
@Override
public YxUserQueryVo getYxUserById(Serializable id){
YxUserQueryVo userQueryVo = yxUserMapper.getYxUserById(id);
userQueryVo.setOrderStatusNum(orderService.orderData((int)id));
return userQueryVo;
}
@Override
public YxUserQueryVo getNewYxUserById(Serializable id) {
YxUserQueryVo userQueryVo = yxUserMapper.getYxUserById(id);
if(userQueryVo == null){
throw new ErrorRequestException("用户不存在");
}
userQueryVo.setOrderStatusNum(orderService.orderData((int)id));
userQueryVo.setCouponCount(storeCouponUserService.getUserValidCouponCount((int)id));
//判断分销类型

4
yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxWechatUserServiceImpl.java
View File

@ -46,14 +46,14 @@ public class YxWechatUserServiceImpl extends BaseServiceImpl<YxWechatUserMapper,
@Override
public YxWechatUser getUserAppInfo(String openid) {
QueryWrapper<YxWechatUser> wrapper = new QueryWrapper<>();
wrapper.eq("routine_openid",openid);
wrapper.eq("routine_openid",openid).last("limit 1");
return yxWechatUserMapper.selectOne(wrapper);
}
@Override
public YxWechatUser getUserInfo(String openid) {
QueryWrapper<YxWechatUser> wrapper = new QueryWrapper<>();
wrapper.eq("openid",openid);
wrapper.eq("openid",openid).last("limit 1");
return yxWechatUserMapper.selectOne(wrapper);
}

3
yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java
View File

@ -93,7 +93,8 @@ public class WechatController extends BaseController {
map.put("appId",jsapiSignature.getAppId());
map.put("jsApiList",new String[]{"updateAppMessageShareData","openLocation","scanQRCode",
"chooseWXPay","updateAppMessageShareData","updateTimelineShareData"});
"chooseWXPay","updateAppMessageShareData","updateTimelineShareData",
"openAddress","editAddress"});
map.put("nonceStr",jsapiSignature.getNonceStr());
map.put("signature",jsapiSignature.getSignature());
map.put("timestamp",jsapiSignature.getTimestamp());