suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhangchenbiao
2024-03-22 15:02:24 +08:00
parent 6774d8f326 7b84c3f599
commit a5c5207445
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,14 +130,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
} }
} }
BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
LineInfoDO lineInfoDO = lineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); fillLineInfo(userInfoVO, hyPartnerUserInfoDO.getPartnerId());
if (lineInfoDO != null){
userInfoVO.setLineId(lineInfoDO.getId());
userInfoVO.setWorkflowStage(lineInfoDO.getWorkflowStage());
userInfoVO.setWorkflowSubStage(lineInfoDO.getWorkflowSubStage());
userInfoVO.setWorkflowSubStageStatus(lineInfoDO.getWorkflowSubStageStatus());
userInfoVO.setLineStatus(lineInfoDO.getLineStatus());
}
} }
userInfoVO.setOpenid(openid); userInfoVO.setOpenid(openid);
userInfoVO.setUnionId(unionId); userInfoVO.setUnionId(unionId);
@@ -160,14 +153,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
if(hyPartnerUserInfoDO != null){ if(hyPartnerUserInfoDO != null){
userInfoVO = new PartnerUserInfoVO(); userInfoVO = new PartnerUserInfoVO();
BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
LineInfoDO lineInfoDO = lineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); fillLineInfo(userInfoVO, hyPartnerUserInfoDO.getPartnerId());
if (lineInfoDO != null){
userInfoVO.setLineId(lineInfoDO.getId());
userInfoVO.setWorkflowStage(lineInfoDO.getWorkflowStage());
userInfoVO.setWorkflowSubStage(lineInfoDO.getWorkflowSubStage());
userInfoVO.setWorkflowSubStageStatus(lineInfoDO.getWorkflowSubStageStatus());
userInfoVO.setLineStatus(lineInfoDO.getLineStatus());
}
} }
return userInfoVO; return userInfoVO;
} }
@@ -229,14 +215,22 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea())); HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()));
userInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/", " ").trim()); userInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/", " ").trim());
} }
/*HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); fillLineInfo(userInfoVO, hyPartnerUserInfoDO.getPartnerId());
if (lineInfoDO != null){
userInfoVO.setPartnerLineId(lineInfoDO.getId());
}*/
} }
return userInfoVO; return userInfoVO;
} }
private void fillLineInfo(PartnerUserInfoVO userInfoVO, String partnerId) {
LineInfoDO lineInfoDO = lineInfoDAO.getByPartnerId(partnerId);
if (lineInfoDO != null){
userInfoVO.setLineId(lineInfoDO.getId());
userInfoVO.setWorkflowStage(lineInfoDO.getWorkflowStage());
userInfoVO.setWorkflowSubStage(lineInfoDO.getWorkflowSubStage());
userInfoVO.setWorkflowSubStageStatus(lineInfoDO.getWorkflowSubStageStatus());
userInfoVO.setLineStatus(lineInfoDO.getLineStatus());
}
}
@Override @Override
public String getMiniAppUrl() { public String getMiniAppUrl() {
MiniAppUrlLinkReqDTO miniAppUrlLinkReqDTO = new MiniAppUrlLinkReqDTO(); MiniAppUrlLinkReqDTO miniAppUrlLinkReqDTO = new MiniAppUrlLinkReqDTO();