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-04-18 11:11:01 +08:00
parent 2e763d0675 bb98126180
commit 5dc35f002d
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
View File

@@ -252,6 +252,8 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
lineInfoMapper.updateByPrimaryKeySelective(lineInfoParam);
}
if (initiatingResponse.getCode() != 0){
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_63.getCode());
lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO);
return new ResponseResult(500,initiatingResponse.getMessage(),initiatingResponse.getData());
}else {
return new ResponseResult(200000,initiatingResponse.getMessage(),initiatingResponse.getData());

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.*;
@@ -20,6 +21,7 @@ import com.cool.store.utils.poi.DateUtils;
import com.cool.store.vo.*;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -33,6 +35,7 @@ import java.util.stream.Collectors;
* @Date 2024/3/25 13:48
* @Version 1.0
*/
@Slf4j
@Service
public class LineServiceImpl implements LineService {
@@ -375,6 +378,7 @@ public class LineServiceImpl implements LineService {
@Override
public Boolean addLine(AddLineRequest addLineRequest) {
//必填参数
log.info("addLine:{}", JSONObject.toJSONString(addLineRequest));
if (!StringUtil.isNoneBlank(addLineRequest.getMobile(),addLineRequest.getUserName())){
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
}
@@ -398,7 +402,7 @@ public class LineServiceImpl implements LineService {
lineInfoDO.setLineSource(Integer.valueOf(UserChannelEnum.ADD.getCode()));
lineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
String userId = null;
if (addLineRequest.getInvestmentManagerUserId()!=null){
if (StringUtils.isNotBlank(addLineRequest.getInvestmentManagerUserId())){
userId = addLineRequest.getInvestmentManagerUserId();
}else {
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_MANAGER, addLineRequest.getWantShopAreaId());