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

Merge #86 into master from cc_20260401_bugfix

Browse Source 
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: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/86
This commit is contained in:
正新
2026-04-02 09:13:29 +00:00
parent 2ca289b27e
commit 6f34da2fb4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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),

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -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);