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

Merge branch 'hxd/feat/labelAndlLine' into hxd/feat/ecSyncLabel

Browse Source
This commit is contained in:
xiaodong.hu
2023-08-28 15:22:42 +08:00
parent fa2d08915d 9385fc88a3
commit b51910f565
5 changed files with 17 additions and 3 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

@@ -27,4 +27,6 @@ public class ExcelErrorConstants {
public static final String INVESTMENT_MANAGER_LOSE = "未找到此招商经理，请核实";
public static final String COUNT_MORE = "每次数据最多导入500条，请分批上传";
}

2
coolstore-partner-common/src/main/java/com/cool/store/enums/AcceptAdjustTypeEnum.java
View File

@@ -10,7 +10,7 @@ public enum AcceptAdjustTypeEnum {
NOT_ACCEPT(0,"不接受调剂"),
NATIONAL_ADJUSTMENT(1,"全国调剂"),
PROVINCIAL_ADJUSTMENT(2,"省内调剂"),
LOCAL_ADJUSTMENT(3,"市区开放"),
LOCAL_ADJUSTMENT(3,"市内调剂"),

11
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
View File

@@ -181,6 +181,11 @@ public class EcSyncServiceImpl implements EcSyncService {
EcClient ecClient = new EcClient();
//有就更新ec没有就插入
if (newUserInfo != null) {
//招商客户姓名为空
if (ObjectUtil.isNull(newUserInfo.getUsername())||StringUtil.isEmpty(newUserInfo.getUsername())) {
newUserInfo.setUsername(resultUser.getUsername());
hyPartnerUserInfoDAO.updateByPrimaryKeySelective(newUserInfo);
}
// EC与沪姨合伙人同时存在的线索用户，但用户姓名不同，将沪姨合伙人线索姓名同步至EC覆盖原EC线索姓名
if (!newUserInfo.getUsername().equals(resultUser.getUsername())) {
UpdateCustomerRequest updateUserRequest = new UpdateCustomerRequest();
@@ -252,6 +257,12 @@ public class EcSyncServiceImpl implements EcSyncService {
}
}
public static void main(String[] args) {
Integer a=null;
System.out.println(a.equals("bb"));
}
/**
* 得到不带86开头的号码
*

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

@@ -136,13 +136,14 @@ public class LineHighSeasServiceImpl implements LineHighSeasService {
if (lineDOList.size() > excelMaxSize) {
//超出五百条的excel都标红
for (int i = excelMaxSize; i < lineDOList.size() ; i++) {
lineDOList.get(i).setErrorInfo(ExcelErrorConstants.COUNT_MORE);
styleCells.put(i,new HashMap<>(4));
}
ExcelUtil.setRowStyle(styleCells,ExcelUtil.FONT_RED,7);
util.exportExcel(outputStream, lineDOList, "", styleCells);
InputStream stream = new ByteArrayInputStream(outputStream.toByteArray());
String fileStr = ossServer.uploadFileServer(stream, dir + getExcelName());
return new ResponseResult(500, "每次数据最多导入500条，请分批上传", new ErrorExcelResponse(lineDOList.size(), excelMaxSize, fileStr));
return new ResponseResult(500, "共上传" + lineDOList.size() + "条线索，其中" + styleCells.size() + "条存在异常", new ErrorExcelResponse(lineDOList.size(), styleCells.size(), fileStr));
}
for (int i = 0; i < lineDOList.size(); i++) {
HyPartnerLineDO hyPartnerLineDO = lineDOList.get(i);

2
coolstore-partner-service/src/main/java/com/cool/store/utils/poi/ExcelUtil.java
View File

@@ -911,7 +911,7 @@ public class ExcelUtil<T> {
* 创建一个工作簿
*/
public void createWorkbook() {
this.wb = new SXSSFWorkbook(500);
this.wb = new SXSSFWorkbook(800);
}
/**