Merge #141 into master from cc_20260511_fix_bug

fix:修复非AI店钱包支付获取不到首次缴费日期的问题

* cc_20260511_fix_bug: (4 commits squashed)

  - fix:闭店审批用户列表问题修复

  - fix:未开业门店更新试营业需要完成开店管理

  - Merge branch 'refs/heads/master' into cc_20260511_fix_bug

  - fix:修复非AI店钱包支付获取不到首次缴费日期的问题

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/141
This commit is contained in:
王非凡
2026-05-19 10:23:51 +00:00
committed by 正新
parent 41e6b3ccfe
commit 9c7800164b

View File

@@ -1199,7 +1199,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setBigCashierFee(Convert.digitToChinese(convertToBig(franchiseFeeDO.getCashierFee())));
}
//对于AI店
if (CollectionUtils.isEmpty(linePayList)){
if (CollectionUtils.isEmpty(linePayList) && shopInfoDO.getUseStandardStore().equals(1)){
List<PreAllocationRecordDO> preAllocationRecordDOS = preAllocationRecordDAO.queryPageByShopId(shopId);
List<Date> dateList = preAllocationRecordDOS.stream().map(PreAllocationRecordDO::getCreateTime).collect(Collectors.toList());
Date earliestPayTime = dateList.stream().filter(Objects::nonNull)