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

Merge #80 into master from cc_20260330_fix

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

* cc_20260330_fix: (6 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

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/80
This commit is contained in:
王非凡
2026-03-30 10:29:11 +00:00
committed by 正新
parent a3125e6b9e
commit d03bdb7cb0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,7 +394,7 @@ public enum ErrorCodeEnum {
CLOSE_STORE_REFUND_MK_USER_NOT_EXIST(1710016, "当前用户不存在每刻权限", null),
CLOSE_STORE_REFUND_EXIST_EFFECTIVE_RECORD(1710017, "存在生效中的退款申请！", null),
CLOSE_STORE_REFUND_TYPE_ERROR(1710018, "退款类型错误", null),
CLOSE_STORE_ONLY_SUPPORT_OPEN(1710019, "仅支持在营门店发起闭店申请", null),
CLOSE_STORE_ONLY_SUPPORT_OPEN(1710019, "仅支持在营或暂停营业的门店发起闭店申请", null),
/**
* 181 十二分制

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

@@ -81,7 +81,7 @@ public class CloseStoreServiceImpl implements CloseStoreService {
if (CommonConstants.CLOSED.equals(store.getStoreStatus())){
throw new ServiceException(ErrorCodeEnum.STORE_NOT_OPEN);
}
if (!StoreStatusEnum.OPEN.getValue().equals(store.getStoreStatus())) {
if (!(StoreStatusEnum.OPEN.getValue().equals(store.getStoreStatus()) || StoreStatusEnum.CLOSE_UP.getValue().equals(store.getStoreStatus()))) {
throw new ServiceException(ErrorCodeEnum.CLOSE_STORE_ONLY_SUPPORT_OPEN);
}
// 校验是否有正在进行的申请

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

@@ -88,7 +88,7 @@ public class ThirdXgjServiceImpl implements ThirdXgjService {
@Override
public List<XgjBranchBankDTO> queryBranchBankList(XgjBankQueryRequest request) {
String apiUrl = xgjUrl + "/dmp-payment/open/queryOpenBankNoByBankName";
String apiUrl = xgjUrl + "/dmp/dmp-payment/open/queryOpenBankNoByBankName";
return executePostApiCall(apiUrl, request, List.class);
}