From 6f34da2fb47f3f919e0f59b043fbc9261eaac8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Thu, 2 Apr 2026 09:13:29 +0000 Subject: [PATCH] Merge #86 into master from cc_20260401_bugfix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat：接口调整 * cc_20260401_bugfix: (5 commits squashed) - feat：推送数据 - feat：装修团队 - feat：开始时间为空 - feat：接口调整 - Merge branch 'master' into cc_20260401_bugfix # Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/86 --- .../main/java/com/cool/store/enums/point/ShopSubStageEnum.java | 2 +- .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java index 04deb1c89..5d9f75ecd 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java @@ -43,7 +43,7 @@ public enum ShopSubStageEnum { SHOP_STAGE_6(ShopStageEnum.SHOP_STAGE_2, 260, "开通门店网商钱包", 1), SHOP_STAGE_27(ShopStageEnum.SHOP_STAGE_2, 270, "开业验收", 1), - SHOP_STAGE_28(ShopStageEnum.SHOP_STAGE_2, 280, "选择标准店型", 1), + SHOP_STAGE_28(ShopStageEnum.SHOP_STAGE_2, 280, "生成预定订单", 1), SHOP_STAGE_30(ShopStageEnum.SHOP_STAGE_2, 300, "开业日期报备", 1), 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 5668bc700..e6f6cd3b4 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 @@ -246,7 +246,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId()); PointInfoDO pointInfoById = pointInfoDAO.getPointInfoById(shopInfoDO.getPointId()); FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(request.getShopId()); - if (franchiseFeeDO!=null&&franchiseFeeDO.getFirstYearStartTime()!=null&&franchiseFeeDO.getFirstYearEndTime()!=null){ + if (franchiseFeeDO!=null&&franchiseFeeDO.getFirstYearStartTime()==null&&franchiseFeeDO.getFirstYearEndTime()==null){ franchiseFeeDO.setFirstYearStartTime(request.getFirstYearStartTime()); franchiseFeeDO.setFirstYearEndTime(request.getFirstYearEndTime()); franchiseFeeMapper.updateByPrimaryKeySelective(franchiseFeeDO);