Merge branch 'pay' into test

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;
 
     /**
      * 商户编号（在当前系统唯一）

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:  经营者/法定代表人

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;
+
     /**
      * 微信进件错误信息
      */

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java

@@ -129,6 +129,7 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl<ShopDirectMerchan
         vo.setSettlementInfo(JSONObject.parseObject(entity.getSettlementInfo(), SettlementInfoDto.class));
 
         // 设置其他字段
+        vo.setAlipayAccount(entity.getAlipayAccount());
         vo.setCreateTime(entity.getCreateTime());
         vo.setUpdateTime(entity.getUpdateTime());
         vo.setWechatApplyId(entity.getWechatApplyId());