From d03bdb7cb084ab005f1a38440d46afb606f91056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Mon, 30 Mar 2026 10:29:11 +0000 Subject: [PATCH] Merge #80 into master from cc_20260330_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/80 --- .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 2 +- .../cool/store/service/close/impl/CloseStoreServiceImpl.java | 2 +- .../java/com/cool/store/service/impl/ThirdXgjServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 58a7140c5..04737dad2 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -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 十二分制 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreServiceImpl.java index 716874764..74182e575 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreServiceImpl.java @@ -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); } // 校验是否有正在进行的申请 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.java index a7972cf34..74b3a7404 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.java @@ -88,7 +88,7 @@ public class ThirdXgjServiceImpl implements ThirdXgjService { @Override public List queryBranchBankList(XgjBankQueryRequest request) { - String apiUrl = xgjUrl + "/dmp-payment/open/queryOpenBankNoByBankName"; + String apiUrl = xgjUrl + "/dmp/dmp-payment/open/queryOpenBankNoByBankName"; return executePostApiCall(apiUrl, request, List.class); }