From 9072609c23c5dc01ad21e8f37a97eddcff6d809b Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Wed, 23 Aug 2023 14:47:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=91=BC=E5=87=BA=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E7=BC=96=E8=BE=91=E6=97=B6=E5=80=BC=E4=B8=8D=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E4=B8=8D=E5=8F=98fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/entity/HyOutboundMobileDO.java | 8 +++----- .../cool/store/service/impl/HyOutboundServiceImpl.java | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyOutboundMobileDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyOutboundMobileDO.java index 25cc3632b..61ff2c796 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyOutboundMobileDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyOutboundMobileDO.java @@ -6,9 +6,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.time.LocalDateTime; - -; +import java.util.Date; /** * @author Fun Li @@ -41,8 +39,8 @@ public class HyOutboundMobileDO { private Boolean deleted; @ApiModelProperty("创建时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty("更新时间") - private LocalDateTime updateTime; + private Date updateTime; } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java index a56e51d3d..e9c76742f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java @@ -15,6 +15,7 @@ import com.cool.store.vo.HyOutboundVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -69,6 +70,7 @@ public class HyOutboundServiceImpl implements HyOutboundService { String userId = CurrentUserHolder.getUserId(); hyOutboundMobile.setEditUserId(userId); hyOutboundMobile.setUpdateUserId(userId); + hyOutboundMobile.setUpdateTime(new Date()); outboundMobileMapper.updateByPrimaryKeySelective(hyOutboundMobile); } From 5ee8b907f01c1d9d6d97016da07d09cb3f14a5f2 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 23 Aug 2023 17:42:02 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=8D=A2=E7=BB=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E4=BB=BB=E5=8A=A1id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/HyFollowTaskDAO.java | 12 ++++++++++++ .../com/cool/store/mapper/HyFollowTaskMapper.java | 8 ++++++++ .../src/main/resources/mapper/HyFollowTaskMapper.xml | 4 ++++ .../service/impl/HyPartnerBaseInfoServiceImpl.java | 3 +++ 4 files changed, 27 insertions(+) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java index f70d7c701..750b40251 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java @@ -207,6 +207,18 @@ public class HyFollowTaskDAO { return hyFollowTaskMapper.updateUndoTaskStatusToOverdue(); } + /** + * 更改线索id + * @param oldLineId + * @param newLineId + */ + public Integer changeLineId(Long oldLineId, Long newLineId){ + if(Objects.isNull(oldLineId) || Objects.isNull(newLineId)){ + return CommonConstants.ZERO; + } + return hyFollowTaskMapper.changeLineId(oldLineId, newLineId); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java index c0574afef..f3f806d13 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java @@ -100,4 +100,12 @@ public interface HyFollowTaskMapper { * @return */ List getFollowTaskList(@Param("followTaskIds") List followTaskIds); + + /** + * 更改线索id + * @param oldLineId + * @param newLineId + * @return + */ + Integer changeLineId(@Param("oldLineId") Long oldLineId, @Param("newLineId") Long newLineId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml index 077eb3eb3..f8634c934 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml @@ -245,5 +245,9 @@ where deleted = '0' and id in #{followTaskId} + + + update hy_follow_task set partner_line_id = #{newLineId} where partner_line_id = #{oldLineId} + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java index 35b22684a..67804c407 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java @@ -80,6 +80,8 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { private LogService logService; @Resource private LabelService labelService; + @Resource + private HyFollowTaskDAO hyFollowTaskDAO; @Override @@ -264,6 +266,7 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { hyInterviewDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); hyPartnerCertificationInfoMapper.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); hyPartnerTaskInfoLogDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); + hyFollowTaskDAO.changeLineId(oldLineInfo.getId(), newLindId); String cacheKeyBaseInfo = MessageFormat.format(RedisConstant.PARTNER_BASEINFO_CACHE_KEY, newPartnerId, newLindId); String cacheKeyClerkInfo = MessageFormat.format(RedisConstant.PARTNER_CLERKINFO_CACHE_KEY,newPartnerId, newLindId); String cacheKeyIntentInfo = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, newPartnerId, newLindId); From 5db08d9752152c5f12631f7e7b4f9d70f9fbeafe Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 23 Aug 2023 17:45:28 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BA=BF=E7=B4=A2=E7=A7=81=E6=B5=B7=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyFollowTaskMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml index f8634c934..bf939f198 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml @@ -157,7 +157,7 @@ a.update_time from hy_follow_task a - inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' + inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' and b.line_status in ('1', '2') where a.deleted = '0' and a.follow_user_id = #{followUserId} @@ -194,7 +194,7 @@ a.follow_user_id from hy_follow_task a - inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' + inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' and b.line_status in ('1', '2') where a.deleted = '0' and (a.task_status in ('2') or (a.task_status in ('0') and a.deadline >= #{startTime} and #{endTime} >= a.deadline)) @@ -206,7 +206,7 @@ sum(if(a.task_status=0 and #{endTime} > a.deadline, 1, 0)) as todoNum from hy_follow_task a - inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' + inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' and b.line_status in ('1', '2') where a.follow_user_id in #{followUserId} group by a.follow_user_id @@ -228,7 +228,7 @@ a.update_time from hy_follow_task a - inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' + inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' and b.line_status in ('1', '2') where a.deleted = '0' and a.task_status in ('0') and a.deadline > #{startTime} and #{endTime} > a.deadline From 00ee314e13b71aca3e2de1c0ca27a741082d2c08 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 23 Aug 2023 19:29:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B2=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E4=B8=8D=E5=86=99=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=8C=E8=B7=9F=E8=BF=9B=E4=BB=BB=E5=8A=A1=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/request/follow/UpdateFollowTaskRequest.java | 5 +++++ .../com/cool/store/service/impl/FollowTaskServiceImpl.java | 2 +- .../store/service/impl/HyPartnerBaseInfoServiceImpl.java | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java index b19484cf3..87faf6b06 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java @@ -53,6 +53,11 @@ public class UpdateFollowTaskRequest { result.setCommunicationType(request.getCommunicationType()); result.setDeadline(request.getDeadline()); result.setCommunicationContent(request.getCommunicationContent()); + if(request.getDeadline().getTime() > System.currentTimeMillis()){ + result.setTaskStatus(FollowTaskStatusEnum.TODO.getCode()); + }else{ + result.setTaskStatus(FollowTaskStatusEnum.OVERDUE.getCode()); + } return result; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java index e175ff2ad..bc1d7b94f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java @@ -149,7 +149,7 @@ public class FollowTaskServiceImpl implements FollowTaskService { @Override public Integer updateFollowTask(UpdateFollowTaskRequest request, String userId) { HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId()); - if(!FollowTaskStatusEnum.TODO.getCode().equals(followTask.getTaskStatus())){ + if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus()) || FollowTaskStatusEnum.CANCELLED.getCode().equals(followTask.getTaskStatus())){ throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE); } if(Objects.nonNull(request.getDeadline()) && request.getDeadline().getTime() < System.currentTimeMillis()){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java index 67804c407..ce729a75f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java @@ -111,6 +111,9 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { List removeLabels = new ArrayList<>(oldLabels); addLabels.removeAll(oldLabels); removeLabels.removeAll(newLabels); + if(CollectionUtils.isEmpty(addLabels) && CollectionUtils.isEmpty(removeLabels)){ + return Boolean.TRUE; + } LineLogInfo lineLogInfo = new LineLogInfo(line.getPartnerId(), line.getId(), user.getUserId(), user.getName(), OperateTypeEnum.ADD_TAGS, WorkflowStageEnum.getWorkflowStageByCode(line.getWorkflowStage()), From a655ddefb0766f6c1e834403e3271bd16c5d9942 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 23 Aug 2023 19:46:12 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=BE=E6=9C=9F?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/enums/FollowTaskStatusEnum.java | 1 + .../src/main/java/com/cool/store/dao/HyFollowTaskDAO.java | 4 ++-- .../src/main/resources/mapper/HyFollowTaskMapper.xml | 2 +- .../main/java/com/cool/store/vo/follow/FollowTaskLogVO.java | 1 - .../com/cool/store/service/impl/FollowTaskServiceImpl.java | 6 +++++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/FollowTaskStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/FollowTaskStatusEnum.java index 073a41e49..cd460d5dc 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FollowTaskStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FollowTaskStatusEnum.java @@ -12,6 +12,7 @@ public enum FollowTaskStatusEnum { FINISHED(1, "已完成"), OVERDUE(2, "已逾期"), CANCELLED(3, "作废"), + OVERDUE_FINISH(4, "逾期完成"), ; //任务状态:0:待完成、1:已完成、2:已逾期、3:作废 diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java index 750b40251..e00c7dfa1 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java @@ -86,10 +86,10 @@ public class HyFollowTaskDAO { * @param followTaskId * @return */ - public Integer finishFollowTask(Long followTaskId){ + public Integer finishFollowTask(Long followTaskId, FollowTaskStatusEnum followTaskStatus){ HyFollowTaskDO update = new HyFollowTaskDO(); update.setId(followTaskId); - update.setTaskStatus(FollowTaskStatusEnum.FINISHED.getCode()); + update.setTaskStatus(followTaskStatus.getCode()); update.setFinishTime(new Date()); return updateFollowTask(update); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml index bf939f198..fc8b6b75c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml @@ -169,7 +169,7 @@ - order by a.deadline desc + order by a.deadline desc, a.id desc @@ -124,6 +128,18 @@ close_user_id, + + create_user_id, + + + create_user_mobile, + + + operator_type, + + + update_user_id, + @@ -177,6 +193,18 @@ #{record.closeUserId}, + + #{record.createUserId}, + + + #{record.createUserMobile}, + + + #{record.operatorType}, + + + #{record.updateUserId}, + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java index b590f2f48..b7854032e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java @@ -82,4 +82,16 @@ public class HyPartnerLineInfoDO implements Serializable { @ApiModelProperty("hy_partner_user_channel.channel_id") private Integer userChannelId; + + @ApiModelProperty("创建人") + private String createUserId; + + @ApiModelProperty("创建人手机号") + private String createUserMobile; + + @ApiModelProperty("操作类型") + private String operatorType; + + @ApiModelProperty("更新人") + private String updateUserId; } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java index bcff24f99..20b80e25d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.cool.store.constants.ExcelErrorConstants; +import com.cool.store.context.CurrentUserHolder; import com.cool.store.dao.*; import com.cool.store.entity.*; import com.cool.store.enums.*; @@ -77,7 +78,7 @@ public class LineHighSeasServiceImpl implements LineHighSeasService { if (ObjectUtil.isNotNull(hyPartnerUserInfoDO)) { throw new ServiceException(ErrorCodeEnum.PARTNER_MOBILE_EXIST); } - return add(request); + return add(request,"add"); } @@ -86,7 +87,7 @@ public class LineHighSeasServiceImpl implements LineHighSeasService { * * @param request */ - public boolean add(AddLineRequest request) { + public boolean add(AddLineRequest request,String type) { Boolean flag =false; String partnerId = UUIDUtils.get32UUID(); HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO(); @@ -95,7 +96,9 @@ public class LineHighSeasServiceImpl implements LineHighSeasService { hyPartnerUserInfoDAO.insertSelective(resultUser); HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO(); - resultLine.setPartnerId(partnerId).setCreateTime(new Date()).setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); + resultLine.setPartnerId(partnerId).setCreateTime(new Date()).setWorkflowStage(WorkflowStageEnum.INTENT.getCode()) + .setCreateUserId(CurrentUserHolder.getUserId()).setCreateUserMobile(CurrentUserHolder.getUser().getMobile()) + .setOperatorType(type); //判断招商经理是否为空 if (StringUtil.isNotEmpty(request.getInvestmentManager())) { @@ -231,7 +234,7 @@ public class LineHighSeasServiceImpl implements LineHighSeasService { AddLineRequest addLineRequest = new AddLineRequest(); BeanUtil.copyProperties(hyPartnerLineDO, addLineRequest); addLineRequest.setWantShopArea(hyPartnerLineDO.getWantShopArea().toString()); - add(addLineRequest); + add(addLineRequest,"import"); } return new ResponseResult(ResponseCodeEnum.SUCCESS.getCode(), "共上传" + lineDOList.size() + "条线索", new ErrorExcelResponse(lineDOList.size(), styleCells.size(), fileStr)); } From d62816d6f299e3d39e02bb2249450f8206abce57 Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Thu, 24 Aug 2023 15:40:48 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E5=A7=93=E5=90=8D=E9=95=BF=E5=BA=A6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/constants/ExcelErrorConstants.java | 2 ++ .../main/java/com/cool/store/request/AddLineRequest.java | 6 ++---- .../cool/store/service/impl/LineHighSeasServiceImpl.java | 8 +++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java index 54019b856..791539285 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java @@ -7,6 +7,8 @@ public class ExcelErrorConstants { public static final String NAME_LOSE = "姓名缺失"; + public static final String NAME_OVER_LENGTH = "姓名过长"; + public static final String MOBILE_LOSE= "手机号缺失"; public static final String MOBILE_ERROR= "手机号有误"; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java index fe83cbcf8..16cf95a3b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java @@ -6,10 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import javax.validation.constraints.*; import java.util.List; /** @@ -25,6 +22,7 @@ public class AddLineRequest { @NotBlank(message = "姓名不能为空") @ApiModelProperty("姓名") + @Size(max = 10,message = "姓名过长") private String partnerName; @Pattern(regexp = "(?:0|86|\\+86)?1[3-9]\\d{9}",message = "手机号码不正确，请检查后重试") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java index 20b80e25d..b769f7911 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java @@ -146,9 +146,15 @@ public class LineHighSeasServiceImpl implements LineHighSeasService { } for (int i = 0; i < lineDOList.size(); i++) { HyPartnerLineDO hyPartnerLineDO = lineDOList.get(i); - if (StringUtil.isEmpty(hyPartnerLineDO.getPartnerName())) { + String partnerName = hyPartnerLineDO.getPartnerName(); + if (StringUtil.isEmpty(partnerName)) { hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.NAME_LOSE : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.NAME_LOSE)); ExcelUtil.setStyleMap(styleCells, i, 0, new String[]{ExcelUtil.FONT_RED}); + }else { + if (partnerName.length()>10) { + hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.NAME_OVER_LENGTH : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.NAME_OVER_LENGTH)); + ExcelUtil.setStyleMap(styleCells, i, 0, new String[]{ExcelUtil.FONT_RED}); + } } String mobile = hyPartnerLineDO.getMobile().trim(); //手机号为空