Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828

This commit is contained in:
xiaodong.hu
2023-08-21 15:01:13 +08:00

View File

@@ -7,10 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.cool.store.constants.ExcelErrorConstants; import com.cool.store.constants.ExcelErrorConstants;
import com.cool.store.dao.*; import com.cool.store.dao.*;
import com.cool.store.entity.*; import com.cool.store.entity.*;
import com.cool.store.enums.AcceptAdjustTypeEnum; import com.cool.store.enums.*;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.LineStatusEnum;
import com.cool.store.enums.WorkflowStatusEnum;
import com.cool.store.exception.ServiceException; import com.cool.store.exception.ServiceException;
import com.cool.store.oss.OSSServer; import com.cool.store.oss.OSSServer;
import com.cool.store.request.AddLineRequest; import com.cool.store.request.AddLineRequest;
@@ -98,7 +95,7 @@ public class LineHighSeasServiceImpl implements LineHighSeasService {
hyPartnerUserInfoDAO.insertSelective(resultUser); hyPartnerUserInfoDAO.insertSelective(resultUser);
HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO(); HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO();
resultLine.setPartnerId(partnerId).setCreateTime(new Date()); resultLine.setPartnerId(partnerId).setCreateTime(new Date()).setWorkflowStage(WorkflowStageEnum.INTENT.getCode());
//判断招商经理是否为空 //判断招商经理是否为空
if (StringUtil.isNotEmpty(request.getInvestmentManager())) { if (StringUtil.isNotEmpty(request.getInvestmentManager())) {