From 292ea6c65bed575fba564c821e4c45a9ad8102b1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 14:54:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7wxcodetotken?= =?UTF-8?q?=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 --- .../controller/PublicUserLoginController.java | 17 ++++++---- .../com/epmet/dto/form/PaWxCodeFormDTO.java | 4 +++ .../impl/PublicUserLoginServiceImpl.java | 5 ++- .../epmet/dto/form/RegisterByAuthFormDTO.java | 12 +++++++ .../epmet/dto/form/RegisterInfoFormDTO.java | 9 ++++++ .../dto/form/SaveUserVisitedFormDTO.java | 6 ++++ .../epmet/dto/form/WxCodeToTokenFormDTO.java | 28 +++++++++++++++++ .../epmet/controller/PaUserController.java | 10 +++--- .../java/com/epmet/dao/CustomerMpDao.java | 4 +-- .../java/com/epmet/dao/PaCustomerDao.java | 4 +-- .../java/com/epmet/dao/PaUserVisitedDao.java | 4 +-- .../java/com/epmet/dao/PaUserWechatDao.java | 4 +-- .../java/com/epmet/service/PaUserService.java | 6 ++-- .../epmet/service/PaUserWechatService.java | 4 +-- .../service/impl/PaCustomerServiceImpl.java | 4 +-- .../epmet/service/impl/PaUserServiceImpl.java | 28 ++++++++++++----- .../service/impl/PaUserWechatServiceImpl.java | 6 ++-- .../main/resources/mapper/CustomerMpDao.xml | 20 +++++++----- .../main/resources/mapper/PaCustomerDao.xml | 2 ++ .../resources/mapper/PaUserVisitedDao.xml | 1 + .../main/resources/mapper/PaUserWechatDao.xml | 31 ++++++++++--------- 21 files changed, 150 insertions(+), 59 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxCodeToTokenFormDTO.java diff --git a/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java index 85163f625c..4b7beadab0 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -12,11 +13,12 @@ import com.epmet.dto.form.PublicSendSmsCodeFormDTO; import com.epmet.dto.form.RegisterFormDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.PublicUserLoginService; +import com.netflix.ribbon.proxy.annotation.Http; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpRequest; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.web.bind.annotation.*; /** * 描述一下 @@ -38,8 +40,10 @@ public class PublicUserLoginController { * @description 解析wxcode获取用户信息并生成token **/ @PostMapping(value = "/wxcodetotoken") - public Result wxCodeToToken(@RequestBody PaWxCodeFormDTO formDTO) { + + public Result wxCodeToToken(@RequestHeader("source") String source, @RequestBody PaWxCodeFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, PaWxCodeFormDTO.AddUserInternalGroup.class); + formDTO.setSource(source); return new Result().ok(publicUserLoginService.wxCodeToToken(formDTO)); } @@ -66,8 +70,9 @@ public class PublicUserLoginController { * @Description 公众号-手机验证码登陆 **/ @PostMapping(value = "/loginbyphone") - public Result loginByPhone(@LoginUser TokenDto tokenDTO, @RequestBody LoginByPhoneFormDTO formDTO) { + public Result loginByPhone(@RequestHeader("source") String source, @LoginUser TokenDto tokenDTO, @RequestBody LoginByPhoneFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, LoginByPhoneFormDTO.AddUserShowGroup.class, LoginByPhoneFormDTO.LoginByPhone.class); + System.out.println(source); return new Result().ok(publicUserLoginService.loginByPhone(tokenDTO, formDTO)); } diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/PaWxCodeFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/PaWxCodeFormDTO.java index 33161e90c9..9d21fb8aea 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/form/PaWxCodeFormDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/form/PaWxCodeFormDTO.java @@ -20,4 +20,8 @@ public class PaWxCodeFormDTO implements Serializable { */ @NotBlank(message = "wxCode不能为空",groups = {AddUserInternalGroup.class}) private String wxCode; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 8acd320419..7cd1fddc8e 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -70,10 +70,13 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { public UserTokenResultDTO wxCodeToToken(PaWxCodeFormDTO formDTO) { //1.通过微信code获取用户基本信息 WxMpUser wxMpUser = this.getWxMpUser(formDTO.getWxCode()); + WxCodeToTokenFormDTO dto = new WxCodeToTokenFormDTO(); + dto.setWxMpUser(wxMpUser); + dto.setSource(formDTO.getSource()); //2.将获取的用户基本信息初始化到数据库 String url = ThirdApiConstant.THIRD_PAUSER_SAVEUSER; - Result result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(wxMpUser)); + Result result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(dto)); if (!result.success()) { throw new RenException(PublicUserLoginConstant.SAVE_USER_EXCEPTION); } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java index c8c1288c12..c23d1461a6 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java @@ -1,7 +1,9 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -12,10 +14,20 @@ import java.io.Serializable; public class RegisterByAuthFormDTO implements Serializable { private static final long serialVersionUID = -6547893374373422628L; + public interface AddUserInternalGroup { + } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 初始化状态（0:已初始化、1:未初始化） * */ private Integer initState; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + @NotBlank(message = "数据来源不能为空", groups = {RegisterByAuthFormDTO.AddUserInternalGroup.class, RegisterByAuthFormDTO.AddUserShowGroup.class}) + private String source; + } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterInfoFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterInfoFormDTO.java index 7b20804835..e4afc383d5 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterInfoFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterInfoFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.Min; @@ -17,6 +18,8 @@ public class RegisterInfoFormDTO implements Serializable { public interface AddUserInternalGroup { } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 当前页 @@ -29,4 +32,10 @@ public class RegisterInfoFormDTO implements Serializable { * */ private Integer pageSize = 20; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + @NotBlank(message = "数据来源不能为空", groups = {RegisterInfoFormDTO.AddUserInternalGroup.class, RegisterInfoFormDTO.AddUserShowGroup.class}) + private String source; + } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveUserVisitedFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveUserVisitedFormDTO.java index eecf8da6d0..d74f56a2a3 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveUserVisitedFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveUserVisitedFormDTO.java @@ -31,4 +31,10 @@ public class SaveUserVisitedFormDTO implements Serializable { */ private String phone; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + + } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxCodeToTokenFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxCodeToTokenFormDTO.java new file mode 100644 index 0000000000..fa671d63d5 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxCodeToTokenFormDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.form; + +import lombok.Data; +import me.chanjar.weixin.mp.bean.result.WxMpUser; + +import java.io.Serializable; +import java.util.Date; + +/** + * 公众号-wxcode换取token保存微信用户信息-接口入参 + * @Author sun + */ +@Data +public class WxCodeToTokenFormDTO implements Serializable { + + private static final long serialVersionUID = -6163303184086480522L; + + /** + * 微信用户信息 + */ + private WxMpUser wxMpUser; + + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserController.java index d7c07bc506..5c28f75d2c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserController.java @@ -23,14 +23,14 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.PaUserDTO; +import com.epmet.dto.form.WxCodeToTokenFormDTO; import com.epmet.dto.result.CustomerUserResultDTO; import com.epmet.dto.result.SaveUserResultDTO; import com.epmet.excel.PaUserExcel; import com.epmet.service.PaUserService; -import me.chanjar.weixin.mp.bean.result.WxMpUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -95,14 +95,14 @@ public class PaUserController { } /** - * @param wxMpUser + * @param formDTO * @return * @Author sun * @Description 根据openId新增或更新用户信息 **/ @PostMapping(value = "/saveuser") - public Result saveUser(@RequestBody WxMpUser wxMpUser) { - return new Result().ok(paUserService.saveUser(wxMpUser)); + public Result saveUser(@RequestBody WxCodeToTokenFormDTO formDTO) { + return new Result().ok(paUserService.saveUser(formDTO)); } /** diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java index 3b3a4ee9b8..a3fca59cc8 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java @@ -49,9 +49,9 @@ public interface CustomerMpDao extends BaseDao { * @param * @return * @Author sun - * @Description 查询所有客户小程序的授权信息 + * @Description 根据数据来源查询所有客户小程序的授权信息 **/ - List selectAll(); + List selectAll(@Param("source")String source); /** * @Description 查询授权的数量 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java index f22a55b563..5d403cb1cf 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java @@ -49,9 +49,9 @@ public interface PaCustomerDao extends BaseDao { * @param * @return * @Author sun - * @Description 查询公众号注册的客户信息列表 + * @Description 根据数据来源查询公众号注册的客户信息列表 **/ - List registerInfo(); + List registerInfo(@Param("source") String source); /** * @param dto diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserVisitedDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserVisitedDao.java index 943bb0a132..76c9b34ff6 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserVisitedDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserVisitedDao.java @@ -36,7 +36,7 @@ public interface PaUserVisitedDao extends BaseDao { * @param openId * @return * @Author sun - * @Description 根据openId查询登陆访问记录数据，按时间倒序 + * @Description 根据数据来源和openId查询登陆访问记录数据，按时间倒序 **/ - PaUserVisitedDTO selectByOpenId(@Param("openId") String openId); + PaUserVisitedDTO selectByOpenId(@Param("openId") String openId, @Param("source") String source); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserWechatDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserWechatDao.java index 78d08c42dc..deae68e025 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserWechatDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserWechatDao.java @@ -38,9 +38,9 @@ public interface PaUserWechatDao extends BaseDao { * @param openId * @return * @Author sun - * @Description 根据openId查询user_wechat表信息 + * @Description 根据数据来源和openId查询user_wechat表信息 **/ - List selectWechatByOpenId(@Param("openId") String openId); + List selectWechatByOpenId(@Param("openId") String openId, @Param("source") String source); /** * @param dto diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaUserService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaUserService.java index c9208eef81..1105fe6301 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaUserService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaUserService.java @@ -20,10 +20,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.PaUserDTO; +import com.epmet.dto.form.WxCodeToTokenFormDTO; import com.epmet.dto.result.CustomerUserResultDTO; import com.epmet.dto.result.SaveUserResultDTO; import com.epmet.entity.PaUserEntity; -import me.chanjar.weixin.mp.bean.result.WxMpUser; import java.util.List; import java.util.Map; @@ -97,12 +97,12 @@ public interface PaUserService extends BaseService { void delete(String[] ids); /** - * @param wxMpUser + * @param formDTO * @return * @Author sun * @Description 根据openId新增或更新用户信息 **/ - SaveUserResultDTO saveUser(WxMpUser wxMpUser); + SaveUserResultDTO saveUser(WxCodeToTokenFormDTO formDTO); /** * @param phone diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaUserWechatService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaUserWechatService.java index bc873038ac..e47be27016 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaUserWechatService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaUserWechatService.java @@ -97,7 +97,7 @@ public interface PaUserWechatService extends BaseService { * @param openId * @return * @Author sun - * @Description 根据openId查询user_wechat表信息 + * @Description 根据数据来源和openId查询user_wechat表信息 **/ - List getWechatByOpenId(String openId); + List getWechatByOpenId(String openId, String source); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index df6c581a92..fb4c90293b 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -408,9 +408,9 @@ public class PaCustomerServiceImpl extends BaseServiceImpl list = baseDao.registerInfo(); + List list = baseDao.registerInfo(formDTO.getSource()); //2.查询客户小程序授权信息 - List mpList = customerMpDao.selectAll(); + List mpList = customerMpDao.selectAll(formDTO.getSource()); //3.封装数据 list.forEach(l -> { mpList.forEach(mp -> { diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserServiceImpl.java index d5acc59fb5..093f167936 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserServiceImpl.java @@ -34,12 +34,15 @@ import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.PaUserDTO; import com.epmet.dto.PaUserVisitedDTO; import com.epmet.dto.PaUserWechatDTO; +import com.epmet.dto.form.SaveUserVisitedFormDTO; +import com.epmet.dto.form.WxCodeToTokenFormDTO; import com.epmet.dto.result.CustomerUserResultDTO; import com.epmet.dto.result.SaveUserResultDTO; import com.epmet.entity.PaUserEntity; import com.epmet.entity.PaUserWechatEntity; import com.epmet.redis.PaUserRedis; import com.epmet.service.PaUserService; +import com.epmet.service.PaUserVisitedService; import com.epmet.service.PaUserWechatService; import me.chanjar.weixin.mp.bean.result.WxMpUser; import org.apache.commons.lang3.StringUtils; @@ -72,6 +75,8 @@ public class PaUserServiceImpl extends BaseServiceImpl private PaUserWechatDao paUserWechatDao; @Autowired private PaUserVisitedDao paUserVisitedDao; + @Autowired + private PaUserVisitedService paUserVisitedService; @Override public PageData page(Map params) { @@ -126,22 +131,24 @@ public class PaUserServiceImpl extends BaseServiceImpl } /** - * @param wxMpUser + * @param formDTO * @return * @Author sun * @Description 根据openId新增或更新用户信息 **/ @Override @Transactional(rollbackFor = Exception.class) - public SaveUserResultDTO saveUser(WxMpUser wxMpUser) { + public SaveUserResultDTO saveUser(WxCodeToTokenFormDTO formDTO) { + WxMpUser wxMpUser = formDTO.getWxMpUser(); SaveUserResultDTO resultDTO = new SaveUserResultDTO(); - //1.根据openId查询user_wechat表是否存在用户信息(user表和user_wechat表数据时多对多关系) - List wechatDTO = paUserWechatService.getWechatByOpenId(wxMpUser.getOpenId()); + //1.根据openId查询user_wechat表是否存在用户信息(user表和user_wechat表数据是多对多关系) + List wechatDTO = paUserWechatService.getWechatByOpenId(wxMpUser.getOpenId(), formDTO.getSource()); //2.不存在则新增用户信息,存在则更新user_wechat表信息 if (null == wechatDTO || wechatDTO.size() < NumConstant.ONE) { //2.1、user表新增数据 PaUserEntity userEntity = new PaUserEntity(); + userEntity.setSource(formDTO.getSource()); baseDao.insert(userEntity); //2.2、user_wechat表新增数据 PaUserWechatEntity wechatEntity = new PaUserWechatEntity(); @@ -157,9 +164,16 @@ public class PaUserServiceImpl extends BaseServiceImpl wechatEntity.setLanguage(null == wxMpUser.getLanguage() ? "" : wxMpUser.getLanguage()); paUserWechatService.insert(wechatEntity); + //2.3、pa_user_visited表新增访问记录数据 + SaveUserVisitedFormDTO visited = new SaveUserVisitedFormDTO(); + visited.setUserId(userEntity.getId()); + visited.setLogonUserId(userEntity.getId()); + visited.setSource(formDTO.getSource()); + paUserVisitedService.saveUserVisited(visited); + resultDTO.setUserId(userEntity.getId()); } else { - //2.3、批量更新user_wechat表数据 + //2.4、批量更新user_wechat表数据 List wechatEntity = ConvertUtils.sourceToTarget(wechatDTO, PaUserWechatEntity.class); for(PaUserWechatEntity entity : wechatEntity){ entity.setGender(wxMpUser.getSex().toString()); @@ -172,8 +186,8 @@ public class PaUserServiceImpl extends BaseServiceImpl } paUserWechatService.updateBatchById(wechatEntity); - //2.4、根据openid查询用户登陆访问记录表数据，按登陆时间倒序 - PaUserVisitedDTO visitedDTO = paUserVisitedDao.selectByOpenId(wxMpUser.getOpenId()); + //2.5、根据openid查询用户登陆访问记录表数据，按登陆时间倒序 + PaUserVisitedDTO visitedDTO = paUserVisitedDao.selectByOpenId(wxMpUser.getOpenId(), formDTO.getSource()); if (null == visitedDTO || "".equals(visitedDTO.getUserId())) { logger.error("根据openid查询用户访问记录表数据失败，openid->"+wxMpUser.getOpenId()); throw new RenException(PaConstant.SELECT_VISITED_EXCEPTION); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserWechatServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserWechatServiceImpl.java index 46726a9823..0820b359d4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserWechatServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserWechatServiceImpl.java @@ -105,11 +105,11 @@ public class PaUserWechatServiceImpl extends BaseServiceImpl getWechatByOpenId(String openId) { - return baseDao.selectWechatByOpenId(openId); + public List getWechatByOpenId(String openId, String source) { + return baseDao.selectWechatByOpenId(openId, source); } } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml index 20632a7f3c..cf24463139 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml @@ -61,17 +61,21 @@ @@ -64,6 +65,7 @@ pa_customer WHERE del_flag = '0' + AND source = #{source} AND is_initialize = #{initState} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserVisitedDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserVisitedDao.xml index 76a3d7fee6..15ed900ef8 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserVisitedDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserVisitedDao.xml @@ -14,6 +14,7 @@ pa_user_visited WHERE del_flag = '0' + AND source = #{source} AND wx_open_id = #{openId} ORDER BY created_time DESC diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserWechatDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserWechatDao.xml index e571713767..9a5a08e973 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserWechatDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserWechatDao.xml @@ -5,22 +5,25 @@