From 843134abe5026651f37f6ce64b088a86e1011955 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Sat, 5 Jun 2021 15:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7weixin-java=E4=B8=BA4.1.0?=
 =?UTF-8?q?=EF=BC=8Cspringboot=E4=B8=BA2.4.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 2 +-
 .../java/co/yixiang/modules/services/AuthService.java     | 8 ++++----
 yshop-common/pom.xml                                      | 2 +-
 .../activity/service/impl/YxUserExtractServiceImpl.java   | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index f06370e0..5a0e6853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.3</version>
+        <version>2.4.6</version>
     </parent>
 
     <properties>
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 @@
     <artifactId>yshop-common</artifactId>
     <name>公共模块</name>
     <properties>
-        <weixin-java.version>4.0.7.B</weixin-java.version>
+        <weixin-java.version>4.1.0</weixin-java.version>
     </properties>
     <dependencies>
         <dependency>
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;