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