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

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

Browse Source
This commit is contained in:
xiaodong.hu
2023-08-24 15:41:21 +08:00
parent 30535d5a20 d62816d6f2
commit 3a8334b8fc
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java
View File

@@ -7,6 +7,8 @@ public class ExcelErrorConstants {
public static final String NAME_LOSE = "姓名缺失"; public static final String NAME_LOSE = "姓名缺失";
public static final String NAME_OVER_LENGTH = "姓名过长";
public static final String MOBILE_LOSE= "手机号缺失"; public static final String MOBILE_LOSE= "手机号缺失";
public static final String MOBILE_ERROR= "手机号有误"; public static final String MOBILE_ERROR= "手机号有误";

6
coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java
View File

@@ -6,10 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.Max; import javax.validation.constraints.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.util.List; import java.util.List;
/** /**
@@ -25,6 +22,7 @@ public class AddLineRequest {
@NotBlank(message = "姓名不能为空") @NotBlank(message = "姓名不能为空")
@ApiModelProperty("姓名") @ApiModelProperty("姓名")
@Size(max = 10,message = "姓名过长")
private String partnerName; private String partnerName;
@Pattern(regexp = "(?:0|86|\\+86)?1[3-9]\\d{9}",message = "手机号码不正确，请检查后重试") @Pattern(regexp = "(?:0|86|\\+86)?1[3-9]\\d{9}",message = "手机号码不正确，请检查后重试")

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java
View File

@@ -146,9 +146,15 @@ public class LineHighSeasServiceImpl implements LineHighSeasService {
} }
for (int i = 0; i < lineDOList.size(); i++) { for (int i = 0; i < lineDOList.size(); i++) {
HyPartnerLineDO hyPartnerLineDO = lineDOList.get(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)); 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}); 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(); String mobile = hyPartnerLineDO.getMobile().trim();
//手机号为空 //手机号为空