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