Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

@@ -46,6 +46,7 @@ public enum ErrorCodeEnum {
     GET_INFO_ERROR(1021078, "获取信息异常", null),
     GET_PHONENUMBER_INFO_ERROR(1021079, "手机号归属地获取异常", null),
     IDENTITY_CARD_PARSE_FAIL(1021080, "身份证解析失败", null),
+    WECHAT_BIND_OTHER_MOBILE(1021081, "该微信已绑定其它手机号，请核对", null),
     PARAMS_REQUIRED(400002, "参数缺失！", null),
     DATA_CONVERT_ERROR(400002, "日期转换异常！", null),
     PARENT_NODE_NOT_EXIST(400002, "父节点不存在", null),

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java

@@ -346,7 +346,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         intentInfoDO.setWantShopArea(request.getWantShopArea());
         intentInfoDO.setAcceptAdjustType(request.getAcceptAdjustType());
         intentInfoDO.setIsHaveWantShop(request.getIsHaveWantShop());
-        if (CollectionUtils.isNotEmpty(request.getWantShopInfo())){
+        intentInfoDO.setWantShopInfo("");
+        if (CollectionUtils.isNotEmpty(request.getWantShopInfo()) && request.getIsHaveWantShop() == 1){
             intentInfoDO.setWantShopInfo(JSONObject.toJSONString(request.getWantShopInfo()));
         }
         intentInfoDO.setMaxBudget(request.getMaxBudget());

coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java

@@ -113,6 +113,9 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
             }else {
                 hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerUserPlatformBindDO.getPartnerId());
             }
+            if(!hyPartnerUserInfoDO.getMobile().equals(phoneInfoDTO.getPhoneInfo().getPhoneNumber())){
+                throw new ServiceException(ErrorCodeEnum.WECHAT_BIND_OTHER_MOBILE);
+            }
             BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
             HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId());
             if (lineInfoDO != null){