From 592cc99db4b1760ac8be737ffea5aa5bc40908e7 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 16 Jan 2026 17:42:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/EntryManagerController.java | 10 ---------- .../java/com/czg/task/EntryManagerTask.java | 16 +++++++--------- .../com/czg/order/dto/ShopMerchantDTO.java | 2 +- .../com/czg/order/entity/ShopMerchant.java | 5 ++--- .../order/service/ShopMerchantService.java | 2 +- .../service/impl/ShopMerchantServiceImpl.java | 19 ++++++++++--------- 6 files changed, 21 insertions(+), 33 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 4af902e70..ec099ad80 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 @@ -3,7 +3,6 @@ package com.czg.controller.admin; import com.alibaba.fastjson2.JSONObject; 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.WechatBankBranchRespDto; import com.czg.order.entity.ShopDirectMerchant; @@ -33,9 +32,6 @@ public class EntryManagerController { @Resource private EntryManagerTask entryManagerTask; - @Resource - private RabbitPublisher rabbitPublisher; - /** * ocr识别填充 * 阿里 ocr识别图片 @@ -68,12 +64,6 @@ public class EntryManagerController { return CzgResult.success(EntryManager.queryBankBranchList(bankAliceCode, cityCode)); } - @GetMapping("test") - public CzgResult test(String shopId, String licenceNo) { - rabbitPublisher.sendEntryManagerMsg(shopId + ":" + licenceNo); - return CzgResult.success(); - } - /** * 获取进件列表 */ diff --git a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java index 86e61ea37..738c6850f 100644 --- a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java +++ b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java @@ -5,9 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.czg.EntryManager; import com.czg.PayCst; -import com.czg.constant.PayChannelCst; import com.czg.dto.resp.QueryStatusResp; -import com.czg.order.dto.ShopMerchantDTO; import com.czg.order.entity.ShopDirectMerchant; import com.czg.order.service.ShopMerchantService; import com.czg.pay.AlipayAuthInfoDto; @@ -79,10 +77,10 @@ public class EntryManagerTask { } shopDirectMerchantService.updateById(shopDirectMerchant); if (StrUtil.isNotBlank(wechatMerchantId) || StrUtil.isNotBlank(alipayMerchantId)) { - ShopMerchantDTO shopMerchantDTO = new ShopMerchantDTO(); - shopMerchantDTO.setShopId(shopId); - shopMerchantDTO.setChannel(PayChannelCst.NATIVE); - shopMerchantDTO.setRelatedLicenceNo(shopDirectMerchant.getLicenceNo()); +// ShopMerchantDTO shopMerchantDTO = new ShopMerchantDTO(); +// shopMerchantDTO.setShopId(shopId); +// shopMerchantDTO.setChannel(PayChannelCst.NATIVE); +// shopMerchantDTO.setRelatedId(shopDirectMerchant.getShopId()); NativeMerchantDTO nativeMerchantDTO = new NativeMerchantDTO(); nativeMerchantDTO.setWechatMerchantId(wechatMerchantId); nativeMerchantDTO.setAlipayMerchantId(alipayMerchantId); @@ -90,9 +88,9 @@ public class EntryManagerTask { AlipayAuthInfoDto alipayAuthInfoDto = JSONObject.parseObject(shopDirectMerchant.getAlipayAuthInfo(), AlipayAuthInfoDto.class); nativeMerchantDTO.setAlipayAuthInfo(alipayAuthInfoDto); } - shopMerchantDTO.setNativeMerchantDTO(nativeMerchantDTO); - shopMerchantService.editEntry(shopMerchantDTO, false); - shopMerchantService.upMerchant(shopDirectMerchant.getLicenceNo(), nativeMerchantDTO); +// shopMerchantDTO.setNativeMerchantDTO(nativeMerchantDTO); +// shopMerchantService.editEntry(shopMerchantDTO, false); + shopMerchantService.upMerchant(shopDirectMerchant.getShopId(), nativeMerchantDTO); } } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopMerchantDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopMerchantDTO.java index fdbd6fd69..4e2ed6662 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopMerchantDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopMerchantDTO.java @@ -23,7 +23,7 @@ public class ShopMerchantDTO { * 聚合支付商户 * native 必填 对应 tb_shop_direct_merchant 的 licence_no 营业执照 */ - private String relatedLicenceNo; + private Long relatedId; /** * 原生支付参数 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopMerchant.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopMerchant.java index b98297dc9..2e345d184 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopMerchant.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopMerchant.java @@ -3,7 +3,6 @@ package com.czg.order.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; -import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -42,9 +41,9 @@ public class ShopMerchant implements Serializable { /** * 聚合支付商户 - * native 必填 对应 tb_shop_direct_merchant 的 licence_no 营业执照 + * native 必填 对应 tb_shop_direct_merchant 的 shopId */ - private String relatedLicenceNo; + private Long relatedId; /** * 微信appid diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java index 2474cd675..7a8342148 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java @@ -28,7 +28,7 @@ public interface ShopMerchantService extends IService { * 已绑定的支付 * 更新商户支付参数 */ - void upMerchant(@NotBlank String relatedLicenceNo, @NotNull NativeMerchantDTO nativeMerchantDTO); + void upMerchant(@NotBlank Long relatedId, @NotNull NativeMerchantDTO nativeMerchantDTO); ShopMerchant getByShopId(Long shopId); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java index a62309b92..cf57c72d8 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java @@ -48,15 +48,15 @@ public class ShopMerchantServiceImpl extends ServiceImpl