代码bug提交

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -224,6 +224,8 @@ public class AppUserServiceImpl implements AppUserService {
         formDTO.setOpenId(wxMaJscode2SessionResult.getOpenid());
         formDTO.setUnionId(wxMaJscode2SessionResult.getUnionid());
         // Result<UserDTO> userInfoResult = userFeignClient.queryUserDto(formDTO);
+        logger.info("getToken接口调用，unionId：" + wxMaJscode2SessionResult.getUnionid());
+        logger.info("getToken接口调用，openId：" + wxMaJscode2SessionResult.getOpenid());
         Result<CachingUserInfoDTO> userInfoResult = userFeignClient.needCachingUserInfo(formDTO);
         if (!userInfoResult.success()) {
             return new Result().error(userInfoResult.getMsg());
@@ -300,7 +302,7 @@ public class AppUserServiceImpl implements AppUserService {
         GridLeaderRegisterDTO leaderRegisterDto = adminResult.getData();
 
         // 组装用户注册信息
-        EpdcGridLeaderRegisterDTO gridLeaderRegister = this.packageGridLeaderWhileRegister(leaderRegisterDto.getSysUser(), formDto.getWxCode());
+        EpdcGridLeaderRegisterDTO gridLeaderRegister = this.packageGridLeaderWhileRegister(leaderRegisterDto.getSysUser(), formDto.getWxCode(),formDto.getType());
         List<UserGridRelationDTO> userGridList = ConvertUtils.sourceToTarget(leaderRegisterDto.getLeaderGridList(), UserGridRelationDTO.class);
         for (UserGridRelationDTO item : userGridList) {
             item.setAllDeptNames(item.getDistrict() + "-" + item.getStreet() + "-" + item.getCommunity() + "-" + item.getGrid());
@@ -336,13 +338,14 @@ public class AppUserServiceImpl implements AppUserService {
      *
      * @param sysUser 后台管理端管理员账号
      * @param wxCode
+     * @param formDto
      * @return com.elink.esua.epdc.dto.UserDTO
      * @author work@yujt.net.cn
      * @date 2019/10/23 10:01
      */
-    private EpdcGridLeaderRegisterDTO packageGridLeaderWhileRegister(SysUserDTO sysUser, String wxCode) {
+    private EpdcGridLeaderRegisterDTO packageGridLeaderWhileRegister(SysUserDTO sysUser, String wxCode, String formDto) {
 
-        WxMaJscode2SessionResult wxMaUser = this.getWxMaUser(wxCode, formDto.getType());
+        WxMaJscode2SessionResult wxMaUser = this.getWxMaUser(wxCode, formDto);
         Date now = new Date();
         String mobile = sysUser.getMobile();
 
@@ -688,6 +691,8 @@ public class AppUserServiceImpl implements AppUserService {
         WxMaJscode2SessionResult wxMaResult = this.getWxMaUser(formDto.getWxCode(), formDto.getType());
         String openId = wxMaResult.getOpenid();
         String unionId = wxMaResult.getUnionid();
+        logger.info("getTokenV2接口调用，unionId：" + openId);
+        logger.info("getTokenV2接口调用，openId：" + unionId);
 //        if (null == formDto.getGridId()) {
 //            // 获取用户绑定网格信息
 //            Result<EpdcUserRegisterInfoResultDTO> dtoResult = userFeignClient.getUserLastSwitchGrid(openId);
@@ -814,6 +819,8 @@ public class AppUserServiceImpl implements AppUserService {
             if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) {
                 return new Result().error("解析微信开放平台ID失败");
             }
+            logger.info("完善用户信息(带验证码)接口调用，unionId：" + wxMaUserInfo.getUnionId());
+            logger.info("完善用户信息(带验证码)接口调用，openId：" + wxMaUserInfo.getOpenId());
             userDto.setWxUnionId(wxMaUserInfo.getUnionId());
             //检验志愿者去哪儿 和 居民端 用户重复问题
             String userId = this.checkRepeatUser(wxMaUserInfo);
@@ -1386,6 +1393,8 @@ public class AppUserServiceImpl implements AppUserService {
         if (StringUtils.isNotBlank(wxCode)) {
             // 解析微信用户openid
             WxMaJscode2SessionResult maJscode2SessionResult = getWxMaUser(wxCode, infoDto.getType());
+            logger.info("完善用户信息(不带验证码)接口调用，unionId：" + maJscode2SessionResult.getUnionid());
+            logger.info("完善用户信息(不带验证码)接口调用，openId：" + maJscode2SessionResult.getOpenid());
             userDto.setWxOpenId(maJscode2SessionResult.getOpenid());
             // 解析微信用户加密数据
             if (StringUtils.isNotBlank(iv) && StringUtils.isNotBlank(encryptedData)) {

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml

@@ -119,7 +119,7 @@ wx:
         token: #微信小程序消息服务器配置的token
         aesKey: #微信小程序消息服务器配置的EncodingAESKey
         msgDataFormat: JSON
-     - appid: @volunteer.wx.ma.appId@
+      - appid: @volunteer.wx.ma.appId@
         secret: @volunteer.wx.ma.secret@
         token: #微信小程序消息服务器配置的token
         aesKey: #微信小程序消息服务器配置的EncodingAESKey

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcGridLeaderRegisterSubmitFormDTO.java

@@ -33,4 +33,9 @@ public class EpdcGridLeaderRegisterSubmitFormDTO implements Serializable {
      */
     @NotBlank(message = "微信code不能为空")
     private String wxCode;
+
+    /**
+     * 小程序类型
+     */
+    private String type;
 }