diff --git a/pom.xml b/pom.xml index f06370e0..5a0e6853 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3 + 2.4.6 diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java index c40e2943..8f897642 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java @@ -136,10 +136,10 @@ public class AuthService { } else { WechatUserDto wechatUser =yxUser.getWxProfile(); - if ((StrUtil.isBlank(wechatUser.getRoutineOpenid()) && StrUtil.isNotBlank(wxMpUser.getOpenId())) - || (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(wxMpUser.getUnionId()))) { - wechatUser.setRoutineOpenid(wxMpUser.getOpenId()); - wechatUser.setUnionId(wxMpUser.getUnionId()); + if ((StrUtil.isBlank(wechatUser.getRoutineOpenid()) && StrUtil.isNotBlank(session.getOpenid())) + || (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(session.getUnionid()))) { + wechatUser.setRoutineOpenid(session.getOpenid()); + wechatUser.setUnionId(session.getUnionid()); yxUser.setWxProfile(wechatUser); diff --git a/yshop-common/pom.xml b/yshop-common/pom.xml index fc005329..c48ca69f 100644 --- a/yshop-common/pom.xml +++ b/yshop-common/pom.xml @@ -12,7 +12,7 @@ yshop-common 公共模块 - 4.0.7.B + 4.1.0 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java index 58448078..01e5009a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java @@ -35,7 +35,6 @@ import co.yixiang.modules.user.service.dto.WechatUserDto; import co.yixiang.modules.user.service.dto.YxWechatUserDto; import co.yixiang.utils.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.github.binarywang.wxpay.exception.WxPayException; import com.github.pagehelper.PageInfo; import lombok.AllArgsConstructor; import org.springframework.context.ApplicationEventPublisher;