From 9c7800164bc437f50c3a666a62ab3192e4d6c30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Tue, 19 May 2026 10:23:51 +0000 Subject: [PATCH] Merge #141 into master from cc_20260511_fix_bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/141 --- .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 93eccae95..7247c7066 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -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 preAllocationRecordDOS = preAllocationRecordDAO.queryPageByShopId(shopId); List dateList = preAllocationRecordDOS.stream().map(PreAllocationRecordDO::getCreateTime).collect(Collectors.toList()); Date earliestPayTime = dateList.stream().filter(Objects::nonNull)