促销员注册账户取消负责人

src/main/java/com/wangxiaolu/promotion/controller/user/login/tem/TemporaryInfoCoreController.java

@@ -40,15 +40,13 @@ public class TemporaryInfoCoreController {
      */
     @PostMapping("/temporary/enroll")
     public R enrollUserInfo(@RequestBody @Validated WxTemporaryEnrollVo wxTemporaryEnrollVo) {
-        log.info("微信-促销员注册：{}", JSONObject.toJSONString(wxTemporaryEnrollVo));
         wxTemporaryEnrollVo.validate();
         // 人员信息校验
-        boolean isIden = DataUtils.idenCardPattern(wxTemporaryEnrollVo.getIdenNumber());
-        boolean isPhone = DataUtils.phonePattern(wxTemporaryEnrollVo.getPhone());
-        if (!isIden) {
-            throw new ParamException(RCode.IDEN_NUMBER_PARAM_ERROR, null);
-        }
-        if (!isPhone) {
+//        boolean isIden = DataUtils.idenCardPattern(wxTemporaryEnrollVo.getIdenNumber());
+//        if (!isIden) {
+//            throw new ParamException(RCode.IDEN_NUMBER_PARAM_ERROR, null);
+//        }
+        if (!DataUtils.phonePattern(wxTemporaryEnrollVo.getPhone())) {
             throw new ParamException(RCode.PHONE_PARAM_ERROR, null);
         }
 

src/main/java/com/wangxiaolu/promotion/domain/user/dao/TemporaryInfoDao.java

@@ -19,7 +19,7 @@ public interface TemporaryInfoDao {
     /**
      * 根据OpenId、phone查询人员是否存在(非保密信息)
      */
-    WxTemporaryInfoDto getUnimportantData(String openId,String phone);
+    WxTemporaryInfoDto selectOneByOpenId(String openId);
 
     WxTemporaryInfoDto selectOneById(Integer id);
 

src/main/java/com/wangxiaolu/promotion/domain/user/dao/impl/TemporaryInfoDaoImpl.java

@@ -7,15 +7,18 @@ import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao;
 import com.wangxiaolu.promotion.domain.user.mapper.TemporaryInfoMapper;
 import com.wangxiaolu.promotion.domain.user.mapper.entity.TemporaryInfoDO;
 import com.wangxiaolu.promotion.domain.user.wrapperQo.TemporaryWrapper;
+import com.wangxiaolu.promotion.exception.ParamException;
 import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
 import com.wangxiaolu.promotion.pojo.user.dto.WxTemporaryInfoDto;
+import com.wangxiaolu.promotion.result.basedata.RCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.sql.SQLIntegrityConstraintViolationException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -36,14 +39,25 @@ public class TemporaryInfoDaoImpl implements TemporaryInfoDao {
      */
     @Override
     public int saveWxTemporaryInfo(WxTemporaryInfoDto temporaryDto) {
-        TemporaryInfoDO entity = new TemporaryInfoDO();
-        BeanUtils.copyProperties(temporaryDto, entity);
-        return temporaryInfoMapper.insert(entity);
+        try {
+            TemporaryInfoDO entity = new TemporaryInfoDO();
+            BeanUtils.copyProperties(temporaryDto, entity);
+            int insert = temporaryInfoMapper.insert(entity);
+            return insert;
+        } catch (Exception e) {
+            String eMsg = e.getCause().getMessage();
+            if (eMsg.contains("for key 'open_id_unique'")) {
+                throw new ParamException(RCode.USER_WXOPENID_UNIQUE_ERROR);
+            } else if (eMsg.contains("for key 'phone_unique'")) {
+                throw new ParamException(RCode.USER_PHONE_UNIQUE_ERROR);
+            }
+            throw new ParamException(RCode.USER_PHONE_UNIQUE_ERROR);
+        }
     }
 
     @Override
-    public WxTemporaryInfoDto getUnimportantData(String openId, String phone) {
-        TemporaryWrapper tw = new TemporaryWrapper().setOpenId(openId).setPhone(phone);
+    public WxTemporaryInfoDto selectOneByOpenId(String openId) {
+        TemporaryWrapper tw = new TemporaryWrapper().setOpenId(openId);
         LambdaQueryWrapper<TemporaryInfoDO> doqwer = buildQueryList(tw);
         TemporaryInfoDO temDo = temporaryInfoMapper.selectOne(doqwer);
         return transitionDto(temDo);

src/main/java/com/wangxiaolu/promotion/pojo/user/vo/WxTemporaryEnrollVo.java

@@ -110,16 +110,15 @@ public class WxTemporaryEnrollVo {
             throw new ParamException(RCode.TENCENT_SMS_PHONE_CODE_ERROR, null);
         }
 
-        if (StringUtils.isBlank(idenNumber)) {
-            throw new ParamException(RCode.IDEN_NUMBER_PARAM_ERROR, null);
-        }
-
-        if (StringUtils.isBlank(deptQcOrgName)
-                || StringUtils.isBlank(chargerName)
-                || StringUtils.isBlank(deptQcId)
-                || StringUtils.isBlank(chargerQcId)) {
-            throw new ParamException(RCode.CHARGER_ID_ERROR, null);
-        }
+//        if (StringUtils.isBlank(idenNumber)) {
+//            throw new ParamException(RCode.IDEN_NUMBER_PARAM_ERROR, null);
+//        }
+//        if (StringUtils.isBlank(deptQcOrgName)
+//                || StringUtils.isBlank(chargerName)
+//                || StringUtils.isBlank(deptQcId)
+//                || StringUtils.isBlank(chargerQcId)) {
+//            throw new ParamException(RCode.CHARGER_ID_ERROR, null);
+//        }
     }
 
 }

src/main/java/com/wangxiaolu/promotion/service/wechat/WeChatUserQueryService.java

@@ -11,6 +11,4 @@ import com.wangxiaolu.promotion.pojo.user.vo.LoginVo;
 public interface WeChatUserQueryService {
 
     LoginVo loginTemporaryByOpenIdAndPhone(String openId, String phone);
-
-    WxTemporaryInfoDto getTemporaryInfoByOpenIdAndPhone(String openId,String phone);
 }

src/main/java/com/wangxiaolu/promotion/service/wechat/impl/WeChatUserQueryServiceImpl.java

@@ -40,21 +40,20 @@ public class WeChatUserQueryServiceImpl implements WeChatUserQueryService {
      */
     @Override
     public LoginVo loginTemporaryByOpenIdAndPhone(String openId, String phone) {
-        WxTemporaryInfoDto temDto = temporaryInfoDao.getUnimportantData(openId, phone);
+        WxTemporaryInfoDto temDto = temporaryInfoDao.selectOneByOpenId(openId);
 
         if (Objects.isNull(temDto)) {
             throw new DataException(RCode.LOGIN_USER_IS_NULL_ERROR);
         }
 
+        if (!temDto.getPhone().equals(phone)){
+            throw new DataException(RCode.LOGIN_PHONE_PARAM_ERROR);
+        }
+
         String temporaryToken = jwtUtils.getTemporaryToken(openId, phone);
         redisCache.addToJsonToMinute(RedisKeys.UserKeys.TEMPORARY_TOKEN.getKey() + temporaryToken, temDto, 360);
         LoginVo loginVo = new LoginVo(temDto, temporaryToken);
         return loginVo;
     }
 
-    @Override
-    public WxTemporaryInfoDto getTemporaryInfoByOpenIdAndPhone(String openId, String phone) {
-        return temporaryInfoDao.getUnimportantData(openId, phone);
-    }
-
 }