From cfa4158172899545fa744f1605e40a87ef441f4a Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Thu, 8 Jan 2026 16:28:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20baseInfo=20Dto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/dto/req/MerchantBaseInfoDto.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/MerchantBaseInfoDto.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/MerchantBaseInfoDto.java index 3bebf4567..e249e55a4 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/MerchantBaseInfoDto.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/MerchantBaseInfoDto.java @@ -29,9 +29,17 @@ public class MerchantBaseInfoDto { /** * 【必填】 * 行业编码 + * 一级类目code_二级类目code + * 【示例值】A0001_B0199 */ private String mccCode; + /** + * 【必填】 + * 支付宝账号 + */ + private String alipayAccount; + /** * 联系人类型 * LEGAL: 经营者/法定代表人 From d20d023dd1cbefcc25e3d4ee6133b72a9fc2b556 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 8 Jan 2026 16:33:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/order/entity/ShopDirectMerchant.java | 4 ++++ .../com/czg/service/order/dto/AggregateMerchantVO.java | 7 +++++++ .../order/service/impl/ShopDirectMerchantServiceImpl.java | 1 + 3 files changed, 12 insertions(+) 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 7be0bfb84..a201a412e 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 @@ -40,6 +40,10 @@ public class ShopDirectMerchant implements Serializable { * 营业执照编号 */ private String licenceNo; + /** + * 支付宝账号 + */ + private String alipayAccount; /** * 商户编号（在当前系统唯一） diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java index 989788b9f..84aa15870 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java @@ -2,12 +2,14 @@ package com.czg.service.order.dto; import com.czg.dto.req.*; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; /** * @author ww */ +@EqualsAndHashCode(callSuper = true) @Data public class AggregateMerchantVO extends AggregateMerchantDto{ @@ -24,6 +26,11 @@ public class AggregateMerchantVO extends AggregateMerchantDto{ */ private String wechatStatus; + /** + * 支付宝账号 + */ + private String alipayAccount; + /** * 微信进件错误信息 */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java index beae12299..0f1f585ed 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java @@ -129,6 +129,7 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl