From 692a504da3c032de7d336bfc08d2f7c261c0fb91 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 12 Jan 2026 10:35:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E6=94=AF=E8=A1=8C=20?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/EntryManagerController.java | 13 +++++------- .../controller/admin/SysCommonController.java | 2 -- .../com/czg/system/entity/SysBankInfo.java | 2 +- .../java/com/czg/system/entity/SysRegion.java | 4 ++++ .../czg/dto/resp/WechatBankBranchRespDto.java | 21 ------------------- 5 files changed, 10 insertions(+), 32 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java index 15e76fbec..6ba4bb73c 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java @@ -5,7 +5,7 @@ import com.czg.EntryManager; import com.czg.annotation.Debounce; import com.czg.config.RabbitPublisher; import com.czg.dto.req.AggregateMerchantDto; -import com.czg.dto.resp.BankBranchDto; +import com.czg.dto.resp.WechatBankBranchRespDto; import com.czg.order.entity.ShopDirectMerchant; import com.czg.resp.CzgResult; import com.czg.service.order.dto.AggregateMerchantVO; @@ -17,8 +17,6 @@ import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 进件管理 * @@ -59,13 +57,12 @@ public class EntryManagerController { /** * 查询银行支行列表 * - * @param province 省份 陕西省 从 /system/admin/common/region获取 - * @param city 城市 西安市 从 /system/admin/common/region获取 - * @param instId 顶级机构ID CMB 从 /system/admin/common/bankInfo 获取 + * @param bankAliceCode 银行别名code bankAliasCode 从 /system/admin/common/bankInfo 获取 + * @param cityCode 市编码 wxProvinceCode 从 /system/admin/common/region 获取 */ @GetMapping("bankBranchList") - public CzgResult> queryBankBranchList(String province, String city, String instId) { - return CzgResult.success(EntryManager.queryBankBranchList(province, city, instId)); + public CzgResult queryBankBranchList(String bankAliceCode, String cityCode) { + return CzgResult.success(EntryManager.queryBankBranchList(bankAliceCode, cityCode)); } @GetMapping("test") diff --git a/cash-api/system-server/src/main/java/com/czg/controller/admin/SysCommonController.java b/cash-api/system-server/src/main/java/com/czg/controller/admin/SysCommonController.java index 2585c6995..d8eecea94 100644 --- a/cash-api/system-server/src/main/java/com/czg/controller/admin/SysCommonController.java +++ b/cash-api/system-server/src/main/java/com/czg/controller/admin/SysCommonController.java @@ -3,7 +3,6 @@ package com.czg.controller.admin; import com.czg.BaseQueryParam; import com.czg.resp.CzgResult; import com.czg.system.entity.SysBankInfo; -import com.czg.system.entity.SysCategoryInfo; import com.czg.system.entity.SysRegion; import com.czg.system.service.SysBankInfoService; import com.czg.system.service.SysCategoryInfoService; @@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; -import java.util.Map; /** * 通用 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysBankInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysBankInfo.java index bc298d759..de376bb20 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysBankInfo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysBankInfo.java @@ -58,7 +58,7 @@ public class SysBankInfo implements Serializable { private String bankAliasCode; /** - * 不知道干啥的 + * 是否需要支行信息 */ private Boolean needBankBranch; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysRegion.java b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysRegion.java index 1b50b9e9a..2606e1d97 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysRegion.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysRegion.java @@ -60,6 +60,10 @@ public class SysRegion implements Serializable { * 全级别名称（如“中国|北京|北京市|东城区） */ private String fullName; + /** + * 微信区域编码 + */ + private String wxProvinceCode; /** * 子级区域 diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/WechatBankBranchRespDto.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/WechatBankBranchRespDto.java index d76089038..8cca740f0 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/WechatBankBranchRespDto.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/WechatBankBranchRespDto.java @@ -13,27 +13,6 @@ import java.util.List; @Data public class WechatBankBranchRespDto { - // { - // "total_count" : 107, - // "count" : 1, - // "data" : [ - // { - // "bank_branch_name" : "招商银行股份有限公司北京分行", - // "bank_branch_id" : "308100005019" - // } - // ], - // "offset" : 100, - // "links" : { - // "next" : "/v3/capital/capitallhh/banks/1000009561/branches?offset=101&limit=1", - // "prev" : "/v3/capital/capitallhh/banks/1000009561/branches?offset=99&limit=1", - // "self" : "/v3/capital/capitallhh/banks/1000009561/branches?offset=100&limit=1" - // }, - // "account_bank" : "招商银行", - // "account_bank_code" : 1001, - // "bank_alias" : "招商银行", - // "bank_alias_code" : "1000009561" - //} - /** * 开户银行 */