From cab370d1e1fb518d41004a8e1e6b2ff6b8b157e2 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 9 Jan 2026 11:29:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9D=E6=8E=88=E6=9D=83=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/mq/EntryManagerMqListener.java | 1 + .../src/main/java/com/czg/task/EntryManagerTask.java | 2 +- .../src/main/java/com/czg/config/RabbitPublisher.java | 2 +- .../src/main/java/com/czg/account/entity/ShopInfo.java | 4 ++++ .../main/java/com/czg/account/service/ShopInfoService.java | 7 ++++--- .../main/java/com/czg/order/entity/ShopDirectMerchant.java | 5 +++++ .../service/account/service/impl/ShopInfoServiceImpl.java | 3 ++- 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java index 223765759..2c161cfc8 100644 --- a/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java +++ b/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java @@ -81,6 +81,7 @@ public class EntryManagerMqListener { merchant.setAlipayOrderId(resp.getAlipayOrderId()); merchant.setAlipayStatus(resp.getAlipayStatus()); + merchant.setAlipayAuthInfo(resp.getAlipayAuthInfo()); merchant.setAlipayErrorMsg(resp.getAlipayErrorMsg()); shopDirectMerchantService.updateById(merchant); } 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 080316734..39f505b53 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 @@ -80,7 +80,7 @@ public class EntryManagerTask { } shopDirectMerchantService.updateById(shopDirectMerchant); if (StrUtil.isNotBlank(wechatMerchantId) || StrUtil.isNotBlank(alipayMerchantId)) { - shopInfoService.editEntry(shopDirectMerchant.getShopId(), wechatMerchantId, alipayMerchantId); + shopInfoService.editEntry(shopDirectMerchant.getShopId(), wechatMerchantId, alipayMerchantId, shopDirectMerchant.getAlipayAuthInfo()); } } } diff --git a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java index 8903cad34..4f591498f 100644 --- a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java +++ b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java @@ -131,7 +131,7 @@ public class RabbitPublisher { } /** - * 订单商品状态消息 + * 进件 */ public void sendEntryManagerMsg(String shopId) { sendMsg(RabbitConstants.Queue.SHOP_ENTRY_MANAGER, shopId); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java index 1bf743587..cf0843f72 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java @@ -150,6 +150,10 @@ public class ShopInfo implements Serializable { * 支付宝商户id */ private String alipayMerchantId; + /** + * 支付宝授权信息 + */ + private String alipayAuthInfo; /** * 到期时间 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java index dcb5e7af2..1d805017a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java @@ -23,8 +23,9 @@ public interface ShopInfoService extends IService { /** * 检测开关 - * @param shopId 店铺id - * @param switchType ShopInfo的某列 开关 目前只支持Integer类型字段 + * + * @param shopId 店铺id + * @param switchType ShopInfo的某列 开关 目前只支持Integer类型字段 * @return true:开启 false:关闭 */ boolean checkSwitch(Long shopId, ShopSwitchTypeEnum switchType) throws ValidateException; @@ -40,7 +41,7 @@ public interface ShopInfoService extends IService { /** * 进件结果保存 */ - Boolean editEntry(Long shopId, String wechatMerchantId, String alipayMerchantId); + Boolean editEntry(Long shopId, String wechatMerchantId, String alipayMerchantId, String alipayAuthInfo); ShopDetailDTO detail(Long id) throws CzgException; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java index a201a412e..99bfdeaeb 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java @@ -106,6 +106,11 @@ public class ShopDirectMerchant implements Serializable { */ private String alipayStatus; + /** + * 支付宝授信息 + */ + private String alipayAuthInfo; + /** * 支付宝进件错误信息 */ diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index a873e938a..42412bd03 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -326,10 +326,11 @@ public class ShopInfoServiceImpl extends ServiceImpl i @Override @CacheEvict(key = "#shopId") - public Boolean editEntry(Long shopId, String wechatMerchantId, String alipayMerchantId) { + public Boolean editEntry(Long shopId, String wechatMerchantId, String alipayMerchantId, String alipayAuthInfo) { ShopInfo shopInfo = new ShopInfo(); shopInfo.setWechatMerchantId(wechatMerchantId); shopInfo.setAlipayMerchantId(alipayMerchantId); + shopInfo.setAlipayAuthInfo(alipayAuthInfo); return update(shopInfo, new QueryWrapper().eq(ShopInfo::getId, shopId)); }