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

Merge #89 into master from cc_20260402_minor_req

Browse Source 
fix:诸多小需求

* cc_20260402_minor_req: (6 commits squashed)

  - fix:PC端新增租赁合同相关接口

  - fix:新发标签不过滤私域码

  - fix:开店管理新增签约阶段完成时间筛选条件

  - fix:删除多余接口

  - fix:网商激活短链显示

  - fix:开店管理导出去除限制

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/89
This commit is contained in:
王非凡
2026-04-08 10:44:03 +00:00
committed by 正新
parent 5b79072fb1
commit 5ff5673914
8 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
View File

@@ -55,6 +55,7 @@ import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import static com.cool.store.utils.CommonUtil.convertToBig;
import static com.cool.store.utils.poi.DateUtils.*;
/**
@@ -170,10 +171,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) {
dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime()));
dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime()));
String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee()))
.add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee()))
.add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee()))
.add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString());
String total = (convertToBig(franchiseFeeDTO.getPerformanceBond()).add(convertToBig(franchiseFeeDTO.getFirstYearFee()))
.add(convertToBig(franchiseFeeDTO.getFirstYearManagementFee()))
.add(convertToBig(franchiseFeeDTO.getYearFranchiseFee()))
.add(convertToBig(franchiseFeeDTO.getLoanMargin())).toString());
dto.setTotalAmountContributions(total);
dto.setFranchiseFeeBill(franchiseFeeDTO.getYearFranchiseFee());
dto.setLoanMargin(franchiseFeeDTO.getLoanMargin());

24
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
View File

@@ -94,17 +94,23 @@ public class ExportServiceImpl implements ExportService {
@Override
public Long branchShopList(BranchShopRequest request, LoginUserInfo user) {
request.setPageSize(CommonConstants.MAX_EXPORT_SIZE + 100);
request.setPageNum(CommonConstants.ONE);
PageInfo<BranchShopResponse> branchShopList = shopService.getBranchShopList(request, user.getUserId());
long total = branchShopList.getTotal();
request.setPageSize(1000);
List<BranchShopResponse> exportList = new ArrayList<>();
boolean hasNext = true;
int pageNum = 1;
long total = 0;
while (hasNext) {
request.setPageNum(pageNum++);
PageInfo<BranchShopResponse> branchShopList = shopService.getBranchShopList(request, user.getUserId());
if (CollectionUtils.isEmpty(branchShopList.getList())) {
break;
}
hasNext = branchShopList.getList().size() >= request.getPageSize();
total += branchShopList.getList().size();
exportList.addAll(branchShopList.getList());
}
if (total == CommonConstants.ZERO) {
return CommonConstants.ZERO_LONG;
} else if (total > CommonConstants.MAX_EXPORT_SIZE) {
exportList.addAll(branchShopList.getList().subList(0, CommonConstants.MAX_EXPORT_SIZE));
} else {
exportList.addAll(branchShopList.getList());
}
ImportTaskDO importTaskDO = new ImportTaskDO();
importTaskDO.setStatus(ImportStatusEnum.Ongoing.getCode());
@@ -115,7 +121,7 @@ public class ExportServiceImpl implements ExportService {
importTaskDO.setCreateTime(new Date().getTime());
importTaskDO.setCreateName(user.getName());
importTaskMapper.insert(eid, importTaskDO);
exportRealizeService.branchShopList(branchShopList.getList(), importTaskDO);
exportRealizeService.branchShopList(exportList, importTaskDO);
return total;
}