From 36395356b62b9a6c7ab4e4e40bdb30b2c0b03e1f Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 15 Jan 2021 15:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/GovLoginServiceImpl.java   | 7 ++++---
 .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 7 ++++---
 .../main/java/com/epmet/dto/form/StaffWechatFormDTO.java   | 5 +++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
index ee60b3c22f..1bedcc9a7a 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
@@ -152,7 +152,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         }
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
         //2、记录staff_wechat
-        this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), wxMaJscode2SessionResult.getOpenid());
+        this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), wxMaJscode2SessionResult.getOpenid(), staffLatestAgencyResultDTO.getCustomerId());
         //3、记录登录日志
         this.saveStaffLoginRecord(staffLatestAgencyResultDTO);
         //4、获取用户token
@@ -276,7 +276,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(LoginConstant.APP_GOV, formDTO.getWxCode(), formDTO.getAppId());
 
         //3、记录staff_wechat,并记录用户激活状态，激活时间
-        this.savestaffwechat(customerStaff.getUserId(), wxMaJscode2SessionResult.getOpenid());
+        this.savestaffwechat(customerStaff.getUserId(), wxMaJscode2SessionResult.getOpenid(), formDTO.getCustomerId());
         //4、记录登录日志
         this.saveStaffLoginRecord(formDTO, customerStaff.getUserId(), wxMaJscode2SessionResult.getOpenid());
         //5.1、获取用户token
@@ -401,10 +401,11 @@ public class GovLoginServiceImpl implements GovLoginService {
      * @Description 保存微信和当前登录用户关系
      * @Date 2020/4/18 22:54
      **/
-    private Result savestaffwechat(String userId, String openid) {
+    private Result savestaffwechat(String userId, String openid, String customerId) {
         StaffWechatFormDTO staffWechatFormDTO = new StaffWechatFormDTO();
         staffWechatFormDTO.setUserId(userId);
         staffWechatFormDTO.setWxOpenId(openid);
+        staffWechatFormDTO.setCustomerId(customerId);
         return epmetUserFeignClient.saveStaffWechat(staffWechatFormDTO);
     }
 
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
index d1cc70552e..024010f05b 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
@@ -153,7 +153,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
 
         //3.记录staff_wechat
-        this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), userWechatDTO.getWxOpenId());
+        this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), userWechatDTO.getWxOpenId(), staffLatestAgencyResultDTO.getCustomerId());
 
         //4.记录登录日志
         this.saveStaffLoginRecord(staffLatestAgencyResultDTO);
@@ -175,10 +175,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
      * @Author sun
      * @Description 保存微信和当前登录用户关系
      **/
-    private Result savestaffwechat(String userId, String openid) {
+    private Result savestaffwechat(String userId, String openid, String customerId) {
         StaffWechatFormDTO staffWechatFormDTO = new StaffWechatFormDTO();
         staffWechatFormDTO.setUserId(userId);
         staffWechatFormDTO.setWxOpenId(openid);
+        staffWechatFormDTO.setCustomerId(customerId);
         return epmetUserOpenFeignClient.saveStaffWechat(staffWechatFormDTO);
     }
 
@@ -366,7 +367,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         wxMaJscode2SessionResult.setUnionid("");
         // end
         //3、记录staff_wechat,并记录用户激活状态，激活时间
-        this.savestaffwechat(customerStaff.getUserId(), userWechatDTO.getWxOpenId());
+        this.savestaffwechat(customerStaff.getUserId(), userWechatDTO.getWxOpenId(), formDTO.getCustomerId());
         //4、记录登录日志
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = new StaffLatestAgencyResultDTO();
         staffLatestAgencyResultDTO.setCustomerId(formDTO.getCustomerId());
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffWechatFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffWechatFormDTO.java
index 37687e0b1b..2810e342ba 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffWechatFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffWechatFormDTO.java
@@ -24,5 +24,10 @@ public class StaffWechatFormDTO implements Serializable {
      */
     @NotBlank(message = "openId不能为空")
     private String wxOpenId;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
 }