公众号服务接口自测问题修改

epmet-auth/src/main/java/com/epmet/dto/form/PublicSendSmsCodeFormDTO.java

@@ -21,8 +21,13 @@ public class PublicSendSmsCodeFormDTO implements Serializable {
     public interface AddUserShowGroup extends CustomerClientShowGroup {
     }
 
+    /**
+     * 手机号
+     */
     @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
     private String phone;
-    @NotBlank(message = "是否登陆不能为空", groups = {AddUserShowGroup.class})
+    /**
+     * 是否登陆（登陆：true  注册：false）
+     */
     private Boolean isLogon;
 }

epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java

@@ -189,7 +189,7 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
 
         //2.用户不存在时不允许登陆
         PaUserDTO userDTO = resultDTO.getPaUserResult();
-        if (null == resultDTO || StringUtils.isBlank(userDTO.getId())) {
+        if (null == userDTO || StringUtils.isBlank(userDTO.getId())) {
             throw new RenException(PublicUserLoginConstant.LOGON_EXCEPTION);
         }
 

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/MyInfoResultDTO.java

@@ -22,31 +22,31 @@ public class MyInfoResultDTO implements Serializable {
      */
     private String agencyName = "";
     /**
-     * 新增客户Id
+     * 组织级别
      */
     private String level = "";
     /**
-     * 包含customerId的token
+     * 省
      */
     private String province = "";
     /**
-     * 新增客户Id
+     * 市
      */
     private String city = "";
     /**
-     * 包含customerId的token
+     * 区
      */
     private String district = "";
     /**
-     * 新增客户Id
+     * 党支部数量
      */
     private Integer partyBranchNum;
     /**
-     * 包含customerId的token
+     * 居民端授权状态(0：未授权，1：已授权)
      */
     private Integer resiAuthorization;
     /**
-     * 新增客户Id
+     * 政府端授权状态(0：未授权，1：已授权)
      */
     private Integer workAuthorization;
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java

@@ -10,11 +10,18 @@ public interface PaConstant {
      * 手机号注册
      */
     String PHONE_EXCEPTION = "手机号已存在，不允许再次注册";
-
+    /**
+     * 更新用户信息失败
+     */
+    String UPDATE_USER_EXCEPTION = "更新用户信息失败";
     /**
      * 根据userId查询pa_user_wechat表失败
      */
     String SELECT_WECHAT_EXCEPTION = "获取用户微信信息失败";
+    /**
+     * 保存用户访问记录数据失败
+     */
+    String SAVE_VISITED_EXCEPTION = "保存用户访问记录数据失败";
 
     /**
      * 组织级别对应的key、name
@@ -49,4 +56,8 @@ public interface PaConstant {
     String CLIENT_RESI = "resi";
     String CLIENT_WORK = "work";
 
+    /**
+     * 获取缓存中token信息失败
+     */
+    String TOKEN_EXCEPTION = "token已过期";
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java

@@ -154,7 +154,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
     public void register(RegisterFormDTO formDTO) {
         //1.根据手机号查询到用户信息，判断用户是否存
         List<PaUserDTO> userList = paUserDao.selectUserByPhone(formDTO.getPhone());
-        if (null != userList || userList.size() > NumConstant.ZERO) {
+        if (null != userList && userList.size() > NumConstant.ZERO) {
             throw new RenException(PaConstant.PHONE_EXCEPTION);
         }
 
@@ -172,7 +172,9 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
         userEntity.setPhone(formDTO.getPhone());
         userEntity.setRealName(formDTO.getSurName());
         userEntity.setGender(formDTO.getGender().toString());
-        paUserDao.updateById(userEntity);
+        if (paUserDao.updateById(userEntity) < NumConstant.ONE) {
+            throw new RenException(PaConstant.UPDATE_USER_EXCEPTION);
+        }
 
         //2.访问记录表新增数据
         PaUserWechatDTO dto = new PaUserWechatDTO();
@@ -186,7 +188,9 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
         visitedEntity.setWxOpenId(wechatEntity.getWxOpenId());
         visitedEntity.setOpenId(wechatEntity.getWxOpenId());
         visitedEntity.setPhone(formDTO.getPhone());
-        paUserVisitedDao.insert(visitedEntity);
+        if (paUserVisitedDao.insert(visitedEntity) < NumConstant.ONE) {
+            throw new RenException(PaConstant.SAVE_VISITED_EXCEPTION);
+        }
     }
 
     /**
@@ -266,7 +270,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
         //获取缓存中的token
         TokenDto redisTokenDTO = cpUserDetailRedis.get(LoginConstant.APP_PUBLIC, LoginConstant.CLIENT_MP, tokenDTO.getUserId(), TokenDto.class);
         if (redisTokenDTO == null) {
-            return null;
+            throw new RenException(PaConstant.TOKEN_EXCEPTION);
         }
         //5-2.添加customerId
         redisTokenDTO.setCustomerId(entity.getId());
@@ -274,7 +278,6 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
         String key = RedisKeys.getCpUserKey(LoginConstant.APP_PUBLIC, LoginConstant.CLIENT_MP, tokenDTO.getUserId());
         long expire = redisUtils.getExpire(key);
         cpUserDetailRedis.set(redisTokenDTO, expire);
-
         //6.接口返参
         CreateAgencyResultDTO resultDTO = new CreateAgencyResultDTO();
         resultDTO.setCustomerId(entity.getId());
@@ -306,6 +309,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
 
         //3.封装结果信息
         MyInfoResultDTO resultDTO = ConvertUtils.sourceToTarget(agencyDTO, MyInfoResultDTO.class);
+        resultDTO.setPartyBranchNum(agencyDTO.getPartybranchnum());
         for (CustomerMpDTO mp : listMpDTO) {
             if (PaConstant.CLIENT_RESI.equals(mp.getClient())) {
                 resultDTO.setResiAuthorization(mp.getAuthorizationFlag());

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserServiceImpl.java

@@ -177,15 +177,15 @@ public class PaUserServiceImpl extends BaseServiceImpl<PaUserDao, PaUserEntity>
         CustomerUserResultDTO resultDTO = new CustomerUserResultDTO();
         List<PaUserDTO> userList = baseDao.selectUserByPhone(phone);
         if (null == userList || userList.size() < NumConstant.ONE) {
-            resultDTO.setPaUserResult(new PaUserDTO());
+            resultDTO.setPaUserResult(null);
-            resultDTO.setPaCustomerResult(new PaCustomerDTO());
+            resultDTO.setPaCustomerResult(null);
             return resultDTO;
         }
         PaUserDTO dto = userList.get(NumConstant.ZERO);
         List<PaCustomerDTO> customerList = paCustomerDao.selectCustomerByUserId(dto.getId());
 
         resultDTO.setPaUserResult(dto);
-        resultDTO.setPaCustomerResult(customerList.size() > NumConstant.ZERO ? customerList.get(NumConstant.ZERO) : new PaCustomerDTO());
+        resultDTO.setPaCustomerResult(customerList.size() > NumConstant.ZERO ? customerList.get(NumConstant.ZERO) : null);
 
         return resultDTO;
     }

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserWechatDao.xml

@@ -31,14 +31,12 @@
             user_id,
             wx_open_id,
             union_id,
-            phone,
             gender,
             nickname,
             head_img_url,
             country,
             province,
             city,
-            privilege,
             `language`
         FROM
             pa_user_wechat