From 9e3081dd592601c8a18aa374f74ab41937ed5133 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Mon, 26 Jun 2023 14:34:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=88=E6=9D=83=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WechatMiniAppServiceImpl.java | 62 ++++++++++--------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index 610301034..4bf18a7ee 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -4,10 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.HyOpenAreaInfoDAO; -import com.cool.store.dao.HyPartnerLineInfoDAO; -import com.cool.store.dao.HyPartnerUserInfoDAO; -import com.cool.store.dao.HyPartnerUserPlatformBindDAO; +import com.cool.store.dao.*; import com.cool.store.dto.wx.CodeSessionDTO; import com.cool.store.dto.wx.MiniProgramLoginDTO; import com.cool.store.dto.wx.PhoneInfoDTO; @@ -56,6 +53,8 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { private HyPartnerLineInfoDAO hyPartnerLineInfoDAO; @Resource HyOpenAreaInfoDAO hyOpenAreaInfoDAO; + @Resource + HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; @Value("${weixin.appId}") private String wxAppId; @@ -91,27 +90,29 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { // 获取手机号码 PhoneInfoDTO phoneInfoDTO = wechatRest.getUserPhoneNumber(param.getMobileCode(), accessToken); if(phoneInfoDTO != null && phoneInfoDTO.getPhoneInfo() != null && StringUtils.isNotBlank(phoneInfoDTO.getPhoneInfo().getPhoneNumber())){ - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - if(hyPartnerUserInfoDO == null){ - hyPartnerUserInfoDO = new HyPartnerUserInfoDO(); - hyPartnerUserInfoDO.setMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - // hyPartnerUserInfoDO.setUsername(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); - hyPartnerUserInfoDO.setAcceptAdjustType(0); - hyPartnerUserInfoDO.setIsWritePartnerKnow(0); - hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); - } + HyPartnerUserPlatformBindDO hyPartnerUserPlatformBindDO = hyPartnerUserPlatformBindDAO.getByPlatformTypeAndUserId(UserPlatformTypeEnum.WECHAT.getCode(), openid); + HyPartnerUserInfoDO hyPartnerUserInfoDO = null; + // 微信未授权过 if(hyPartnerUserPlatformBindDO == null){ + hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); + if(hyPartnerUserInfoDO == null){ + hyPartnerUserInfoDO = new HyPartnerUserInfoDO(); + hyPartnerUserInfoDO.setMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); + // hyPartnerUserInfoDO.setUsername(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); + hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); + hyPartnerUserInfoDO.setAcceptAdjustType(0); + hyPartnerUserInfoDO.setIsWritePartnerKnow(0); + hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); + } hyPartnerUserPlatformBindDO = new HyPartnerUserPlatformBindDO(); hyPartnerUserPlatformBindDO.setPlatformType(UserPlatformTypeEnum.WECHAT.getCode()); hyPartnerUserPlatformBindDO.setPlatformUserId(openid); hyPartnerUserPlatformBindDO.setBindTime(new Date()); hyPartnerUserPlatformBindDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); hyPartnerUserPlatformBindDAO.insertSelective(hyPartnerUserPlatformBindDO); - }else if(!hyPartnerUserPlatformBindDO.getPartnerId().equals(hyPartnerUserInfoDO.getPartnerId())){ - hyPartnerUserPlatformBindDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); - hyPartnerUserPlatformBindDAO.updateByPrimaryKeySelective(hyPartnerUserPlatformBindDO); + }else { + hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerUserPlatformBindDO.getPartnerId()); } BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); @@ -158,6 +159,8 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { } oldUserInfo.setMobile(newMobile); hyPartnerUserInfoDAO.updateByPrimaryKeySelective(oldUserInfo); + //修改意向申请信息中的加盟商名称与手机号 + hyPartnerBaseInfoDAO.updateByPartnerId(null, newMobile, oldUserInfo.getPartnerId()); } return newMobile; } @@ -171,18 +174,19 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { userInfoVO.setPartnerId(""); return userInfoVO; } - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(mobile); - BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); - HyPartnerUserPlatformBindDO hyPartnerUserPlatformBindDO = hyPartnerUserPlatformBindDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); - - userInfoVO.setOpenid(hyPartnerUserPlatformBindDO != null ? hyPartnerUserPlatformBindDO.getPlatformUserId() : ""); - if(StringUtils.isNotBlank(hyPartnerUserInfoDO.getWantShopArea())){ - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea())); - userInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/", " ").trim()); - } - HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); - if (lineInfoDO != null){ - userInfoVO.setPartnerLineId(lineInfoDO.getId()); + HyPartnerUserPlatformBindDO hyPartnerUserPlatformBindDO = hyPartnerUserPlatformBindDAO.getByPlatformTypeAndUserId(UserPlatformTypeEnum.WECHAT.getCode(), openId); + if(hyPartnerUserPlatformBindDO != null){ + HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerUserPlatformBindDO.getPartnerId()); + BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); + userInfoVO.setOpenid(hyPartnerUserPlatformBindDO.getPlatformUserId()); + if(StringUtils.isNotBlank(hyPartnerUserInfoDO.getWantShopArea())){ + HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea())); + userInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/", " ").trim()); + } + HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); + if (lineInfoDO != null){ + userInfoVO.setPartnerLineId(lineInfoDO.getId()); + } } return userInfoVO; }