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

Merge #83 into master from cc_20260330_fix

Browse Source 
fix:新管家退款单字段补充修改；三明治门店详细地址获取逻辑修改

* cc_20260330_fix: (12 commits squashed)

  - fix:日志

  - fix:问题修复

  - fix:闭店二级审批改为运营片区总顾问

  - fix:在营和暂停营业允许发起闭店

  - fix:新管家支行接口路径修改

  - Merge branch 'master' into cc_20260330_fix
    
    # Conflicts:
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.java

  - fix:新管家退款单字段补充修改

  - fix:新管家退款单字段补充修改

  - Merge branch 'master' into cc_20260330_fix
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java

  - fix:三明治铺位详细地址更新到门店地址字段

  - fix:三明治铺位详细地址更新到门店地址字段

  - fix:退款账户类型全部改为CORP

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/83
This commit is contained in:
王非凡
2026-04-02 09:50:07 +00:00
committed by 正新
parent 8587957f2b
commit ba382bc1fe
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
View File

@@ -562,14 +562,6 @@ public class PointServiceImpl implements PointService {
if (AuditStatusEnum.REJECT.equals(auditStatus)) {
return auditRejectDeal(pointInfo, request.getReason());
}
// 如果是三明治，将地址写入门店信息表
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(pointInfo.getShopId());
if (Objects.nonNull(shopInfo) && Integer.valueOf(shopInfo.getFranchiseBrand()).equals(FranchiseBrandEnum.ZXSMZ.getCode())) {
ShopInfoDO updateShopInfo = new ShopInfoDO();
updateShopInfo.setId(pointInfo.getShopId());
updateShopInfo.setDetailAddress(pointInfo.getAddress());
shopInfoDAO.updateShopInfo(updateShopInfo);
}
//处理下一节点任务及更新point状态
return dealNextAuditRecord(pointInfo, pointAuditRecordMap, pointTodo.getNodeNo());
}
@@ -1045,6 +1037,13 @@ public class PointServiceImpl implements PointService {
updateDetail.setLineSign(request.getLineSign());
updateDetail.setLineSignTime(new Date());
pointDetailInfoDAO.updatePointDetailInfo(updateDetail);
// 如果是三明治，将地址写入门店信息表
if (Integer.valueOf(shopInfo.getFranchiseBrand()).equals(FranchiseBrandEnum.ZXSMZ.getCode())) {
ShopInfoDO updateShopInfo = new ShopInfoDO();
updateShopInfo.setId(shopId);
updateShopInfo.setDetailAddress(pointInfo.getAddress());
shopInfoDAO.updateShopInfo(updateShopInfo);
}
List<ShopSubStageStatusEnum> updateStatusList = new ArrayList<>();
//如果铺位是已审核 则进入上传租赁合同状态
if (PointStatusEnum.POINT_STATUS_5.getCode().equals(pointInfo.getPointStatus())) {