医健宝易宝支付相关代码提交

fs-admin/pom.xml

@@ -99,6 +99,34 @@
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.yeepay.yop.sdk</groupId>
+            <artifactId>yop-java-sdk</artifactId>
+            <version>4.4.15</version>
+        </dependency>
+        <!--  1.国际软算法(RSA) -->
+        <dependency>
+            <groupId>com.yeepay.yop.sdk</groupId>
+            <artifactId>yop-java-sdk-crypto-inter</artifactId>
+            <version>4.4.15</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yeepay.yop.sdk</groupId>
+            <artifactId>yop-java-sdk-crypto-gm</artifactId>
+            <version>4.4.15</version>
+        </dependency>
+        <!-- BouncyCastle加密库 - 易宝SDK必需 -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.67</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>1.67</version>
+        </dependency>
+
     </dependencies>
 
     <build>

fs-admin/src/main/java/com/fs/hisStore/TestYb.java

@@ -0,0 +1,101 @@
+package com.fs.hisStore;
+
+import com.fs.ybPay.aggpay.AggpayClient;
+import com.fs.ybPay.aggpay.AggpayClientBuilder;
+import com.fs.ybPay.aggpay.request.PrePayRequest;
+import com.fs.ybPay.aggpay.response.PrePayResponse;
+import com.yeepay.yop.sdk.exception.YopClientException;
+import com.yeepay.yop.sdk.service.common.YopClient;
+import com.yeepay.yop.sdk.service.common.YopClientBuilder;
+import org.joda.time.DateTime;
+
+import java.math.BigDecimal;
+
+/**
+ * 易宝支付测试类
+ * 
+ * 测试前请确保：
+ * 1. 已在 resources/config/yop_sdk_config_default.json 配置正确的：
+ *    - app_key: 商户编号
+ *    - isv_private_key: 商户私钥
+ *    - yop_public_key: 易宝公钥（已配置）
+ * 2. 已添加 BouncyCastle 依赖（pom.xml）
+ */
+public class TestYb {
+    static YopClient yopClient = YopClientBuilder.builder().build();
+    private static final AggpayClient api = AggpayClientBuilder.builder().build();
+    public static void main(String[] args) {
+        System.out.println("========== 易宝支付SDK测试 ==========");
+        
+        // 测试1: 基础SDK调用测试
+//        testBasicSdk();
+        
+         //测试2: 微信小程序支付下单测试（需要配置正确参数后取消注释）
+         testWxMiniPay();
+        
+        // 测试3: 订单查询测试
+        // testOrderQuery();
+        
+        // 测试4: 退款测试
+        // testRefund();
+    }
+
+
+    /**
+     * 测试微信小程序支付下单
+     */
+    private static void testWxMiniPay() {
+        PrePayRequest request = new PrePayRequest();
+        request.setParentMerchantNo("10092979478");
+        request.setMerchantNo("10092979478");
+        request.setOrderId("ORDER202401010515217305372872");
+        request.setOrderAmount(new BigDecimal("0"));
+        request.setExpiredTime(new DateTime());
+        request.setNotifyUrl("https://notify.merchant.com/xxx");
+        request.setRedirectUrl("https://notify.merchant.com/xxx");
+        request.setMemo("memo_example");
+        request.setGoodsName("旺仔牛奶");
+        request.setFundProcessType(PrePayRequest.FundProcessTypeEnum.fromValue("DELAY_SETTLE"));
+        request.setPayWay("MINI_PROGRAM");
+        request.setChannel(PrePayRequest.ChannelEnum.fromValue("WECHAT"));
+        request.setScene("OFFLINE");
+        request.setPromotionType("WECHAT_B2B");
+        request.setAppId("wx012574bf7bc1836d");
+        request.setUserId("2088176118911271 、olkcn7obuausx40U8TjVj-5QEdT7");
+        request.setUserIp("127.12.1.60");
+        request.setChannelSpecifiedInfo("{\"hbFqNum\":\"3\",\"hbFqSellerPercent\":\"0\",\"sysServiceProviderId\":\"\"}");
+        request.setChannelPromotionInfo("channelPromotionInfo_example");
+        request.setIdentityInfo("{\"identityVerifyType\":\"Y\",\"payerIdType\":\"IDENTITY_CARD\",\"payerNumber\":\"234512198006252456\",\"payerName\":\"名字\"}");
+        request.setLimitCredit("N");
+        request.setUniqueOrderNo("1012202101070000001989946571");
+        request.setToken("83BCDF29CFACB4411533080B67864EF8C907CCDC5E10A707C285FEA10CDB8221");
+        request.setCsUrl("csUrl_example");
+        request.setAccountLinkInfo("{accountProvider\":\"BOL\",\"token\":\"xxx\"}");
+        request.setYpPromotionInfo("自定义支付立减：[{\"amount\":\"0.01\",\"type\":\"CUSTOM_REDUCTION\"}],自定义补贴商户[{\"type\":\"CUSTOM_ALLOWANCE\"}]");
+        request.setBankCode("BOC");
+        request.setBusinessInfo("businessInfo_example");
+        request.setUserAuthCode("userAuthCode_example");
+        request.setChannelActivityInfo("{\"food_order_type\":\"QR_FOOD_ORDER\"}");
+        request.setTerminalId("terminalId_example");
+        request.setTerminalSceneInfo("{\"storeId\":\"门店id\",\"storeName\":\"门店名称\",\"operatorId\":\"商户操作员编号\",\"alipayStoreId\":\"支付宝的店铺编号\",\"areaCode\":\"门店行政区划码\",\"address\":\"门店详细地址\"}");
+        request.setYpAccountBookNo("ypAccountBookNo_example");
+        request.setTerminalInfo("{\"shopName\":\"网点名称\",\"shopCustomerNumber\":\"网点编号\"}");
+        request.setProductInfo("[{\"id\":\"random_reduction_pro\"}]");
+        request.setDivideDetail("[{\"amount\":\"金额\",\"ledgerNo\":\"分账商编\",\"divideDetailDesc\":\"分账说明\"}]");
+        request.setDivideNotifyUrl("divideNotifyUrl_example");
+        request.setFeeSubsidyInfo("[{\"subsidyMerchantNo\":\"10080009498\",\"subsidyAccountType\":\"FEE_ACCOUNT\",\"subsidyType\":\"ABSOLUTE\",\"subsidyProportion\":\"\",\"subsidyCalculateType\":\"SINGLE_PERCENT\",\"subsidyPercentFee\":\"0.6\",\"subsidyFixedFee\":\"\",\"subsidySingleMaxFee\":\"\"}]");
+        request.setAgreementId("agreementId_example");
+        request.setCreditOrderId("creditOrderId_example");
+        request.setPayMedium("payMedium_example");
+        request.setReceiverAccountType("receiverAccountType_example");
+        request.setJdbtPaymentInfo("{\"installmentNum\":\"3\",\"lockPlan\":\"3\",\"riskInfo\":{\"tradeScene\":\"01\",\"ifPickup\":\"01\",\"orderEid\":\"device2736253\",\"orderAccount\":\"user236781532\",\"acctRegTime\":\"2023-01-0112:00:00\",\"goodsId\":\"goods001\",\"type\":\"GT01\",\"price\":\"1000\",\"num\":\"2\",\"payCodeId\":\"paycode28367835\",\"name\":\"张三\",\"mobile\":\"13800138000\",\"province\":\"北京市\",\"city\":\"北京市\",\"county\":\"朝阳区\",\"address\":\"北京市朝阳区某某街道7号\"}}");
+        request.setAppUpIdentifier("appUpIdentifier_example");
+        request.setPreConsumeNotifyUrl("http://xxx.xxx.com/xxx");
+        try {
+            PrePayResponse response = api.prePay(request);
+            System.out.println("请求状态: " + response);
+        } catch (YopClientException e) {
+            System.out.println(e.getMessage());
+        }
+    }
+}

fs-admin/src/main/java/com/fs/hisStore/task/MallStoreTask.java

@@ -43,6 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;

fs-common/src/main/java/com/fs/common/core/domain/entity/SysRole.java

@@ -43,6 +43,9 @@ public class SysRole extends BaseEntity
     /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
     private boolean deptCheckStrictly;
 
+    /** 角色类型（0=普通角色 1=系统管理员 2=安全管理员 3=审计管理员） */
+    private Integer roleType;
+
     /** 角色状态（0正常 1停用） */
     @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
     private String status;
@@ -101,6 +104,16 @@ public class SysRole extends BaseEntity
         return roleId != null && 1L == roleId;
     }
 
+    public Integer getRoleType()
+    {
+        return roleType;
+    }
+
+    public void setRoleType(Integer roleType)
+    {
+        this.roleType = roleType;
+    }
+
     @NotBlank(message = "角色名称不能为空")
     @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
     public String getRoleName()

fs-company/src/main/java/com/fs/user/FsUserAdminController.java

@@ -15,7 +15,9 @@ import com.fs.course.domain.FsUserCompanyUser;
 import com.fs.course.dto.BatchSendCourseDTO;
 import com.fs.course.mapper.FsUserCompanyUserMapper;
 import com.fs.course.param.FsCourseLinkCreateParam;
+import com.fs.course.service.IFsUserCompanyUserService;
 import com.fs.course.service.IFsUserCourseService;
+import com.fs.hisStore.service.IFsUserCompanyUserScrmService;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 
@@ -28,6 +30,7 @@ import com.fs.qw.domain.CustomerTransferApproval;
 import com.fs.qw.dto.FsUserTransferParamDTO;
 import com.fs.qw.service.ICustomerTransferApprovalService;
 import com.fs.store.param.h5.FsUserPageListParam;
+import com.fs.user.dto.BatchUpdateStatusDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -70,6 +73,12 @@ public class FsUserAdminController extends BaseController {
     @Autowired
     private FsUserCompanyUserMapper fsUserCompanyUserMapper;
 
+    @Autowired
+    private IFsUserCompanyUserService fsUserCompanyUserService;
+
+    @Autowired
+    private IFsUserCompanyUserScrmService fsUserCompanyUserScrmService;
+
     @PreAuthorize("@ss.hasPermi('user:fsUser:list')")
     @PostMapping("/list")
     @ApiOperation("会员列表(与移动端使用的相同查询)")
@@ -188,4 +197,26 @@ public class FsUserAdminController extends BaseController {
         return openIMService.batchSendCourse(batchSendCourseDTO);
     }
 
+    /**
+     * 批量更新用户状态
+     */
+    @PreAuthorize("@ss.hasPermi('user:fsUser:edit')")
+    @Log(title = "用户", businessType = BusinessType.UPDATE)
+    @PostMapping("/batchUpdateStatus")
+    @ApiOperation("批量更新用户状态")
+    public AjaxResult batchUpdateStatus(@RequestBody BatchUpdateStatusDTO dto) {
+        if (dto.getUserIds() == null || dto.getUserIds().isEmpty()) {
+            return AjaxResult.error("请至少选择一个用户");
+        }
+        if (dto.getStatus() == null) {
+            return AjaxResult.error("状态不能为空");
+        }
+        // 校验状态值是否合法 (0:小黑屋, 1:正常, 2:拉黑)
+        if (dto.getStatus() != 0 && dto.getStatus() != 1 && dto.getStatus() != 2) {
+            return AjaxResult.error("状态值不合法");
+        }
+        Boolean result = fsUserCompanyUserService.batchUpdateStatus(dto.getUserIds(), dto.getStatus());
+        return result ? AjaxResult.success() : AjaxResult.error("更新失败");
+    }
+
 }

fs-company/src/main/java/com/fs/user/dto/BatchUpdateStatusDTO.java

@@ -0,0 +1,24 @@
+package com.fs.user.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 批量更新用户状态DTO
+ *
+ * @author fs
+ * @date 2025-01-15
+ */
+@Data
+@ApiModel("批量更新用户状态DTO")
+public class BatchUpdateStatusDTO {
+
+    @ApiModelProperty(value = "用户ID列表（ucuId列表）", required = true)
+    private List<Long> userIds;
+
+    @ApiModelProperty(value = "状态：0小黑屋 1正常 2拉黑", required = true)
+    private Integer status;
+}

fs-service/pom.xml

@@ -311,6 +311,22 @@
             <artifactId>volc-sdk-java</artifactId>
             <version>1.0.250</version>
         </dependency>
+        <dependency>
+            <groupId>com.yeepay.yop.sdk</groupId>
+            <artifactId>yop-java-sdk</artifactId>
+            <version>4.4.15</version>
+        </dependency>
+        <!--  1.国际软算法(RSA) -->
+        <dependency>
+            <groupId>com.yeepay.yop.sdk</groupId>
+            <artifactId>yop-java-sdk-crypto-inter</artifactId>
+            <version>4.4.15</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yeepay.yop.sdk</groupId>
+            <artifactId>yop-java-sdk-crypto-gm</artifactId>
+            <version>4.4.15</version>
+        </dependency>
     </dependencies>
 
 </project>

fs-service/src/main/java/com/fs/company/mapper/CompanyDivConfigMapper.java

@@ -3,6 +3,7 @@ package com.fs.company.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.company.domain.CompanyDivConfig;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 公司分账配置Mapper接口
@@ -58,4 +59,11 @@ public interface CompanyDivConfigMapper extends BaseMapper<CompanyDivConfig>{
      * @return 结果
      */
     int deleteCompanyDivConfigByCompanyIds(Long[] companyIds);
+
+    /**
+     * 获取销售公司分账配置
+     * @param companyId 销售公司id
+     * @return CompanyDivConfig
+     * **/
+    CompanyDivConfig selectDivConfigByCompanyId(@Param("companyId") Long companyId);
 }

fs-service/src/main/java/com/fs/erp/service/impl/JSTErpOrderServiceImpl.java

@@ -4,6 +4,10 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.fs.company.domain.Company;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.mapper.CompanyMapper;
+import com.fs.company.mapper.CompanyUserMapper;
 import com.fs.erp.constant.AfterSalesOrderStatusEnum;
 import com.fs.erp.constant.ErpQueryOrderStatusEnum;
 import com.fs.erp.constant.OrderStatusEnum;
@@ -49,6 +53,12 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class JSTErpOrderServiceImpl implements IErpOrderService {
+    @Autowired
+    private CompanyMapper companyMapper;
+
+    @Autowired
+    private CompanyUserMapper companyUserMapper;
+
     @Autowired
     private JstErpHttpService jstErpHttpService;
 
@@ -245,6 +255,9 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
         // 订单商品项列表
         List<OrderItemDTO> itemDTOList = new ArrayList<>();
 
+        //拼接推送信息（刘晓红提的需求，需要同步经销商和销售名字方便区分）
+        combinationInfo(fsStoreOrder, shopOrderDTO);
+
         List<FsStoreOrderItemVO> fsStoreOrderItemVOS = fsStoreOrderItemScrmService.selectFsStoreOrderItemListByOrderId(fsStoreOrder.getId());
         log.info("fsStoreOrderItemVOS==========>{}",fsStoreOrderItemVOS);
         for (FsStoreOrderItemVO item : fsStoreOrderItemVOS) {
@@ -649,5 +662,34 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
     public void getOrderScrmDeliveryStatus(FsStoreOrderScrm order) {
 
     }
+
+    /**
+     * 根据订单信息拼接聚水相关信息
+     * **/
+    private void  combinationInfo(FsStoreOrderScrm fsStoreOrder,ShopOrderDTO shopOrderDTO){
+        //验证是否存在销售
+        if(fsStoreOrder != null && fsStoreOrder.getCompanyUserId()!=null){
+            Company company = companyMapper.selectCompanyById(fsStoreOrder.getCompanyId());
+            String combinationValue = company.getCompanyName();
+            if(fsStoreOrder.getCompanyUserId() != null){
+                CompanyUser  companyUser = companyUserMapper.selectCompanyUserById(fsStoreOrder.getCompanyUserId());
+                shopOrderDTO.setRemark("销售员："+companyUser.getUserName());
+            }
+
+           if(shopOrderDTO != null){
+               if(shopOrderDTO.getShopBuyerId() != null){
+                   shopOrderDTO.setShopBuyerId(shopOrderDTO.getShopBuyerId() + "-"+ combinationValue);
+               }else {
+                   shopOrderDTO.setShopBuyerId(combinationValue);
+               }
+
+               if(shopOrderDTO.getReceiverName() != null){
+                   shopOrderDTO.setReceiverName(shopOrderDTO.getReceiverName() + "-"+ combinationValue);
+               }else {
+                   shopOrderDTO.setReceiverName(combinationValue);
+               }
+           }
+        }
+    }
 }
 

fs-service/src/main/java/com/fs/his/config/AgreementConfig.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 @Data
 public class AgreementConfig implements Serializable {
     String userRegister;
+    String userRegister2;
     String userPrivacy;
     String userPrivacy2;
     String userHealth;

fs-service/src/main/java/com/fs/his/domain/FsPayConfig.java

@@ -4,23 +4,48 @@ import lombok.Data;
 
 @Data
 public class FsPayConfig {
+    private String type;
+    private String appId;
+
+    // ========== 易宝旧接口配置 ==========
     private String ybAccount;
     private String ybKey;
-    private String type;
+    private String ybNotifyUrl;
+
+    // ========== 易宝SDK接口配置（聚合支付） ==========
+    /** 易宝AppKey（SDK配置app_key，回调解密用） */
+    private String ybAppKey;
+    /** 易宝商户号（聚合支付用，与ybAccount相同） */
+    private String ybMerchantNo;
+    /** 易宝父商户号（服务商模式） */
+    private String ybParentMerchantNo;
+    /** 易宝支付回调地址 */
+    private String ybPayNotifyUrl;
+    /** 易宝退款回调地址 */
+    private String ybRefundNotifyUrl;
+    /** 易宝分账回调地址 */
+    private String ybDivideNotifyUrl;
+    /** 易宝清算回调地址 */
+    private String ybCsNotifyUrl;
+    /** 默认场景 */
+    private String ybDefaultScene;
+
+    // ========== 台州银行配置 ==========
     private String tzPlatMerCstNo;
     private String tzAppSecret;
     private String tzPrivateKey;
     private String tzAppKey;
     private String tzPlatformPublicKey;
-    private String appId;
-    private String wxMchId;
-    private String wxMchKey;
-
-    private String ybNotifyUrl;
     private String tzPayDecrypt;
     private String tzRefundDecrypt;
     private String tzOrderShareDecrypt;
 
+    // ========== 微信支付配置 ==========
+    private String wxMchId;
+    private String wxMchKey;
+    private String wxApiV3Key;
+
+    // ========== 汇付配置 ==========
     private String hfProductId;
     private String hfSysId;
     private String huifuId;

fs-service/src/main/java/com/fs/his/mapper/FsUserWxMapper.java

@@ -24,4 +24,12 @@ public interface FsUserWxMapper extends BaseMapper<FsUserWx> {
      * @param userWxList 插入数据
      * **/
     void batchInfo(@Param("userWxList") List<FsUserWx> userWxList);
+
+    /**
+     * 根据用户ID和AppId查询用户信息
+     * @param userId 用户ID
+     * @param appId  AppId
+     * @return 用户信息
+     */
+    FsUserWx selectUserInfoByUserIdAndAppId(@Param("userId") Long userId, @Param("appId") String appId);
 }

fs-service/src/main/java/com/fs/his/param/FsPackageOrderDoPayParam.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 @Data
 public class FsPackageOrderDoPayParam implements Serializable {
@@ -22,4 +23,6 @@ public class FsPackageOrderDoPayParam implements Serializable {
     @NotNull(message = "支付类型不能为空")
     private Integer payType;
 
+    //改价金额
+    private BigDecimal editAmount;
 }

fs-service/src/main/java/com/fs/his/service/IFsPackageOrderService.java

@@ -16,6 +16,8 @@ import com.fs.his.vo.FsPackageOrderListVO;
 import com.fs.his.vo.FsPackageOrderVO;
 import io.swagger.models.auth.In;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 套餐订单Service接口
  *
@@ -143,5 +145,13 @@ public interface IFsPackageOrderService
 
     R getPackageOrder(String createOrderKey);
 
-    R aliPaymentCombinationId(FsPackageOrderDoPayParam param);
+    /**
+     * 组合订单支付（阿里）
+     * **/
+    R aliPaymentCombinationId(HttpServletRequest request,FsPackageOrderDoPayParam param);
+
+    /**
+     * 单订单订单支付（阿里）
+     * **/
+    R aliPaymentOrderId(HttpServletRequest request,FsPackageOrderDoPayParam param);
 }

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.fs.his.service.impl;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.LocalDate;
@@ -16,7 +17,9 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -56,8 +59,10 @@ import com.fs.hisStore.domain.FsPayConfigScrm;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.domain.FsStorePaymentScrm;
 import com.fs.hisStore.enums.OrderInfoEnum;
+import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
 import com.fs.hisStore.mapper.FsStorePaymentScrmMapper;
 import com.fs.hisStore.service.IFsStoreOrderScrmService;
+import com.fs.hisStore.vo.FsHuiFuPayInfo;
 import com.fs.huifuPay.domain.HuiFuCreateOrder;
 import com.fs.huifuPay.domain.HuifuCreateOrderResult;
 import com.fs.huifuPay.sdk.opps.core.utils.HuiFuUtils;
@@ -71,11 +76,16 @@ import com.fs.ybPay.domain.CreateWxOrderResult;
 import com.fs.ybPay.domain.OrderResult;
 import com.fs.ybPay.dto.OrderQueryDTO;
 import com.fs.ybPay.dto.RefundDTO;
+import com.fs.ybPay.dto.YopPayRequestDTO;
+import com.fs.ybPay.dto.YopPayResponseDTO;
 import com.fs.ybPay.service.IPayService;
 import com.fs.system.mapper.SysConfigMapper;
 import com.fs.system.service.ISysConfigService;
 import com.fs.tzBankPay.TzBankService.TzBankService;
 import com.fs.tzBankPay.doman.*;
+import com.fs.ybPay.service.IYopPayService;
+import com.fs.ybPay.ybenum.ChannelEnum;
+import com.fs.ybPay.ybenum.PayWayEnum;
 import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
@@ -96,6 +106,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 套餐订单Service业务层处理
  *
@@ -158,6 +170,9 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
     @Autowired
     private FsStorePaymentMapper fsStorePaymentMapper;
 
+    @Autowired
+    private FsStorePaymentScrmMapper storePaymentScrmMapper;
+
     @Autowired
     private FsInquiryOrderMapper fsInquiryOrderMapper;
 
@@ -167,6 +182,10 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
     private CompanyUserMapper companyUserMapper;
     @Autowired
     private IPayService ybPayService;
+
+    @Autowired
+    private IYopPayService yopPayService;
+
     @Autowired
     private IFsUserService fsUserService;
     @Autowired
@@ -178,11 +197,15 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
     @Autowired
     private CloudHostProper cloudHostProper;
 
+
     @Autowired
     private IFsStoreOrderScrmService orderService;
 
     private static final String STORE_PAY_CONF = "his.pay";
 
+    @Autowired
+    private FsStoreOrderScrmMapper fsStoreOrderMapper;
+
     @Autowired
     private FsStorePaymentScrmMapper fsStorePaymentScrmMapper;
 
@@ -1134,7 +1157,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             }
         }
         else{
-            return R.error(401,"用户OPENID不存在"); //触发前端重新登录
+            return R.error(36672,"用户OPENID不存在"); //触发前端重新登录
         }
         return R.error();
     }
@@ -1417,7 +1440,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             }
         }
         else{
-            return R.error("用户OPENID不存在");
+            return R.error(36672,"用户OPENID不存在");
         }
         return R.error();
     }
@@ -1851,24 +1874,19 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R aliPaymentCombinationId(FsPackageOrderDoPayParam param) {
+    public R aliPaymentCombinationId(HttpServletRequest request,FsPackageOrderDoPayParam param) {
         FsStoreOrderScrm fsStoreOrder = new FsStoreOrderScrm();
         BigDecimal payPrice = BigDecimal.ZERO;
         BigDecimal payMoneyTotal = BigDecimal.ZERO;
         FsUser fsUser = new FsUser();
         String payCode =  OrderCodeUtils.getOrderSn();
         List<FsStoreOrderScrm> orders = orderService.getStoreOrderByCombinationId(param.getCombinationOrderId());
-//        //更新订单状态
-//        FsPackageOrder fsPackageOrder=fsPackageOrderMapper.selectFsPackageOrderByOrderId(param.getOrderId());
-//        if(!fsPackageOrder.getStatus().equals(FsPackageOrderStatusEnum.STATUS_1.getValue())){
-//            return R.error("非法操作");
-//        }
         String errorMsg = checkPrescriptionOrders(orders);
         if (errorMsg != null) {
             return R.error(errorMsg);
         }
 
-        String json = configService.selectConfigByKey("his.pay");
+        String json = configService.selectConfigByKey(STORE_PAY_CONF);
         PayConfigDTO payConfigDTO = JSONUtil.toBean(json, PayConfigDTO.class);
         String openId = null;
         String appId = param.getAppId();
@@ -1880,34 +1898,35 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             if (order.getStatus() != OrderInfoEnum.STATUS_0.getValue()) {
                 return R.error("订单状态不正确");
             }
+
             FsUser user = userService.selectFsUserById(order.getUserId());
             fsUser = user;
-
-            if (StringUtils.isNotBlank(appId)) {
-                //查询fs_user_wx的openId
-                Wrapper<FsUserWx> queryWrapper = Wrappers.<FsUserWx>lambdaQuery()
-                        .eq(FsUserWx::getFsUserId, param.getUserId())
-                        .eq(FsUserWx::getAppId, appId);
-                FsUserWx fsUserWx = fsUserWxMapper.selectOne(queryWrapper);
-                if (fsUserWx != null) {
-                    openId = fsUserWx.getOpenId();
-                }
-            } else {
-                appId = payConfigDTO.getAppId();
-                openId = Objects.isNull(user) ? "" : user.getMaOpenId();
-                if (StringUtils.isBlank(openId)){
-                    Wrapper<FsUserWx> queryWrapper = Wrappers.<FsUserWx>lambdaQuery()
-                            .eq(FsUserWx::getFsUserId, param.getUserId())
-                            .eq(FsUserWx::getAppId, appId);
-                    FsUserWx fsUserWx = fsUserWxMapper.selectOne(queryWrapper);
-                    if (Objects.nonNull(fsUserWx)){
-                        openId = fsUserWx.getOpenId();
-                    }
-                }
-            }
+//
+//            if (StringUtils.isNotBlank(appId)) {
+//                //查询fs_user_wx的openId
+//                Wrapper<FsUserWx> queryWrapper = Wrappers.<FsUserWx>lambdaQuery()
+//                        .eq(FsUserWx::getFsUserId, param.getUserId())
+//                        .eq(FsUserWx::getAppId, appId);
+//                FsUserWx fsUserWx = fsUserWxMapper.selectOne(queryWrapper);
+//                if (fsUserWx != null) {
+//                    openId = fsUserWx.getOpenId();
+//                }
+//            } else {
+//                appId = payConfigDTO.getAppId();
+//                openId = Objects.isNull(user) ? "" : user.getMaOpenId();
+//                if (StringUtils.isBlank(openId)){
+//                    Wrapper<FsUserWx> queryWrapper = Wrappers.<FsUserWx>lambdaQuery()
+//                            .eq(FsUserWx::getFsUserId, param.getUserId())
+//                            .eq(FsUserWx::getAppId, appId);
+//                    FsUserWx fsUserWx = fsUserWxMapper.selectOne(queryWrapper);
+//                    if (Objects.nonNull(fsUserWx)){
+//                        openId = fsUserWx.getOpenId();
+//                    }
+//                }
+//            }
 
             payPrice = NumberUtil.add(payPrice, order.getPayPrice());
-            if (user != null && StringUtils.isNotEmpty(user.getMaOpenId())) {
+            if (user != null) {
                 //已改价处理
                 if (order.getIsEditMoney() != null && order.getIsEditMoney() == 1) {
                     //改过价不做处理
@@ -1915,7 +1934,6 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                     String config = configService.selectConfigByKey("store.config");
                     StoreConfig storeConfig = JSONUtil.toBean(config, StoreConfig.class);
                     if (param.getPayType().equals(1)) {
-                        order.setPayType("1");
                         order.setPayMoney(order.getPayPrice());
                         order.setPayDelivery(BigDecimal.ZERO);
                         payMoneyTotal = NumberUtil.add(payMoneyTotal, order.getPayPrice());
@@ -1937,7 +1955,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                     orderService.updateFsStoreOrder(order);
                 }
             } else {
-                return R.error("用户OPENID不存在");
+                return R.error("用户不存在");
             }
 
             if (order.getPayType().equals("1") || order.getPayType().equals("2")) {
@@ -1953,7 +1971,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                 storePayment.setPayMoney(order.getPayMoney());
                 storePayment.setCreateTime(new Date());
                 storePayment.setPayTypeCode("alipay");
-                storePayment.setBusinessType(3);
+                storePayment.setBusinessType(2);
                 storePayment.setRemark("商城订单支付");
                 storePayment.setOpenId(order.getRealName());
                 storePayment.setUserId(fsUser.getUserId());
@@ -1990,9 +2008,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             storePayment.setOpenId(fsStoreOrder.getRealName());
             storePayment.setUserId(fsUser.getUserId());
 
-            if (payConfigDTO.getType().equals("yb")) {
-                return R.error("支付暂不可用!");
-            } else if (payConfigDTO.getType().equals("tz")) {
+            if (payConfigDTO.getType().equals("tz")) {
                 PayCreateOrder o = new PayCreateOrder();
                 o.setOrderNo("package" + storePayment.getPayCode()); // 业务系统订单号
                 o.setTrxAmt(storePayment.getPayMoney().doubleValue()); // 交易金额
@@ -2036,6 +2052,43 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                     }
                 }
                 return R.ok().put("isPay", 0).put("data", result).put("type", "hf");
+            }else if (payConfigDTO.getType().equals("yb")) {
+                // 易宝聚合支付SDK下单
+                YopPayRequestDTO yopDto = new YopPayRequestDTO();
+                yopDto.setOrderId("store-" + payCode);
+                yopDto.setOrderAmount(payMoneyTotal);
+                yopDto.setPayWay(PayWayEnum.USER_SCAN.getCode());
+                yopDto.setChannel(ChannelEnum.ALIPAY.getCode());
+                yopDto.setUserId(fsUser.getUserId());
+                yopDto.setCompanyId(fsStoreOrder.getCompanyId());
+                yopDto.setCompanyUserId(fsStoreOrder.getCompanyUserId());
+                yopDto.setGoodsName("商城订单支付");
+                yopDto.setAppId(param.getAppId());
+                yopDto.setUserIp(getIp(request));
+                yopDto.setCombinationOrderId(fsStoreOrder.getCombinationOrderId());
+                YopPayResponseDTO yopResult = yopPayService.pay(yopDto);
+                if (yopResult != null && yopResult.isSuccess()) {
+                    // 下单成功，更新所有子订单payment的易宝交易号
+                    String uniqueOrderNo = yopResult.getUniqueOrderNo();
+                    for (Long paymentId : paymentIds) {
+                        FsStorePaymentScrm mt = new FsStorePaymentScrm();
+                        mt.setPaymentId(paymentId);
+                        mt.setTradeNo(uniqueOrderNo);
+                        storePaymentScrmMapper.updateFsStorePayment(mt);
+                    }
+
+                    String fundProcessType = yopResult.getFundProcessType();
+                    //更新订单分账类型
+                    if (!"REAL_TIME".equals(fundProcessType)) {//如果不为不需要分账就是分账
+                        orders.forEach(order -> {
+                            FsStoreOrderScrm update = new FsStoreOrderScrm();
+                            update.setId(order.getId());
+                            update.setIsDivide(1);//参与分账
+                            fsStoreOrderMapper.updateFsStoreOrder(update);
+                        });
+                    }
+                    return R.ok().put("isPay", 0).put("data", yopResult).put("type", "yb").put("payType", param.getPayType());
+                }
             }
         } else{
             this.payConfirm(fsStoreOrder.getOrderCode(),"","","",2,null,null);
@@ -2045,6 +2098,165 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         return R.error();
     }
 
+    @Override
+    public R aliPaymentOrderId(HttpServletRequest request, FsPackageOrderDoPayParam param) {
+
+        FsStoreOrderScrm order = orderService.selectFsStoreOrderById(param.getOrderId());
+
+        String errorMsg = checkPrescriptionOrders(Collections.singletonList(order));
+        if (errorMsg != null) {
+            return R.error(errorMsg);
+        }
+
+        if (order == null) {
+            return R.error("订单不存在");
+        }
+        if (order.getStatus() != OrderInfoEnum.STATUS_0.getValue()) {
+            return R.error("订单状态不正确");
+        }
+        FsUser user = userService.selectFsUserById(order.getUserId());
+        String json = configService.selectConfigByKey(STORE_PAY_CONF);
+        PayConfigDTO payConfigDTO = JSONUtil.toBean(json, PayConfigDTO.class);
+        if (user != null) {
+            //已改价处理
+            if (order.getIsEditMoney() != null && order.getIsEditMoney() == 1) {
+                //改过价不做处理
+            } else {
+                if (param.getPayType().equals(1)) {
+                    order.setPayType("1");
+                    order.setPayMoney(order.getPayPrice());
+                    order.setPayDelivery(BigDecimal.ZERO);
+                } else if (param.getPayType().equals(2)) {
+                    BigDecimal editAmount = param.getEditAmount();
+                    BigDecimal orderPrice = order.getPayPrice();
+                    if (ObjectUtil.isNull(editAmount) || param.getEditAmount().compareTo(BigDecimal.ZERO) <= 0) {
+                        return R.error("请输入正确的改价金额");
+                    }
+                    if (editAmount.compareTo(orderPrice) > 0) {
+                        return R.error("改价金额不能大于订单金额");
+                    }
+                    BigDecimal payMoney = editAmount.setScale(2, RoundingMode.HALF_UP);
+                    order.setPayType("2");
+                    order.setPayDelivery(orderPrice.subtract(payMoney).setScale(2, RoundingMode.HALF_UP));
+                    order.setPayMoney(payMoney);
+                } else if (param.getPayType().equals(3)) {
+                    //货到付款
+                    order.setPayType("3");
+                    order.setPayDelivery(order.getPayPrice());
+                    order.setPayMoney(BigDecimal.ZERO);
+                }
+                orderService.updateFsStoreOrder(order);
+            }
+            String payCode = IdUtil.getSnowflake(0, 0).nextIdStr();
+//          order.setOrderCode(orderCode);
+            if (order.getPayType().equals("1") || order.getPayType().equals("2")) {
+                FsStorePaymentScrm storePayment = new FsStorePaymentScrm();
+                storePayment.setCompanyId(order.getCompanyId());
+                storePayment.setCompanyUserId(order.getCompanyUserId());
+                storePayment.setStatus(0);
+                storePayment.setPayCode(payCode);
+                storePayment.setPayMoney(order.getPayMoney());
+                storePayment.setCreateTime(new Date());
+                storePayment.setPayTypeCode("alipay");
+                storePayment.setBusinessType(2);
+                storePayment.setRemark("商城订单支付");
+                storePayment.setOpenId(user.getRealName());
+                storePayment.setPayMode(payConfigDTO.getType());
+                storePayment.setUserId(user.getUserId());
+                storePayment.setBusinessOrderId(order.getId().toString());
+                storePayment.setOrderId(order.getId());
+                storePaymentScrmMapper.insertFsStorePayment(storePayment);
+                if(payConfigDTO.getType().equals("hf")){
+                    HuiFuCreateOrder o = new HuiFuCreateOrder();
+                    o.setTradeType("A_NATIVE");
+                    o.setOpenid(user.getMaOpenId());
+                    o.setReqSeqId("store-" + storePayment.getPayCode());
+                    o.setTransAmt(storePayment.getPayMoney().toString());
+                    o.setGoodsDesc("商城订单支付");
+                    o.setAppId(param.getAppId());
+                    HuifuCreateOrderResult result = huiFuService.createOrder(o);
+                    //创建订单
+                    if (result.getBank_code() != null && result.getBank_code().equals("00000000")) {
+                        FsStorePaymentScrm mt = new FsStorePaymentScrm();
+                        mt.setPaymentId(storePayment.getPaymentId());
+                        mt.setTradeNo(result.getHf_seq_id());
+                        storePaymentScrmMapper.updateFsStorePayment(mt);
+                        String mes = result.getPay_info();
+                        JSONObject payInfo = JSONUtil.parseObj(mes);
+                        FsHuiFuPayInfo fsHuiFuPayInfo = new FsHuiFuPayInfo();
+                        if (payInfo.get("timeStamp") != null) {
+                            fsHuiFuPayInfo.setTimeStamp(payInfo.get("timeStamp").toString());
+                        }
+                        if (payInfo.get("package") != null) {
+                            fsHuiFuPayInfo.setPackageStr(payInfo.get("package").toString());
+                        }
+                        if (payInfo.get("paySign") != null) {
+                            fsHuiFuPayInfo.setPaySign(payInfo.get("paySign").toString());
+
+                        }
+                        if (payInfo.get("appId") != null) {
+                            fsHuiFuPayInfo.setAppId(payInfo.get("appId").toString());
+
+                        }
+                        if (payInfo.get("signType") != null) {
+                            fsHuiFuPayInfo.setSignType(payInfo.get("signType").toString());
+
+                        }
+                        if (payInfo.get("nonceStr") != null) {
+                            fsHuiFuPayInfo.setNonceStr(payInfo.get("nonceStr").toString());
+                        }
+                        return R.ok().put("payType", param.getPayType()).put("result", fsHuiFuPayInfo);
+                    } else {
+                        return R.error(result.getResp_desc());
+                    }
+                }else if(payConfigDTO.getType().equals("yb")){
+                    // 易宝聚合支付SDK下单
+                    YopPayRequestDTO yopDto = new YopPayRequestDTO();
+                    yopDto.setOrderId("store-" + payCode);
+                    yopDto.setOrderAmount(storePayment.getPayMoney());
+                    yopDto.setPayWay(PayWayEnum.USER_SCAN.getCode());
+                    yopDto.setChannel(ChannelEnum.ALIPAY.getCode());
+                    yopDto.setUserId(order.getUserId());
+                    yopDto.setCompanyId(order.getCompanyId());
+                    yopDto.setCompanyUserId(order.getCompanyUserId());
+                    yopDto.setGoodsName("商城订单支付");
+                    yopDto.setAppId(param.getAppId());
+                    yopDto.setUserIp(getIp(request));
+                    YopPayResponseDTO yopResult = yopPayService.pay(yopDto);
+                    if (yopResult != null && yopResult.isSuccess()) {
+                        // 下单成功，更新所有子订单payment的易宝交易号
+                        String uniqueOrderNo = yopResult.getUniqueOrderNo();
+                        FsStorePaymentScrm mt = new FsStorePaymentScrm();
+                        mt.setPaymentId(storePayment.getPaymentId());
+                        mt.setTradeNo(uniqueOrderNo);
+                        storePaymentScrmMapper.updateFsStorePayment(mt);
+                        String fundProcessType = yopResult.getFundProcessType();
+                        //更新订单分账类型
+                        if(!"REAL_TIME".equals(fundProcessType)){
+                            FsStoreOrderScrm update = new FsStoreOrderScrm();
+                            update.setId(order.getId());
+                            update.setIsDivide(1);//参与分账
+                            fsStoreOrderMapper.updateFsStoreOrder(update);
+                        }
+                        return R.ok().put("isPay", 0).put("data", yopResult).put("type", "yb").put("payType", param.getPayType());
+                    } else {
+                        String errMsg = yopResult != null ? yopResult.getMessage() : "下单失败";
+                        return R.error("易宝下单失败：" + errMsg);
+                    }
+                }
+
+            } else if (order.getPayType().equals("3")) {
+                //货到付款
+                orderService.payConfirm(2, order.getId(), null, null, null, null);
+                return R.ok().put("payType", param.getPayType());
+            }
+
+            return R.error();
+        } else {
+            return R.error("用户不存在");
+        }
+    }
+
     public String checkPrescriptionOrders(List<FsStoreOrderScrm> orders) {
         if (orders == null || orders.isEmpty()) {
             return null;
@@ -2069,4 +2281,11 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         }
         return null;
     }
+
+    /**
+     * 获取ip信息
+     * **/
+    private String getIp(HttpServletRequest request){
+        return IpUtils.getIpAddr(request).split(",")[0];
+    }
 }

fs-service/src/main/java/com/fs/his/utils/PhoneUtil.java

@@ -100,6 +100,6 @@ public class PhoneUtil {
     }
 
     public static void main(String[] args) {
-        System.out.println(encryptPhone("18580395185"));
+        System.out.println(encryptPhone("18996202854"));
     }
 }

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderScrm.java

@@ -389,4 +389,13 @@ public class FsStoreOrderScrm extends BaseEntity
     //产品批次单号多个用逗号分割
     private String batchNumber;
 
+    /** 是否参与分账（0否 1是） */
+    private Integer isDivide;
+
+    /** 是否清算（0否 1是） */
+    private Integer isSettled;
+
+    /** 是否分账（0否 1是） */
+    private Integer isDivided;
+
 }

fs-service/src/main/java/com/fs/hisStore/domain/FsUserScrm.java

@@ -230,6 +230,18 @@ public class FsUserScrm extends BaseEntity
     private String rank;
     private String react;
 
+
+    /** app登录后不为null(表示是否下载app) */
+    private String historyApp;
+
+    public String getHistoryApp() {
+        return historyApp;
+    }
+
+    public void setHistoryApp(String historyApp) {
+        this.historyApp = historyApp;
+    }
+
     /**
      * 项目ID
      */

fs-service/src/main/java/com/fs/hisStore/service/impl/FsExpressScrmServiceImpl.java

@@ -17,6 +17,8 @@ import com.fs.common.config.FSSysConfig;
 import com.fs.common.core.domain.R;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.DateUtils;
+import com.fs.his.config.FsSysConfig;
+import com.fs.his.utils.ConfigUtil;
 import com.fs.hisStore.config.StoreConfig;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.dto.ExpressAddressDTO;
@@ -51,6 +53,9 @@ public class FsExpressScrmServiceImpl implements IFsExpressScrmService
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private ConfigUtil configUtil;
+
     /**
      * 查询快递公司
      * 
@@ -130,7 +135,7 @@ public class FsExpressScrmServiceImpl implements IFsExpressScrmService
 
         //处理顺丰查询轨迹需手机号码后4位
         String requestData;
-        if (ShipperCode.equals(ShipperCodeEnum.SF.getValue())) {
+        if (ShipperCode.equals(com.fs.his.enums.ShipperCodeEnum.SF.getValue())) {
             requestData = "{'OrderCode':'" + OrderCode + "','ShipperCode':'" + ShipperCode + "','LogisticCode':'" + LogisticCode + "','CustomerName':'" + lastFourNumber + "'}";
         } else {
             requestData = "{'OrderCode':'" + OrderCode + "','ShipperCode':'" + ShipperCode + "','LogisticCode':'" + LogisticCode + "'}";
@@ -138,8 +143,7 @@ public class FsExpressScrmServiceImpl implements IFsExpressScrmService
 
         Map<String, Object> params = new HashMap<>();
         try {
-            String json = this.configService.selectConfigByKey("his.config");
-            FSSysConfig sysConfig= JSON.parseObject(json,FSSysConfig.class);
+            FsSysConfig sysConfig = configUtil.getSysConfig();
             params.put("RequestData", URLEncoder.encode(requestData, "UTF-8"));
             params.put("EBusinessID",sysConfig.getKdnId().trim());
             params.put("RequestType", "8001");
@@ -147,7 +151,7 @@ public class FsExpressScrmServiceImpl implements IFsExpressScrmService
             params.put("DataSign", URLEncoder.encode(dataSign, "UTF-8"));
             params.put("DataType", "2");
 
-            String result = HttpUtil.post(sysConfig.getKdnUrl().trim(), params);
+            String result = HttpUtil.post(sysConfig.getKdnAddressUrl().trim(), params);
 
             //根据公司业务处理返回的信息......
             ExpressInfoDTO dto=JSONUtil.toBean(result,ExpressInfoDTO.class);

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreAfterSalesScrmServiceImpl.java

@@ -60,6 +60,9 @@ import com.fs.tzBankPay.doman.RefundParam;
 import com.fs.tzBankPay.doman.RefundResult;
 import com.fs.tzBankPay.doman.TzBankResult;
 import com.fs.ybPay.dto.RefundDTO;
+import com.fs.ybPay.dto.YopRefundRequestDTO;
+import com.fs.ybPay.dto.YopRefundResponseDTO;
+import com.fs.ybPay.service.IYopPayService;
 import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.bean.result.WxPayRefundQueryResult;
@@ -207,6 +210,9 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
     @Autowired
     private IFsStoreVerifyCodeScrmService verifyCodeScrmService;
 
+    @Autowired
+    private IYopPayService yopPayService;
+
     /**
      * 查询售后记录
      *
@@ -871,24 +877,40 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
                         }
 
                     }else if (payment.getPayMode()!=null&&payment.getPayMode().equals("yb")){
-                        //易宝
-                        com.fs.ybPay.dto.RefundDTO refundDTO = new RefundDTO();
-                        refundDTO.setRefundMoney(payment.getPayMoney().toString());
-                        refundDTO.setLowRefundNo(orderType + "-" + payment.getPayCode());
-                        refundDTO.setUpOrderId(payment.getTradeNo());
-                        refundDTO.setAppid(payment.getAppId());
-
-                        com.fs.ybPay.domain.RefundResult result = payService.refund(refundDTO);
-                        logger.info("订单退款返回结果:退款订单id:" + order.getId() + result);
-                        if (result.getState().equals("5")) {
-                            FsStorePaymentScrm paymentMap = new FsStorePaymentScrm();
-                            paymentMap.setPaymentId(payment.getPaymentId());
-                            paymentMap.setStatus(-1);
-                            paymentMap.setRefundTime(DateUtils.getNowDate());
-                            paymentMap.setRefundMoney(payment.getPayMoney());
-                            fsStorePaymentMapper.updateFsStorePayment(paymentMap);
+                        //易宝SDK退款
+                        YopRefundRequestDTO yopRefundRequest = new YopRefundRequestDTO();
+                        yopRefundRequest.setOrderId(orderType + "-" + payment.getPayCode());
+                        yopRefundRequest.setUniqueOrderNo(payment.getTradeNo());
+                        yopRefundRequest.setRefundRequestId("refund-" + payment.getPaymentId());
+                        yopRefundRequest.setRefundAmount(refundAmount);
+                        yopRefundRequest.setDescription("售后退款");
+
+                        YopRefundResponseDTO yopRefundResult = yopPayService.refund(yopRefundRequest);
+                        logger.info("易宝SDK退款返回结果:退款订单id:{} code:{} status:{}",
+                                order.getId(), yopRefundResult.getCode(), yopRefundResult.getStatus());
+                        if (yopRefundResult.isAccepted()) {
+                            // 易宝已受理退款（code=OPR00000）
+                            if (yopRefundResult.isRefundSuccess()) {
+                                // 退款立即成功 → 标记已退款
+                                FsStorePaymentScrm paymentMap = new FsStorePaymentScrm();
+                                paymentMap.setPaymentId(payment.getPaymentId());
+                                paymentMap.setStatus(-1);
+                                paymentMap.setRefundTime(DateUtils.getNowDate());
+                                paymentMap.setRefundMoney(refundAmount);
+                                fsStorePaymentMapper.updateFsStorePayment(paymentMap);
+                            } else if (yopRefundResult.isProcessing()) {
+                                // 退款处理中 → 标记退款中(status=-2)，等待回调最终确认
+                                FsStorePaymentScrm paymentMap = new FsStorePaymentScrm();
+                                paymentMap.setPaymentId(payment.getPaymentId());
+                                paymentMap.setStatus(-2);
+                                paymentMap.setRefundMoney(refundAmount);
+                                fsStorePaymentMapper.updateFsStorePayment(paymentMap);
+                            } else {
+                                // 其他状态（CANCEL/SUSPEND等）也视为退款失败
+                                throw new CustomException("退款异常，状态：" + yopRefundResult.getStatus());
+                            }
                         } else {
-                            throw new CustomException("退款请求失败" + result.getMessage());
+                            throw new CustomException("退款请求失败：" + yopRefundResult.getMessage());
                         }
                     }else {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -1532,22 +1554,38 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
                     throw new CustomException("退款请求失败" + e.getReturnMsg());
                 }
             } else if (payment.getPayMode().equals("yb")) {
-                //易宝
-                com.fs.ybPay.dto.RefundDTO refundDTO = new com.fs.ybPay.dto.RefundDTO();
-                refundDTO.setRefundMoney(payment.getPayMoney().toString());
-                refundDTO.setLowRefundNo(orderType + "-" + payment.getPayCode());
-                refundDTO.setUpOrderId(payment.getTradeNo());
-                com.fs.ybPay.domain.RefundResult result = payService.refund(refundDTO);
-                logger.info("订单退款返回结果:退款订单id:" + order.getOrderId() + result);
-                if (result.getState().equals("5")) {
-                    FsStorePaymentScrm paymentMap = new FsStorePaymentScrm();
-                    paymentMap.setPaymentId(payment.getPaymentId());
-                    paymentMap.setStatus(-1);
-                    paymentMap.setRefundTime(DateUtils.getNowDate());
-                    paymentMap.setRefundMoney(payment.getPayMoney());
-                    fsStorePaymentMapper.updateFsStorePayment(paymentMap);
+                //易宝SDK退款
+                YopRefundRequestDTO yopRefundRequest = new YopRefundRequestDTO();
+                yopRefundRequest.setOrderId(orderType + "-" + payment.getPayCode());
+                yopRefundRequest.setUniqueOrderNo(payment.getTradeNo());
+                yopRefundRequest.setRefundRequestId("refund-" + payment.getPayCode());
+                yopRefundRequest.setRefundAmount(payment.getPayMoney());
+                yopRefundRequest.setDescription("售后退款");
+
+                YopRefundResponseDTO yopRefundResult = yopPayService.refund(yopRefundRequest);
+                logger.info("易宝SDK退款返回结果:退款订单id:{} code:{} status:{}",
+                        order.getOrderId(), yopRefundResult.getCode(), yopRefundResult.getStatus());
+                if (yopRefundResult.isAccepted()) {
+                    if (yopRefundResult.isRefundSuccess()) {
+                        // 退款立即成功 → 标记已退款
+                        FsStorePaymentScrm paymentMap = new FsStorePaymentScrm();
+                        paymentMap.setPaymentId(payment.getPaymentId());
+                        paymentMap.setStatus(-1);
+                        paymentMap.setRefundTime(DateUtils.getNowDate());
+                        paymentMap.setRefundMoney(payment.getPayMoney());
+                        fsStorePaymentMapper.updateFsStorePayment(paymentMap);
+                    } else if (yopRefundResult.isProcessing()) {
+                        // 退款处理中 → 标记退款中(status=-2)，等待回调最终确认
+                        FsStorePaymentScrm paymentMap = new FsStorePaymentScrm();
+                        paymentMap.setPaymentId(payment.getPaymentId());
+                        paymentMap.setStatus(-2);
+                        paymentMap.setRefundMoney(payment.getPayMoney());
+                        fsStorePaymentMapper.updateFsStorePayment(paymentMap);
+                    } else {
+                        throw new CustomException("退款异常，状态：" + yopRefundResult.getStatus());
+                    }
                 } else {
-                    throw new CustomException("退款请求失败" + result.getMessage());
+                    throw new CustomException("退款请求失败：" + yopRefundResult.getMessage());
                 }
             } else if (payment.getPayMode().equals("tz")) {
                 RefundParam tzBankResult = new RefundParam();

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -1382,23 +1382,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             order.setStatus(OrderInfoEnum.STATUS_2.getValue());
             order.setDeliveryId(deliveryId);
             order.setDeliverySendTime(new Date());
-
-            //溯源码
-            List<FsStoreOrderItemVO> scrmList = fsStoreOrderItemMapper.selectMyFsStoreOrderItemListByOrderId(order.getId());
-            if (!scrmList.isEmpty()) {
-                List<Long> orderItemIds = scrmList.stream().map(FsStoreOrderItemVO::getItemId).collect(Collectors.toList());
-                //获取溯源码，进行回退
-                List<FsStoreVerifyCodeScrm> verifyCodes = verifyCodeScrmMapper.selectList(new LambdaQueryWrapper<FsStoreVerifyCodeScrm>().eq(FsStoreVerifyCodeScrm::getOrderId, order.getId()).in(FsStoreVerifyCodeScrm::getOrderItemId, orderItemIds).eq(FsStoreVerifyCodeScrm::getIsDel, "0"));
-                if (!verifyCodes.isEmpty()) {
-                    verifyCodes.forEach(v -> {
-                        v.setIsRecycle(0L);
-                    });
-                    //批量更新数据
-                    verifyCodeScrmService.updateBatchById(verifyCodes);
-                }
-
-            }
-
             fsStoreOrderMapper.updateFsStoreOrder(order);
             orderStatusService.create(order.getId(), OrderLogEnum.DELIVERY_GOODS.getValue(),
                     OrderLogEnum.DELIVERY_GOODS.getDesc());
@@ -1421,6 +1404,100 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     .templateType(TemplateListenEnum.TYPE_2.getValue())
                     .build();
             publisher.publishEvent(new TemplateEvent(this, templateBean));
+
+            //微信发货（线上发货）
+            syncWeChatShippingOnline(order);
+        }
+    }
+
+    /**
+     * 同步微信发货（线上发货，logisticsType=1）
+     */
+    private void syncWeChatShippingOnline(FsStoreOrderScrm order) {
+        try {
+            //获取该订单已支付的支付记录
+            List<FsStorePaymentScrm> payments = fsStorePaymentMapper.selectFsStorePaymentByOrderId(order.getId());
+            FsStorePaymentScrm payment = null;
+            if (payments != null && !payments.isEmpty()) {
+                for (FsStorePaymentScrm p : payments) {
+                    if (p.getStatus() != null && p.getStatus() == 1
+                            && StringUtils.isNotEmpty(p.getBankTransactionId())
+                            && StringUtils.isNotEmpty(p.getOpenId())
+                            && StringUtils.isNotEmpty(p.getAppId())) {
+                        payment = p;
+                        break;
+                    }
+                }
+            }
+            if (payment == null) {
+                log.warn("微信发货同步跳过，未找到有效支付记录，订单号：{}", order.getOrderCode());
+                return;
+            }
+            //取首个订单商品的名称作为物品描述
+            String itemDesc = "默认商品";
+            List<FsStoreOrderItemVO> itemList = fsStoreOrderItemMapper.selectMyFsStoreOrderItemListByOrderId(order.getId());
+            if (itemList != null && !itemList.isEmpty() && StringUtils.isNotEmpty(itemList.get(0).getJsonInfo())) {
+                try {
+                    JSONObject js = JSON.parseObject(itemList.get(0).getJsonInfo());
+                    String productName = js.getString("productName");
+                    if (StringUtils.isNotEmpty(productName)) {
+                        itemDesc = productName;
+                    }
+                } catch (Exception ignore) {
+                }
+            }
+            String uploadTime = ZonedDateTime.now(ZoneId.of("Asia/Shanghai"))
+                    .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+            final WxMaService wxService = WxMaConfiguration.getMaService(payment.getAppId());
+            uploadSingleShippingInfoOnline(wxService, payment, order, itemDesc, uploadTime);
+        } catch (Exception e) {
+            log.error("微信发货同步异常，订单号：{}", order.getOrderCode(), e);
+        }
+    }
+
+    /**
+     * 上传单个订单物流信息到微信（线上发货，logisticsType=1）
+     */
+    private boolean uploadSingleShippingInfoOnline(WxMaService wxService,
+                                                   FsStorePaymentScrm payment,
+                                                   FsStoreOrderScrm order,
+                                                   String itemDesc,
+                                                   String uploadTime) {
+        try {
+            WxMaOrderShippingInfoUploadRequest request = new WxMaOrderShippingInfoUploadRequest();
+            OrderKeyBean orderKeyBean = new OrderKeyBean();
+            orderKeyBean.setOrderNumberType(2);
+            orderKeyBean.setTransactionId(payment.getBankTransactionId());
+            request.setOrderKey(orderKeyBean);
+            request.setDeliveryMode(1);
+            //线上发货
+            request.setLogisticsType(1);
+
+            List<ShippingListBean> shippingList = new ArrayList<>();
+            ShippingListBean shippingListBean = new ShippingListBean();
+            shippingListBean.setTrackingNo(order.getDeliveryId());
+            shippingListBean.setExpressCompany(order.getDeliverySn());
+            shippingListBean.setItemDesc(StringUtils.isEmpty(itemDesc) ? "默认商品" : itemDesc);
+            ContactBean contactBean = new ContactBean();
+            contactBean.setReceiverContact(order.getUserPhone());
+            shippingListBean.setContact(contactBean);
+            shippingList.add(shippingListBean);
+            request.setShippingList(shippingList);
+            request.setUploadTime(uploadTime);
+
+            //支付者信息
+            PayerBean payerBean = new PayerBean();
+            payerBean.setOpenid(payment.getOpenId());
+            request.setPayer(payerBean);
+
+            boolean success = wxService.getWxMaOrderShippingService().upload(request).getErrCode() == 0;
+            if (!success) {
+                log.warn("上传物流信息到微信返回非0，订单号: {}", order.getOrderCode());
+            }
+            return success;
+        } catch (Exception e) {
+            log.error("上传物流信息到微信失败，订单号: {}", order.getOrderCode(), e);
+            return false;
         }
     }
 
@@ -1496,18 +1573,19 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
 
     @Override
     public R getExpress(FsStoreOrderScrm order) {
-        //顺丰轨迹查询处理
-        String lastFourNumber = "";
-        if (order.getDeliverySn().equals(ShipperCodeEnum.SF.getValue())) {
-            lastFourNumber = order.getUserPhone();
-            if (lastFourNumber.length() == 11) {
-                lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
+        ExpressInfoDTO expressInfoDTO = null;
+        if (StringUtils.isNotEmpty(order.getDeliveryId())) {
+            String lastFourNumber = "";
+            if (order.getDeliverySn().equals(ShipperCodeEnum.SF.getValue())) {
+                lastFourNumber = order.getUserPhone();
+                if (lastFourNumber.length() == 11) {
+                    lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
+                }
             }
+            expressInfoDTO = expressService.getExpressInfo(order.getOrderCode(), order.getDeliverySn(), order.getDeliveryId(), lastFourNumber);
         }
-        ExpressInfoDTO dto = expressService.getExpressInfo(order.getOrderCode(), order.getDeliverySn(), order.getDeliveryId(), lastFourNumber);
-        dto.setShipperName(order.getDeliveryName());
         FsExpressScrm express = expressService.selectFsExpressByName(order.getDeliveryName());
-        return R.ok().put("data", dto).put("express", express).put("deliveryId", order.getDeliveryId());
+        return R.ok().put("data", expressInfoDTO).put("express", express).put("deliveryId", order.getDeliveryId());
     }
 
     @Override
@@ -2570,6 +2648,13 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     @Override
     public R createSalesOrder(CompanyUser companyUser, String cateIds, Integer orderType, Integer orderMedium) {
         List<FsStoreCartQueryVO> carts = cartMapper.selectFsStoreCartListByIds(cateIds);
+        long distinctStoreCount = carts.stream()
+                .map(FsStoreCartQueryVO::getStoreId)
+                .distinct()
+                .count();
+        if (distinctStoreCount > 1) {
+            return R.error("不能同时选择不同店铺的商品进行制单！");
+        }
         String uuid = IdUtil.randomUUID();
         redisCache.setCacheObject("createOrderKey:" + uuid, companyUser.getCompanyId() + "-" + companyUser.getUserId(), 24, TimeUnit.HOURS);
         redisCache.setCacheObject("orderCarts:" + uuid, carts, 24, TimeUnit.HOURS);
@@ -5170,13 +5255,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             storeOrder.setIsChannel(1);
             storeOrder.setShippingType(1);
             storeOrder.setCreateTime(new Date());
-            if (param.getPayType().equals("1") || param.getPayType().equals("2")) {
-                //全款支付
-                storeOrder.setStatus(0);
-            } else if (param.getPayType().equals("3")) {
-                //货到付款
-                storeOrder.setStatus(1);
-            }
+            storeOrder.setStatus(0);
             //后台制单处理
             if (param.getPayPrice() != null && param.getPayPrice().compareTo(BigDecimal.ZERO) > 0) {
                 storeOrder.setPayPrice(param.getPayPrice());

fs-service/src/main/java/com/fs/system/service/impl/SysRoleServiceImpl.java

@@ -409,6 +409,24 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public int insertAuthUsers(Long roleId, Long[] userIds)
     {
+        // 三员互斥校验
+        SysRole role = roleMapper.selectRoleById(roleId);
+        if (role != null && role.getRoleType() != null && role.getRoleType() > 0)
+        {
+            for (Long userId : userIds)
+            {
+                List<SysRole> existRoles = roleMapper.selectRolePermissionByUserId(userId);
+                for (SysRole existRole : existRoles)
+                {
+                    if (existRole.getRoleType() != null && existRole.getRoleType() > 0
+                            && !existRole.getRoleType().equals(role.getRoleType()))
+                    {
+                        throw new ServiceException("不能同时拥有系统管理员、安全管理员、审计管理员中的多个角色");
+                    }
+                }
+            }
+        }
+
         // 新增用户与角色管理
         List<SysUserRole> list = new ArrayList<SysUserRole>();
         for (Long userId : userIds)

fs-service/src/main/java/com/fs/system/service/impl/SysUserServiceImpl.java

@@ -2,8 +2,10 @@ package com.fs.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -280,6 +282,10 @@ public class SysUserServiceImpl implements ISysUserService
     @Transactional
     public int insertUser(SysUser user)
     {
+        // 三员互斥校验
+        if (user.getUserId() != null && user.getRoleIds() != null) {
+            checkAdminRoleConflict(user.getUserId(), user.getRoleIds());
+        }
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
@@ -312,6 +318,10 @@ public class SysUserServiceImpl implements ISysUserService
     public int updateUser(SysUser user)
     {
         Long userId = user.getUserId();
+        // 三员互斥校验
+        if (user.getRoleIds() != null) {
+            checkAdminRoleConflict(userId, user.getRoleIds());
+        }
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 新增用户与角色管理
@@ -333,10 +343,67 @@ public class SysUserServiceImpl implements ISysUserService
     @Transactional
     public void insertUserAuth(Long userId, Long[] roleIds)
     {
+        checkAdminRoleConflict(userId, roleIds);
         userRoleMapper.deleteUserRoleByUserId(userId);
         insertUserRole(userId, roleIds);
     }
 
+    /**
+     * 三员互斥校验：检查是否同时授予了多个管理类角色
+     */
+    private void checkAdminRoleConflict(Long userId, Long[] newRoleIds)
+    {
+        if (newRoleIds == null || newRoleIds.length == 0)
+        {
+            return;
+        }
+
+        // 1. 查新角色中是否有管理类角色（roleType > 0）
+        List<SysRole> newRoles = roleMapper.selectSysRoleByIds(newRoleIds);
+        Set<Integer> newTypes = new HashSet<>();
+        for (SysRole role : newRoles)
+        {
+            if (role.getRoleType() != null && role.getRoleType() > 0)
+            {
+                newTypes.add(role.getRoleType());
+            }
+        }
+
+        if (newTypes.isEmpty())
+        {
+            return; // 没有管理角色，不冲突
+        }
+
+        // 不允许同时授予多个不同的管理角色类型
+        if (newTypes.size() > 1)
+        {
+            throw new ServiceException("不能同时拥有系统管理员、安全管理员、审计管理员中的多个角色");
+        }
+
+        // 2. 查用户已有角色中是否有管理类角色
+        List<SysRole> existRoles = roleMapper.selectRolePermissionByUserId(userId);
+        Set<Integer> existTypes = new HashSet<>();
+        for (SysRole role : existRoles)
+        {
+            if (role.getRoleType() != null && role.getRoleType() > 0)
+            {
+                existTypes.add(role.getRoleType());
+            }
+        }
+
+        // 3. 如果已有管理角色和新授予的管理角色不是同一种，则互斥
+        for (Integer existType : existTypes)
+        {
+            for (Integer newType : newTypes)
+            {
+                if (!existType.equals(newType))
+                {
+                    throw new ServiceException("不能同时拥有系统管理员、安全管理员、审计管理员中的多个角色");
+                }
+            }
+        }
+    }
+
     /**
      * 修改用户状态
      * 

fs-service/src/main/java/com/fs/ybPay/aggpay/AggpayClient.java

@@ -0,0 +1,1046 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package com.fs.ybPay.aggpay;
+
+import com.fs.ybPay.aggpay.request.*;
+import com.fs.ybPay.aggpay.request.old.*;
+import com.fs.ybPay.aggpay.response.*;
+import com.fs.ybPay.aggpay.response.old.*;
+import com.yeepay.yop.sdk.exception.YopClientException;
+
+
+public interface AggpayClient {
+
+    /**
+     * 活动报名查询接口
+     *  
+     * @return ActivityQueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ActivityQueryResponse activityQuery(ActivityQueryRequest request) throws YopClientException;
+
+    /**
+     * 活动报名申请接口
+     * 
+     * @return ActivityRequestResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ActivityRequestResponse activityRequest(ActivityRequestRequest request) throws YopClientException;
+
+    /**
+     * 新挂靠主备报备查询记录
+     *  
+     * @return AggAttachReportQueryV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggAttachReportQueryV10Response agg_attach_report_query_v1_0(AggAttachReportQueryV10Request request) throws YopClientException;
+
+    /**
+     * 聚合资质提交
+     *  
+     * @return AggAttachReportV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggAttachReportV10Response agg_attach_report_v1_0(AggAttachReportV10Request request) throws YopClientException;
+
+    /**
+     * 聚合关单
+     *  
+     * @return AggCloseOrderV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggCloseOrderV10Response agg_close_order_v1_0(AggCloseOrderV10Request request) throws YopClientException;
+
+    /**
+     * 花呗分期前置发奖
+     *  
+     * @return AggHbfqAwardReceiveV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggHbfqAwardReceiveV10Response agg_hbfq_award_receive_v1_0(AggHbfqAwardReceiveV10Request request) throws YopClientException;
+
+    /**
+     * 花呗分期前置咨询
+     *  
+     * @return AggHbfqMarketingConsultV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggHbfqMarketingConsultV10Response agg_hbfq_marketing_consult_v1_0(AggHbfqMarketingConsultV10Request request) throws YopClientException;
+
+    /**
+     * 报备记录备份
+     *  
+     * @return AggReportBackUpV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggReportBackUpV10Response agg_report_back_up_v1_0(AggReportBackUpV10Request request) throws YopClientException;
+
+    /**
+     * 查询渠道报备信息
+     *  
+     * @return AggReportQueryV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggReportQueryV10Response agg_report_query_v1_0(AggReportQueryV10Request request) throws YopClientException;
+
+    /**
+     * 修改渠道报备信息
+     * 
+     * @return AggReportUpdateV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggReportUpdateV10Response agg_report_update_v1_0(AggReportUpdateV10Request request) throws YopClientException;
+
+    /**
+     * 微信门店信息批量预录入
+     * 通过本API可提前预录入门店信息。对于已提前预录入门店信息的用户，在登录小程序进行门店认证授权流程时，会默认拉起展示预录入的门店信息，用户一键确认即可完成认证授权，减少用户操作成本，提升认证授权成功率
+     * @return AggRetailBatchCreateV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggRetailBatchCreateV10Response agg_retail_batch_create_v1_0(AggRetailBatchCreateV10Request request) throws YopClientException;
+
+    /**
+     * 查询已授权门店信息
+     * 查询已完成门店认证授权用户的门店信息
+     * @return AggRetailGetInfoV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggRetailGetInfoV10Response agg_retail_get_info_v1_0(AggRetailGetInfoV10Request request) throws YopClientException;
+
+    /**
+     * 微信处置查询接口
+     *  
+     * @return AggWechatDisposalQueryV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AggWechatDisposalQueryV10Response agg_wechat_disposal_query_v1_0(AggWechatDisposalQueryV10Request request) throws YopClientException;
+
+    /**
+     * 渠道号申请接口
+     *  
+     * @return ApplyChannelNoResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ApplyChannelNoResponse applyChannelNo(ApplyChannelNoRequest request) throws YopClientException;
+
+    /**
+     * 主从关系配置申请接口
+     * 主从关系配置申请接口
+     * @return AttachAddResponse
+     * @throws YopClientException if fails to make API call
+     */
+    AttachAddResponse attachAdd(AttachAddRequest request) throws YopClientException;
+
+    /**
+     * 主从关系查询接口
+     *  
+     * @return AttachQueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    AttachQueryResponse attachQuery(AttachQueryRequest request) throws YopClientException;
+
+    /**
+     * 解除主从关系接口
+     *  
+     * @return AttachRelieveResponse
+     * @throws YopClientException if fails to make API call
+     */
+    AttachRelieveResponse attachRelieve(AttachRelieveRequest request) throws YopClientException;
+
+    /**
+     * 主从关系配置申请接口
+     * 主从关系配置申请接口
+     * @return AttachReportResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    AttachReportResponse attachReport(AttachReportRequest request) throws YopClientException;
+
+    /**
+     * 聚合关单
+     *  
+     * @return CloseOrderResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CloseOrderResponse closeOrder(CloseOrderRequest request) throws YopClientException;
+
+    /**
+     *  聚合支付关单
+     *  
+     * @return CloseOrderV2Response
+     * @throws YopClientException if fails to make API call
+     */
+    CloseOrderV2Response closeOrderV2(CloseOrderV2Request request) throws YopClientException;
+
+    /**
+     *  聚合支付关单
+     *  
+     * @return CloseOrderV20Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CloseOrderV20Response close_order_v2_0(CloseOrderV20Request request) throws YopClientException;
+
+    /**
+     * 更新退款审核结果
+     * 针对“申请退款单”，需要商户明确返回是否可退款的审批结果。
+     * @return ComplaintUpdaterefundprogressResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ComplaintUpdaterefundprogressResponse complaintUpdaterefundprogress(ComplaintUpdaterefundprogressRequest request) throws YopClientException;
+
+    /**
+     * 查询投诉订单详情
+     * 商户可通过调用此接口，查询指定投诉单的用户投诉详情，包含投诉内容、投诉关联订单、投诉人联系方式等信息，方便商户处理投诉
+     * @return ComplaintWechatDetailsResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ComplaintWechatDetailsResponse complaintWechatDetails(ComplaintWechatDetailsRequest request) throws YopClientException;
+
+    /**
+     * 图片下载
+     * 
+     * @return ComplaintWechatDownloadPicResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ComplaintWechatDownloadPicResponse complaintWechatDownloadPic(ComplaintWechatDownloadPicRequest request) throws YopClientException;
+
+    /**
+     * 回复用户处理内容
+     * 商户可通过调用此接口，提交回复内容或反馈投诉单已处理完成。其中上传图片凭证需首先调用【子商户入网资质文件上传】接口，得到图片URL，再将URL填入请求。
+     * @return ComplaintWechatFeedbackResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ComplaintWechatFeedbackResponse complaintWechatFeedback(ComplaintWechatFeedbackRequest request) throws YopClientException;
+
+    /**
+     * 查询投诉订单列表
+     * 对于SAAS服务商、平台商、标准商户可通过调用此接口，查询指定时间段的所有用户投诉信息；也可通过调用此接口，查询指定子商户编号对应子商户的投诉信息，若不指定则查询所有子商户投诉信息。
+     * @return ComplaintWechatListResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ComplaintWechatListResponse complaintWechatList(ComplaintWechatListRequest request) throws YopClientException;
+
+    /**
+     * 查询投诉协商历史
+     * 商户可通过调用此接口，查询指定投诉的用户/商户协商历史，输出查询结果，方便商户根据处理历史来制定后续处理方案。
+     * @return ComplaintWechatNegotiationHistoryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ComplaintWechatNegotiationHistoryResponse complaintWechatNegotiationHistory(ComplaintWechatNegotiationHistoryRequest request) throws YopClientException;
+
+    /**
+     * 反馈处理完成
+     * 
+     * @return ComplaintWechatSuccessResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ComplaintWechatSuccessResponse complaintWechatSuccess(ComplaintWechatSuccessRequest request) throws YopClientException;
+
+    /**
+     * 查询投诉订单详情
+     * 商户可通过调用此接口，查询指定投诉单的用户投诉详情，包含投诉内容、投诉关联订单、投诉人联系方式等信息，方便商户处理投诉
+     * @return ComplaintWechatDetailsV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    ComplaintWechatDetailsV10Response complaint_wechat_details_v1_0(ComplaintWechatDetailsV10Request request) throws YopClientException;
+
+    /**
+     * 图片下载
+     * 
+     * @return ComplaintWechatDownloadPicV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    ComplaintWechatDownloadPicV10Response complaint_wechat_download_pic_v1_0(ComplaintWechatDownloadPicV10Request request) throws YopClientException;
+
+    /**
+     * 回复用户处理内容
+     * 商户可通过调用此接口，提交回复内容或反馈投诉单已处理完成。其中上传图片凭证需首先调用【子商户入网资质文件上传】接口，得到图片URL，再将URL填入请求。
+     * @return ComplaintWechatFeedbackV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    ComplaintWechatFeedbackV10Response complaint_wechat_feedback_v1_0(ComplaintWechatFeedbackV10Request request) throws YopClientException;
+
+    /**
+     * 查询投诉订单列表
+     * 对于SAAS服务商、平台商、标准商户可通过调用此接口，查询指定时间段的所有用户投诉信息；也可通过调用此接口，查询指定子商户编号对应子商户的投诉信息，若不指定则查询所有子商户投诉信息。
+     * @return ComplaintWechatListV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    ComplaintWechatListV10Response complaint_wechat_list_v1_0(ComplaintWechatListV10Request request) throws YopClientException;
+
+    /**
+     * 查询投诉协商历史
+     * 商户可通过调用此接口，查询指定投诉的用户/商户协商历史，输出查询结果，方便商户根据处理历史来制定后续处理方案。
+     * @return ComplaintWechatNegotiationHistoryV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    ComplaintWechatNegotiationHistoryV10Response complaint_wechat_negotiation_history_v1_0(ComplaintWechatNegotiationHistoryV10Request request) throws YopClientException;
+
+    /**
+     * 反馈处理完成
+     * 
+     * @return ComplaintWechatSuccessV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    ComplaintWechatSuccessV10Response complaint_wechat_success_v1_0(ComplaintWechatSuccessV10Request request) throws YopClientException;
+
+    /**
+     * 信用分预授权
+     *  
+     * @return CreditScoreAuthorizationResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CreditScoreAuthorizationResponse creditScoreAuthorization(CreditScoreAuthorizationRequest request) throws YopClientException;
+
+    /**
+     * 信用分授权关系查询
+     *  
+     * @return CreditScoreAuthorizationQueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CreditScoreAuthorizationQueryResponse creditScoreAuthorizationQuery(CreditScoreAuthorizationQueryRequest request) throws YopClientException;
+
+    /**
+     * 信用分取消
+     * 信用分订单取消（该接口仅支持微信）
+     * @return CreditScoreCancelResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CreditScoreCancelResponse creditScoreCancel(CreditScoreCancelRequest request) throws YopClientException;
+
+    /**
+     * 信用分创建
+     * 创建信用分订单（该接口仅支持微信）
+     * @return CreditScoreCreateResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CreditScoreCreateResponse creditScoreCreate(CreditScoreCreateRequest request) throws YopClientException;
+
+    /**
+     * 信用分修改
+     * 信用分订单修改（该接口仅支持微信）
+     * @return CreditScoreModifyResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CreditScoreModifyResponse creditScoreModify(CreditScoreModifyRequest request) throws YopClientException;
+
+    /**
+     * 信用分扣款
+     * 信用分扣款（该接口仅支持微信）
+     * @return CreditScorePayResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CreditScorePayResponse creditScorePay(CreditScorePayRequest request) throws YopClientException;
+
+    /**
+     * 信用分查询
+     * 信用分订单查询（该接口仅支持微信）
+     * @return CreditScoreQueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CreditScoreQueryResponse creditScoreQuery(CreditScoreQueryRequest request) throws YopClientException;
+
+    /**
+     * 信用分同步
+     * 信用分订单同步（该接口仅支持微信）
+     * @return CreditScoreSyncResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CreditScoreSyncResponse creditScoreSync(CreditScoreSyncRequest request) throws YopClientException;
+
+    /**
+     * 信用分解除授权
+     *  
+     * @return CreditScoreUnAuthorizationResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CreditScoreUnAuthorizationResponse creditScoreUnAuthorization(CreditScoreUnAuthorizationRequest request) throws YopClientException;
+
+    /**
+     * 信用分完结
+     * 信用分订单完结（该接口仅支持微信）
+     * @return CreditScorecompleteResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    CreditScorecompleteResponse creditScorecomplete(CreditScorecompleteRequest request) throws YopClientException;
+
+    /**
+     * 信用分预授权
+     *  
+     * @return CreditscoreAuthorizationResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CreditscoreAuthorizationResponse creditscoreAuthorization(CreditscoreAuthorizationRequest request) throws YopClientException;
+
+    /**
+     * 信用分授权关系查询
+     *  
+     * @return CreditscoreAuthorizationqueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CreditscoreAuthorizationqueryResponse creditscoreAuthorizationquery(CreditscoreAuthorizationqueryRequest request) throws YopClientException;
+
+    /**
+     * 信用分取消
+     * 信用分订单取消（该接口仅支持微信）
+     * @return CreditscoreCancelResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CreditscoreCancelResponse creditscoreCancel(CreditscoreCancelRequest request) throws YopClientException;
+
+    /**
+     * 信用分完结
+     * 信用分订单完结（该接口仅支持微信）
+     * @return CreditscoreCompleteResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CreditscoreCompleteResponse creditscoreComplete(CreditscoreCompleteRequest request) throws YopClientException;
+
+    /**
+     * 信用分创建
+     * 创建信用分订单（该接口仅支持微信）
+     * @return CreditscoreCreateResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CreditscoreCreateResponse creditscoreCreate(CreditscoreCreateRequest request) throws YopClientException;
+
+    /**
+     * 信用分修改
+     * 信用分订单修改（该接口仅支持微信）
+     * @return CreditscoreModifyResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CreditscoreModifyResponse creditscoreModify(CreditscoreModifyRequest request) throws YopClientException;
+
+    /**
+     * 信用分扣款
+     * 信用分扣款（该接口仅支持微信）
+     * @return CreditscorePayResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CreditscorePayResponse creditscorePay(CreditscorePayRequest request) throws YopClientException;
+
+    /**
+     * 信用分查询
+     * 信用分订单查询（该接口仅支持微信）
+     * @return CreditscoreQueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CreditscoreQueryResponse creditscoreQuery(CreditscoreQueryRequest request) throws YopClientException;
+
+    /**
+     * 信用分同步
+     * 信用分订单同步（该接口仅支持微信）
+     * @return CreditscoreSyncResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CreditscoreSyncResponse creditscoreSync(CreditscoreSyncRequest request) throws YopClientException;
+
+    /**
+     * 信用分解除授权
+     *  
+     * @return CreditscoreUnauthorizationResponse
+     * @throws YopClientException if fails to make API call
+     */
+    CreditscoreUnauthorizationResponse creditscoreUnauthorization(CreditscoreUnauthorizationRequest request) throws YopClientException;
+
+    /**
+     * 重新发起报备
+     * 对接入网报备失败通知后，可自主修改相关信息提交；
+     * @return EntryReapplyResponse
+     * @throws YopClientException if fails to make API call
+     */
+    EntryReapplyResponse entryReapply(EntryReapplyRequest request) throws YopClientException;
+
+    /**
+     * 重新发起报备
+     * 对接入网报备失败通知后，可自主修改相关信息提交；
+     * @return EntryReapplyResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    EntryReapplyResponse entry_reapply(EntryReapplyRequest request) throws YopClientException;
+
+    /**
+     * 获取刷脸付调用凭证
+     * 
+     * @return GetAuthInfoResponse
+     * @throws YopClientException if fails to make API call
+     */
+    GetAuthInfoResponse getAuthInfo(GetAuthInfoRequest request) throws YopClientException;
+
+    /**
+     * 银联获取用户ID
+     *  
+     * @return GetUserIdResponse
+     * @throws YopClientException if fails to make API call
+     */
+    GetUserIdResponse getUserId(GetUserIdRequest request) throws YopClientException;
+
+    /**
+     * 获取刷脸付调用凭证
+     * 
+     * @return GetAuthInfoV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    GetAuthInfoV10Response get_auth_info_v1_0(GetAuthInfoV10Request request) throws YopClientException;
+
+    /**
+     * 花呗分期前置发奖
+     *  
+     * @return HbfqAwardReceiveResponse
+     * @throws YopClientException if fails to make API call
+     */
+    HbfqAwardReceiveResponse hbfqAwardReceive(HbfqAwardReceiveRequest request) throws YopClientException;
+
+    /**
+     * 花呗分期前置咨询
+     *  
+     * @return HbfqMarketingConsultResponse
+     * @throws YopClientException if fails to make API call
+     */
+    HbfqMarketingConsultResponse hbfqMarketingConsult(HbfqMarketingConsultRequest request) throws YopClientException;
+
+    /**
+     * 查询小程序投诉详情
+     * 商户可通过调用此接口，查询指定投诉单的用户投诉详情，包含投诉内容、投诉关联订单、投诉人联系方式等信息，方便商户处理投诉。
+     * @return MiniprogramDetailsResponse
+     * @throws YopClientException if fails to make API call
+     */
+    MiniprogramDetailsResponse miniprogramDetails(MiniprogramDetailsRequest request) throws YopClientException;
+
+    /**
+     * 商家回应/申诉小程序投诉
+     * 当用户投诉入口为易宝小程序时，可调用此接口进行回应，或进行申诉
+     * @return MiniprogramFeedbackResponse
+     * @throws YopClientException if fails to make API call
+     */
+    MiniprogramFeedbackResponse miniprogramFeedback(MiniprogramFeedbackRequest request) throws YopClientException;
+
+    /**
+     *  查询小程序投诉协商历史
+     * 商户可通过调用此接口，查询指定投诉的用户/商户协商历史，输出查询结果，方便商户根据处理历史来制定后续处理方案。
+     * @return MiniprogramNegotiationHistoryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    MiniprogramNegotiationHistoryResponse miniprogramNegotiationHistory(MiniprogramNegotiationHistoryRequest request) throws YopClientException;
+
+    /**
+     * 聚合支付交易查询
+     * 聚合支付支付结果查询接口
+     * @return OrderQueryV2Response
+     * @throws YopClientException if fails to make API call
+     */
+    OrderQueryV2Response orderQueryV2(OrderQueryV2Request request) throws YopClientException;
+
+    /**
+     * 付款码支付
+     *  
+     * @return PayResponse
+     * @throws YopClientException if fails to make API call
+     */
+    PayResponse pay(PayRequest request) throws YopClientException;
+
+    /**
+     * 生成聚合订单码
+     *  
+     * @return PayLinkResponse
+     * @throws YopClientException if fails to make API call
+     */
+    PayLinkResponse payLink(PayLinkRequest request) throws YopClientException;
+
+    /**
+     * 生成聚合订单码
+     *  
+     * @return PayLinkV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    PayLinkV10Response pay_link_v1_0(PayLinkV10Request request) throws YopClientException;
+
+    /**
+     * 付款码支付
+     *  
+     * @return PayV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    PayV10Response pay_v1_0(PayV10Request request) throws YopClientException;
+
+    /**
+     * 聚合支付统一下单
+     *  
+     * @return PrePayResponse
+     * @throws YopClientException if fails to make API call
+     */
+    PrePayResponse prePay(PrePayRequest request) throws YopClientException;
+
+    /**
+     * 聚合支付统一下单
+     *  
+     * @return PrePayV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    PrePayV10Response pre_pay_v1_0(PrePayV10Request request) throws YopClientException;
+
+    /**
+     * 查询渠道结算账户
+     * 支持查询渠道（例如微信）的结算账户
+     * @return QueryAccountInfoResponse
+     * @throws YopClientException if fails to make API call
+     */
+    QueryAccountInfoResponse queryAccountInfo(QueryAccountInfoRequest request) throws YopClientException;
+
+    /**
+     * 查询渠道结算账户修改结果
+     * 调用【修改渠道结算账户】后，可调用此接口查看修改结果
+     * @return QueryAccountUpdateResultResponse
+     * @throws YopClientException if fails to make API call
+     */
+    QueryAccountUpdateResultResponse queryAccountUpdateResult(QueryAccountUpdateResultRequest request) throws YopClientException;
+
+    /**
+     * 渠道号申请查询接口
+     *  
+     * @return QueryApplyChannelNoResponse
+     * @throws YopClientException if fails to make API call
+     */
+    QueryApplyChannelNoResponse queryApplyChannelNo(QueryApplyChannelNoRequest request) throws YopClientException;
+
+    /**
+     *  查询小程序投诉协商历史
+     * 商户可通过调用此接口，查询指定投诉的用户/商户协商历史，输出查询结果，方便商户根据处理历史来制定后续处理方案。
+     * @return QueryComplaintNegotiationHistoryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    QueryComplaintNegotiationHistoryResponse queryComplaintNegotiationHistory(QueryComplaintNegotiationHistoryRequest request) throws YopClientException;
+
+    /**
+     * 查询小程序投诉详情
+     * 商户可通过调用此接口，查询指定投诉单的用户投诉详情，包含投诉内容、投诉关联订单、投诉人联系方式等信息，方便商户处理投诉。
+     * @return QueryMiniProgramDetailResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    QueryMiniProgramDetailResponse queryMiniProgramDetail(QueryMiniProgramDetailRequest request) throws YopClientException;
+
+    /**
+     * 付款码查询用户ID
+     *  
+     * @return QueryUseridResponse
+     * @throws YopClientException if fails to make API call
+     */
+    QueryUseridResponse queryUserid(QueryUseridRequest request) throws YopClientException;
+
+    /**
+     * 聚合支付交易查询
+     * 聚合支付支付结果查询接口
+     * @return QueryOrderV20Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    QueryOrderV20Response query_order_v2_0(QueryOrderV20Request request) throws YopClientException;
+
+    /**
+     * 付款码查询用户ID
+     *  
+     * @return QueryUseridV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    QueryUseridV10Response query_userid_v1_0(QueryUseridV10Request request) throws YopClientException;
+
+    /**
+     * 聚合资质提交
+     *  
+     * @return ReportAttachResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ReportAttachResponse reportAttach(ReportAttachRequest request) throws YopClientException;
+
+    /**
+     * 报备记录备份
+     *  
+     * @return ReportBackUpResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ReportBackUpResponse reportBackUp(ReportBackUpRequest request) throws YopClientException;
+
+    /**
+     * 查询渠道报备信息
+     *  
+     * @return ReportQueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ReportQueryResponse reportQuery(ReportQueryRequest request) throws YopClientException;
+
+    /**
+     * 新挂靠主备报备查询记录
+     *  
+     * @return ReportQueryAllResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ReportQueryAllResponse reportQueryAll(ReportQueryAllRequest request) throws YopClientException;
+
+    /**
+     * 修改渠道报备信息
+     * 
+     * @return ReportUpdateResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ReportUpdateResponse reportUpdate(ReportUpdateRequest request) throws YopClientException;
+
+    /**
+     * 微信门店信息批量预录入
+     * 通过本API可提前预录入门店信息。对于已提前预录入门店信息的用户，在登录小程序进行门店认证授权流程时，会默认拉起展示预录入的门店信息，用户一键确认即可完成认证授权，减少用户操作成本，提升认证授权成功率
+     * @return RetailBatchCreateResponse
+     * @throws YopClientException if fails to make API call
+     */
+    RetailBatchCreateResponse retailBatchCreate(RetailBatchCreateRequest request) throws YopClientException;
+
+    /**
+     * 查询已授权门店信息
+     * 查询已完成门店认证授权用户的门店信息
+     * @return RetailGetInfoResponse
+     * @throws YopClientException if fails to make API call
+     */
+    RetailGetInfoResponse retailGetInfo(RetailGetInfoRequest request) throws YopClientException;
+
+    /**
+     * 生成支付宝吱口令
+     * 
+     * @return ShareTokenGenerateResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ShareTokenGenerateResponse shareTokenGenerate(ShareTokenGenerateRequest request) throws YopClientException;
+
+    /**
+     * 支付宝前置咨询
+     * 
+     * @return ShareTokenMarketQueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ShareTokenMarketQueryResponse shareTokenMarketQuery(ShareTokenMarketQueryRequest request) throws YopClientException;
+
+    /**
+     * 生成支付宝吱口令
+     * 
+     * @return ShareTokenGenerateV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    ShareTokenGenerateV10Response share_token_generate_v1_0(ShareTokenGenerateV10Request request) throws YopClientException;
+
+    /**
+     * 支付宝前置咨询
+     * 
+     * @return ShareTokenMarketQueryV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    ShareTokenMarketQueryV10Response share_token_market_query_v1_0(ShareTokenMarketQueryV10Request request) throws YopClientException;
+
+    /**
+     * 签约
+     *  
+     * @return SignResponse
+     * @throws YopClientException if fails to make API call
+     */
+    SignResponse sign(SignRequest request) throws YopClientException;
+
+    /**
+     * 签约查询
+     * 
+     * @return SignQueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    SignQueryResponse signQuery(SignQueryRequest request) throws YopClientException;
+
+    /**
+     * 签约查询
+     * 
+     * @return SignQueryV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    SignQueryV10Response sign_query_v1_0(SignQueryV10Request request) throws YopClientException;
+
+    /**
+     * 签约
+     *  
+     * @return SignV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    SignV10Response sign_v1_0(SignV10Request request) throws YopClientException;
+
+    /**
+     * 聚合支付托管下单
+     *  
+     * @return TutelagePrePayResponse
+     * @throws YopClientException if fails to make API call
+     */
+    TutelagePrePayResponse tutelagePrePay(TutelagePrePayRequest request) throws YopClientException;
+
+    /**
+     * 聚合支付托管下单
+     *  
+     * @return TutelagePrePayV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    TutelagePrePayV10Response tutelage_pre_pay_v1_0(TutelagePrePayV10Request request) throws YopClientException;
+
+    /**
+     * 聚合支付统一下单
+     *  
+     * @return UnifiedOrderV2Response
+     * @throws YopClientException if fails to make API call
+     */
+    UnifiedOrderV2Response unifiedOrderV2(UnifiedOrderV2Request request) throws YopClientException;
+
+    /**
+     * 聚合支付统一下单
+     *  
+     * @return UnifiedOrderV20Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    UnifiedOrderV20Response unified_order_v2_0(UnifiedOrderV20Request request) throws YopClientException;
+
+    /**
+     * 解约
+     * 
+     * @return UnsignResponse
+     * @throws YopClientException if fails to make API call
+     */
+    UnsignResponse unsign(UnsignRequest request) throws YopClientException;
+
+    /**
+     * 解约
+     * 
+     * @return UnsignV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    UnsignV10Response unsign_v1_0(UnsignV10Request request) throws YopClientException;
+
+    /**
+     * 修改渠道结算账户
+     * 支持修改渠道（例如微信）的结算账户，仅支持修改为同名结算卡，修改结果请调用【查询渠道结算账户修改结果】接口进行查询
+     * @return UpdateAccountInfoResponse
+     * @throws YopClientException if fails to make API call
+     */
+    UpdateAccountInfoResponse updateAccountInfo(UpdateAccountInfoRequest request) throws YopClientException;
+
+    /**
+     * 更新退款审核结果
+     * 针对“申请退款单”，需要商户明确返回是否可退款的审批结果。
+     * @return UpdateRefundProgressResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    UpdateRefundProgressResponse updateRefundProgress(UpdateRefundProgressRequest request) throws YopClientException;
+
+    /**
+     * 上传电子小票信息
+     *  
+     * @return UploadElectronicReceiptResponse
+     * @throws YopClientException if fails to make API call
+     */
+    UploadElectronicReceiptResponse uploadElectronicReceipt(UploadElectronicReceiptRequest request) throws YopClientException;
+
+    /**
+     * 上传电子小票信息
+     *  
+     * @return UploadElectronicReceiptV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    UploadElectronicReceiptV10Response upload_electronic_receipt_v1_0(UploadElectronicReceiptV10Request request) throws YopClientException;
+
+    /**
+     * 微信违规查询接口(服务商/平台商版)
+     * 查询商户在微信的违规信息(根据渠道号查询)
+     * @return ViolationWechatChannelResponse
+     * @throws YopClientException if fails to make API call
+     */
+    ViolationWechatChannelResponse violationWechatChannel(ViolationWechatChannelRequest request) throws YopClientException;
+
+    /**
+     * 微信违规查询接口(服务商/平台商版)
+     * 查询商户在微信的违规信息(根据渠道号查询)
+     * @return ViolationWechatChannelV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    ViolationWechatChannelV10Response violation_wechat_channel_v1_0(ViolationWechatChannelV10Request request) throws YopClientException;
+
+    /**
+     * 商家回应/申诉小程序投诉
+     * 当用户投诉入口为易宝小程序时，可调用此接口进行回应，或进行申诉
+     * @return WechatComplaintFeedbackResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    WechatComplaintFeedbackResponse wechatComplaintFeedback(WechatComplaintFeedbackRequest request) throws YopClientException;
+
+    /**
+     * 公众号配置接口
+     * 
+     * @return WechatConfigAddResponse
+     * @throws YopClientException if fails to make API call
+     */
+    WechatConfigAddResponse wechatConfigAdd(WechatConfigAddRequest request) throws YopClientException;
+
+    /**
+     * 公众号配置接口（同步）
+     * 公众号同步配置接口
+     * @return WechatConfigAddSyncResponse
+     * @throws YopClientException if fails to make API call
+     */
+    WechatConfigAddSyncResponse wechatConfigAddSync(WechatConfigAddSyncRequest request) throws YopClientException;
+
+    /**
+     * 公众号配置接口（异步）
+     * 
+     * @return WechatConfigAddV2Response
+     * @throws YopClientException if fails to make API call
+     */
+    WechatConfigAddV2Response wechatConfigAddV2(WechatConfigAddV2Request request) throws YopClientException;
+
+    /**
+     * 公众号配置查询
+     * 
+     * @return WechatConfigQueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    WechatConfigQueryResponse wechatConfigQuery(WechatConfigQueryRequest request) throws YopClientException;
+
+    /**
+     * 公众号配置查询
+     * 
+     * @return WechatConfigQueryV2Response
+     * @throws YopClientException if fails to make API call
+     */
+    WechatConfigQueryV2Response wechatConfigQueryV2(WechatConfigQueryV2Request request) throws YopClientException;
+
+    /**
+     * 微信处置查询接口
+     *  
+     * @return WechatDisposalQueryResponse
+     * @throws YopClientException if fails to make API call
+     */
+    WechatDisposalQueryResponse wechatDisposalQuery(WechatDisposalQueryRequest request) throws YopClientException;
+
+    /**
+     * 公众号配置接口（同步）
+     * 公众号同步配置接口
+     * @return WechatConfigAddSyncV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    WechatConfigAddSyncV10Response wechat_config_add_sync_v1_0(WechatConfigAddSyncV10Request request) throws YopClientException;
+
+    /**
+     * 公众号配置接口
+     * 
+     * @return WechatConfigAddV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    WechatConfigAddV10Response wechat_config_add_v1_0(WechatConfigAddV10Request request) throws YopClientException;
+
+    /**
+     * 公众号配置接口（异步）
+     * 
+     * @return WechatConfigAddV20Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    WechatConfigAddV20Response wechat_config_add_v2_0(WechatConfigAddV20Request request) throws YopClientException;
+
+    /**
+     * 公众号配置查询
+     * 
+     * @return WechatConfigQueryV10Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    WechatConfigQueryV10Response wechat_config_query_v1_0(WechatConfigQueryV10Request request) throws YopClientException;
+
+    /**
+     * 公众号配置查询
+     * 
+     * @return WechatConfigQueryV20Response
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    WechatConfigQueryV20Response wechat_config_query_v2_0(WechatConfigQueryV20Request request) throws YopClientException;
+
+    /**
+     * 获取企微支付链接接口
+     *  
+     * @return WecomPayLinkResponse
+     * @throws YopClientException if fails to make API call
+     */
+    WecomPayLinkResponse wecomPayLink(WecomPayLinkRequest request) throws YopClientException;
+
+    /**
+     * 获取企微支付链接接口
+     *  
+     * @return WecomPayLinkResponse
+     * @throws YopClientException if fails to make API call
+     */
+    @Deprecated
+    WecomPayLinkResponse wecom_pay_link(WecomPayLinkRequest request) throws YopClientException;
+
+
+    /**
+     * Shuts down this client object, releasing any resources that might be held open. This is an optional method, and
+     * callers are not expected to call it, but can if they want to explicitly release any open resources. Once a client
+     * has been shutdown, it should not be used to make any more requests.
+     */
+    void shutdown();
+}

fs-service/src/main/java/com/fs/ybPay/aggpay/AggpayClientBuilder.java

@@ -0,0 +1,166 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package com.fs.ybPay.aggpay;
+
+
+import com.yeepay.yop.sdk.auth.req.AuthorizationReqRegistry;
+import com.yeepay.yop.sdk.auth.req.DefaultAuthorizationReqRegistry;
+import com.yeepay.yop.sdk.client.AbstractServiceClientBuilder;
+import com.yeepay.yop.sdk.client.ClientParams;
+
+public class AggpayClientBuilder extends AbstractServiceClientBuilder<AggpayClientBuilder, AggpayClientImpl>{
+
+    private static final AuthorizationReqRegistry REGISTRY;
+
+    static {
+        REGISTRY = new DefaultAuthorizationReqRegistry();
+        REGISTRY.register("activityQuery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("activityRequest", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_attach_report_query_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_attach_report_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_close_order_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_hbfq_award_receive_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_hbfq_marketing_consult_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_report_back_up_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_report_query_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_report_update_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_retail_batch_create_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_retail_get_info_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("agg_wechat_disposal_query_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("applyChannelNo", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("attachAdd", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("attachQuery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("attachRelieve", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("attachReport", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("closeOrder", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("closeOrderV2", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("close_order_v2_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaintUpdaterefundprogress", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaintWechatDetails", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaintWechatDownloadPic", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaintWechatFeedback", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaintWechatList", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaintWechatNegotiationHistory", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaintWechatSuccess", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaint_wechat_details_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaint_wechat_download_pic_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaint_wechat_feedback_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaint_wechat_list_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaint_wechat_negotiation_history_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("complaint_wechat_success_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditScoreAuthorization", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditScoreAuthorizationQuery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditScoreCancel", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditScoreCreate", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditScoreModify", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditScorePay", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditScoreQuery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditScoreSync", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditScoreUnAuthorization", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditScorecomplete", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditscoreAuthorization", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditscoreAuthorizationquery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditscoreCancel", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditscoreComplete", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditscoreCreate", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditscoreModify", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditscorePay", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditscoreQuery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditscoreSync", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("creditscoreUnauthorization", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("entryReapply", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("entry_reapply", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("getAuthInfo", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("getUserId", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("get_auth_info_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("hbfqAwardReceive", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("hbfqMarketingConsult", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("miniprogramDetails", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("miniprogramFeedback", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("miniprogramNegotiationHistory", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("orderQueryV2", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("pay", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("payLink", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("pay_link_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("pay_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("prePay", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("pre_pay_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("queryAccountInfo", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("queryAccountUpdateResult", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("queryApplyChannelNo", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("queryComplaintNegotiationHistory", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("queryMiniProgramDetail", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("queryUserid", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("query_order_v2_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("query_userid_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("reportAttach", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("reportBackUp", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("reportQuery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("reportQueryAll", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("reportUpdate", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("retailBatchCreate", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("retailGetInfo", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("shareTokenGenerate", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("shareTokenMarketQuery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("share_token_generate_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("share_token_market_query_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("sign", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("signQuery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("sign_query_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("sign_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("tutelagePrePay", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("tutelage_pre_pay_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("unifiedOrderV2", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("unified_order_v2_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("unsign", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("unsign_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("updateAccountInfo", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("updateRefundProgress", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("uploadElectronicReceipt", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("upload_electronic_receipt_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("violationWechatChannel", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("violation_wechat_channel_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechatComplaintFeedback", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechatConfigAdd", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechatConfigAddSync", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechatConfigAddV2", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechatConfigQuery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechatConfigQueryV2", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechatDisposalQuery", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechat_config_add_sync_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechat_config_add_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechat_config_add_v2_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechat_config_query_v1_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wechat_config_query_v2_0", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wecomPayLink", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+        REGISTRY.register("wecom_pay_link", "YOP-SM2-SM3,YOP-RSA2048-SHA256");
+    }
+
+    @Override
+    protected AuthorizationReqRegistry authorizationReqRegistry() {
+        return REGISTRY;
+    }
+
+    @Override
+    protected AggpayClientImpl build(ClientParams params) {
+        return new AggpayClientImpl(params);
+    }
+
+    /**
+     * @return Create new instance of builder with all defaults set.
+     */
+    public static AggpayClientBuilder builder(){
+        return new AggpayClientBuilder();
+    }
+
+}

fs-service/src/main/java/com/fs/ybPay/aggpay/AggpayClientImpl.java

@@ -0,0 +1,1846 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package com.fs.ybPay.aggpay;
+
+import com.fs.ybPay.aggpay.request.*;
+import com.fs.ybPay.aggpay.request.old.*;
+import com.fs.ybPay.aggpay.response.ActivityQueryResponse;
+import com.fs.ybPay.aggpay.response.ActivityRequestResponse;
+import com.fs.ybPay.aggpay.response.AggAttachReportQueryV10Response;
+import com.fs.ybPay.aggpay.response.old.CreditScoreAuthorizationQueryResponse;
+import com.fs.ybPay.aggpay.response.old.CreditScoreAuthorizationResponse;
+import com.fs.ybPay.aggpay.response.old.CreditScoreCancelResponse;
+import com.yeepay.yop.sdk.client.*;
+import com.yeepay.yop.sdk.exception.YopClientException;
+import com.yeepay.yop.sdk.http.HttpResponseAnalyzerSupport;
+import com.yeepay.yop.sdk.http.HttpResponseHandler;
+import com.yeepay.yop.sdk.http.handler.DefaultHttpResponseHandler;
+import com.yeepay.yop.sdk.model.transform.RequestMarshaller;
+import com.fs.ybPay.aggpay.response.*;
+import com.fs.ybPay.aggpay.response.old.*;
+
+public class AggpayClientImpl implements AggpayClient {
+
+    private final ClientHandler clientHandler;
+
+    AggpayClientImpl(ClientParams clientParams) {
+        this.clientHandler = new ClientHandlerImpl(new ClientHandlerParams().withClientParams(clientParams));
+    }
+
+    @Override
+    public ActivityQueryResponse activityQuery(ActivityQueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ActivityQueryRequest> requestMarshaller = ActivityQueryRequestMarshaller.getInstance();
+        HttpResponseHandler<ActivityQueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<ActivityQueryResponse>(ActivityQueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ActivityQueryRequest, ActivityQueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ActivityRequestResponse activityRequest(ActivityRequestRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ActivityRequestRequest> requestMarshaller = ActivityRequestRequestMarshaller.getInstance();
+        HttpResponseHandler<ActivityRequestResponse> responseHandler =
+                new DefaultHttpResponseHandler<ActivityRequestResponse>(ActivityRequestResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ActivityRequestRequest, ActivityRequestResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggAttachReportQueryV10Response agg_attach_report_query_v1_0(AggAttachReportQueryV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggAttachReportQueryV10Request> requestMarshaller = AggAttachReportQueryV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggAttachReportQueryV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggAttachReportQueryV10Response>(AggAttachReportQueryV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggAttachReportQueryV10Request, AggAttachReportQueryV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggAttachReportV10Response agg_attach_report_v1_0(AggAttachReportV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggAttachReportV10Request> requestMarshaller = AggAttachReportV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggAttachReportV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggAttachReportV10Response>(AggAttachReportV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggAttachReportV10Request, AggAttachReportV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggCloseOrderV10Response agg_close_order_v1_0(AggCloseOrderV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggCloseOrderV10Request> requestMarshaller = AggCloseOrderV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggCloseOrderV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggCloseOrderV10Response>(AggCloseOrderV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggCloseOrderV10Request, AggCloseOrderV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggHbfqAwardReceiveV10Response agg_hbfq_award_receive_v1_0(AggHbfqAwardReceiveV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggHbfqAwardReceiveV10Request> requestMarshaller = AggHbfqAwardReceiveV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggHbfqAwardReceiveV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggHbfqAwardReceiveV10Response>(AggHbfqAwardReceiveV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggHbfqAwardReceiveV10Request, AggHbfqAwardReceiveV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggHbfqMarketingConsultV10Response agg_hbfq_marketing_consult_v1_0(AggHbfqMarketingConsultV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggHbfqMarketingConsultV10Request> requestMarshaller = AggHbfqMarketingConsultV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggHbfqMarketingConsultV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggHbfqMarketingConsultV10Response>(AggHbfqMarketingConsultV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggHbfqMarketingConsultV10Request, AggHbfqMarketingConsultV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggReportBackUpV10Response agg_report_back_up_v1_0(AggReportBackUpV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggReportBackUpV10Request> requestMarshaller = AggReportBackUpV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggReportBackUpV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggReportBackUpV10Response>(AggReportBackUpV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggReportBackUpV10Request, AggReportBackUpV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggReportQueryV10Response agg_report_query_v1_0(AggReportQueryV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggReportQueryV10Request> requestMarshaller = AggReportQueryV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggReportQueryV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggReportQueryV10Response>(AggReportQueryV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggReportQueryV10Request, AggReportQueryV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggReportUpdateV10Response agg_report_update_v1_0(AggReportUpdateV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggReportUpdateV10Request> requestMarshaller = AggReportUpdateV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggReportUpdateV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggReportUpdateV10Response>(AggReportUpdateV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggReportUpdateV10Request, AggReportUpdateV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggRetailBatchCreateV10Response agg_retail_batch_create_v1_0(AggRetailBatchCreateV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggRetailBatchCreateV10Request> requestMarshaller = AggRetailBatchCreateV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggRetailBatchCreateV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggRetailBatchCreateV10Response>(AggRetailBatchCreateV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggRetailBatchCreateV10Request, AggRetailBatchCreateV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggRetailGetInfoV10Response agg_retail_get_info_v1_0(AggRetailGetInfoV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggRetailGetInfoV10Request> requestMarshaller = AggRetailGetInfoV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggRetailGetInfoV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggRetailGetInfoV10Response>(AggRetailGetInfoV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggRetailGetInfoV10Request, AggRetailGetInfoV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AggWechatDisposalQueryV10Response agg_wechat_disposal_query_v1_0(AggWechatDisposalQueryV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AggWechatDisposalQueryV10Request> requestMarshaller = AggWechatDisposalQueryV10RequestMarshaller.getInstance();
+        HttpResponseHandler<AggWechatDisposalQueryV10Response> responseHandler =
+                new DefaultHttpResponseHandler<AggWechatDisposalQueryV10Response>(AggWechatDisposalQueryV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AggWechatDisposalQueryV10Request, AggWechatDisposalQueryV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ApplyChannelNoResponse applyChannelNo(ApplyChannelNoRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ApplyChannelNoRequest> requestMarshaller = ApplyChannelNoRequestMarshaller.getInstance();
+        HttpResponseHandler<ApplyChannelNoResponse> responseHandler =
+                new DefaultHttpResponseHandler<ApplyChannelNoResponse>(ApplyChannelNoResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ApplyChannelNoRequest, ApplyChannelNoResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AttachAddResponse attachAdd(AttachAddRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AttachAddRequest> requestMarshaller = AttachAddRequestMarshaller.getInstance();
+        HttpResponseHandler<AttachAddResponse> responseHandler =
+                new DefaultHttpResponseHandler<AttachAddResponse>(AttachAddResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AttachAddRequest, AttachAddResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AttachQueryResponse attachQuery(AttachQueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AttachQueryRequest> requestMarshaller = AttachQueryRequestMarshaller.getInstance();
+        HttpResponseHandler<AttachQueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<AttachQueryResponse>(AttachQueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AttachQueryRequest, AttachQueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AttachRelieveResponse attachRelieve(AttachRelieveRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AttachRelieveRequest> requestMarshaller = AttachRelieveRequestMarshaller.getInstance();
+        HttpResponseHandler<AttachRelieveResponse> responseHandler =
+                new DefaultHttpResponseHandler<AttachRelieveResponse>(AttachRelieveResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AttachRelieveRequest, AttachRelieveResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public AttachReportResponse attachReport(AttachReportRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<AttachReportRequest> requestMarshaller = AttachReportRequestMarshaller.getInstance();
+        HttpResponseHandler<AttachReportResponse> responseHandler =
+                new DefaultHttpResponseHandler<AttachReportResponse>(AttachReportResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<AttachReportRequest, AttachReportResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CloseOrderResponse closeOrder(CloseOrderRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CloseOrderRequest> requestMarshaller = CloseOrderRequestMarshaller.getInstance();
+        HttpResponseHandler<CloseOrderResponse> responseHandler =
+                new DefaultHttpResponseHandler<CloseOrderResponse>(CloseOrderResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CloseOrderRequest, CloseOrderResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CloseOrderV2Response closeOrderV2(CloseOrderV2Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CloseOrderV2Request> requestMarshaller = CloseOrderV2RequestMarshaller.getInstance();
+        HttpResponseHandler<CloseOrderV2Response> responseHandler =
+                new DefaultHttpResponseHandler<CloseOrderV2Response>(CloseOrderV2Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CloseOrderV2Request, CloseOrderV2Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CloseOrderV20Response close_order_v2_0(CloseOrderV20Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CloseOrderV20Request> requestMarshaller = CloseOrderV20RequestMarshaller.getInstance();
+        HttpResponseHandler<CloseOrderV20Response> responseHandler =
+                new DefaultHttpResponseHandler<CloseOrderV20Response>(CloseOrderV20Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CloseOrderV20Request, CloseOrderV20Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintUpdaterefundprogressResponse complaintUpdaterefundprogress(ComplaintUpdaterefundprogressRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintUpdaterefundprogressRequest> requestMarshaller = ComplaintUpdaterefundprogressRequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintUpdaterefundprogressResponse> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintUpdaterefundprogressResponse>(ComplaintUpdaterefundprogressResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintUpdaterefundprogressRequest, ComplaintUpdaterefundprogressResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatDetailsResponse complaintWechatDetails(ComplaintWechatDetailsRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatDetailsRequest> requestMarshaller = ComplaintWechatDetailsRequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatDetailsResponse> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatDetailsResponse>(ComplaintWechatDetailsResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatDetailsRequest, ComplaintWechatDetailsResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatDownloadPicResponse complaintWechatDownloadPic(ComplaintWechatDownloadPicRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatDownloadPicRequest> requestMarshaller = ComplaintWechatDownloadPicRequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatDownloadPicResponse> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatDownloadPicResponse>(ComplaintWechatDownloadPicResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatDownloadPicRequest, ComplaintWechatDownloadPicResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatFeedbackResponse complaintWechatFeedback(ComplaintWechatFeedbackRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatFeedbackRequest> requestMarshaller = ComplaintWechatFeedbackRequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatFeedbackResponse> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatFeedbackResponse>(ComplaintWechatFeedbackResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatFeedbackRequest, ComplaintWechatFeedbackResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatListResponse complaintWechatList(ComplaintWechatListRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatListRequest> requestMarshaller = ComplaintWechatListRequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatListResponse> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatListResponse>(ComplaintWechatListResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatListRequest, ComplaintWechatListResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatNegotiationHistoryResponse complaintWechatNegotiationHistory(ComplaintWechatNegotiationHistoryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatNegotiationHistoryRequest> requestMarshaller = ComplaintWechatNegotiationHistoryRequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatNegotiationHistoryResponse> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatNegotiationHistoryResponse>(ComplaintWechatNegotiationHistoryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatNegotiationHistoryRequest, ComplaintWechatNegotiationHistoryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatSuccessResponse complaintWechatSuccess(ComplaintWechatSuccessRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatSuccessRequest> requestMarshaller = ComplaintWechatSuccessRequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatSuccessResponse> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatSuccessResponse>(ComplaintWechatSuccessResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatSuccessRequest, ComplaintWechatSuccessResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatDetailsV10Response complaint_wechat_details_v1_0(ComplaintWechatDetailsV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatDetailsV10Request> requestMarshaller = ComplaintWechatDetailsV10RequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatDetailsV10Response> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatDetailsV10Response>(ComplaintWechatDetailsV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatDetailsV10Request, ComplaintWechatDetailsV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatDownloadPicV10Response complaint_wechat_download_pic_v1_0(ComplaintWechatDownloadPicV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatDownloadPicV10Request> requestMarshaller = ComplaintWechatDownloadPicV10RequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatDownloadPicV10Response> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatDownloadPicV10Response>(ComplaintWechatDownloadPicV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatDownloadPicV10Request, ComplaintWechatDownloadPicV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatFeedbackV10Response complaint_wechat_feedback_v1_0(ComplaintWechatFeedbackV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatFeedbackV10Request> requestMarshaller = ComplaintWechatFeedbackV10RequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatFeedbackV10Response> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatFeedbackV10Response>(ComplaintWechatFeedbackV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatFeedbackV10Request, ComplaintWechatFeedbackV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatListV10Response complaint_wechat_list_v1_0(ComplaintWechatListV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatListV10Request> requestMarshaller = ComplaintWechatListV10RequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatListV10Response> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatListV10Response>(ComplaintWechatListV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatListV10Request, ComplaintWechatListV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatNegotiationHistoryV10Response complaint_wechat_negotiation_history_v1_0(ComplaintWechatNegotiationHistoryV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatNegotiationHistoryV10Request> requestMarshaller = ComplaintWechatNegotiationHistoryV10RequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatNegotiationHistoryV10Response> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatNegotiationHistoryV10Response>(ComplaintWechatNegotiationHistoryV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatNegotiationHistoryV10Request, ComplaintWechatNegotiationHistoryV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ComplaintWechatSuccessV10Response complaint_wechat_success_v1_0(ComplaintWechatSuccessV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ComplaintWechatSuccessV10Request> requestMarshaller = ComplaintWechatSuccessV10RequestMarshaller.getInstance();
+        HttpResponseHandler<ComplaintWechatSuccessV10Response> responseHandler =
+                new DefaultHttpResponseHandler<ComplaintWechatSuccessV10Response>(ComplaintWechatSuccessV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ComplaintWechatSuccessV10Request, ComplaintWechatSuccessV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditScoreAuthorizationResponse creditScoreAuthorization(CreditScoreAuthorizationRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditScoreAuthorizationRequest> requestMarshaller = CreditScoreAuthorizationRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditScoreAuthorizationResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditScoreAuthorizationResponse>(CreditScoreAuthorizationResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditScoreAuthorizationRequest, CreditScoreAuthorizationResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditScoreAuthorizationQueryResponse creditScoreAuthorizationQuery(CreditScoreAuthorizationQueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditScoreAuthorizationQueryRequest> requestMarshaller = CreditScoreAuthorizationQueryRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditScoreAuthorizationQueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditScoreAuthorizationQueryResponse>(CreditScoreAuthorizationQueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditScoreAuthorizationQueryRequest, CreditScoreAuthorizationQueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditScoreCancelResponse creditScoreCancel(CreditScoreCancelRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditScoreCancelRequest> requestMarshaller = CreditScoreCancelRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditScoreCancelResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditScoreCancelResponse>(CreditScoreCancelResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditScoreCancelRequest, CreditScoreCancelResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditScoreCreateResponse creditScoreCreate(CreditScoreCreateRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditScoreCreateRequest> requestMarshaller = CreditScoreCreateRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditScoreCreateResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditScoreCreateResponse>(CreditScoreCreateResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditScoreCreateRequest, CreditScoreCreateResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditScoreModifyResponse creditScoreModify(CreditScoreModifyRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditScoreModifyRequest> requestMarshaller = CreditScoreModifyRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditScoreModifyResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditScoreModifyResponse>(CreditScoreModifyResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditScoreModifyRequest, CreditScoreModifyResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditScorePayResponse creditScorePay(CreditScorePayRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditScorePayRequest> requestMarshaller = CreditScorePayRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditScorePayResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditScorePayResponse>(CreditScorePayResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditScorePayRequest, CreditScorePayResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditScoreQueryResponse creditScoreQuery(CreditScoreQueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditScoreQueryRequest> requestMarshaller = CreditScoreQueryRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditScoreQueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditScoreQueryResponse>(CreditScoreQueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditScoreQueryRequest, CreditScoreQueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditScoreSyncResponse creditScoreSync(CreditScoreSyncRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditScoreSyncRequest> requestMarshaller = CreditScoreSyncRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditScoreSyncResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditScoreSyncResponse>(CreditScoreSyncResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditScoreSyncRequest, CreditScoreSyncResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditScoreUnAuthorizationResponse creditScoreUnAuthorization(CreditScoreUnAuthorizationRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditScoreUnAuthorizationRequest> requestMarshaller = CreditScoreUnAuthorizationRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditScoreUnAuthorizationResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditScoreUnAuthorizationResponse>(CreditScoreUnAuthorizationResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditScoreUnAuthorizationRequest, CreditScoreUnAuthorizationResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditScorecompleteResponse creditScorecomplete(CreditScorecompleteRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditScorecompleteRequest> requestMarshaller = CreditScorecompleteRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditScorecompleteResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditScorecompleteResponse>(CreditScorecompleteResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditScorecompleteRequest, CreditScorecompleteResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditscoreAuthorizationResponse creditscoreAuthorization(CreditscoreAuthorizationRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditscoreAuthorizationRequest> requestMarshaller = CreditscoreAuthorizationRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditscoreAuthorizationResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditscoreAuthorizationResponse>(CreditscoreAuthorizationResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditscoreAuthorizationRequest, CreditscoreAuthorizationResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditscoreAuthorizationqueryResponse creditscoreAuthorizationquery(CreditscoreAuthorizationqueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditscoreAuthorizationqueryRequest> requestMarshaller = CreditscoreAuthorizationqueryRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditscoreAuthorizationqueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditscoreAuthorizationqueryResponse>(CreditscoreAuthorizationqueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditscoreAuthorizationqueryRequest, CreditscoreAuthorizationqueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditscoreCancelResponse creditscoreCancel(CreditscoreCancelRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditscoreCancelRequest> requestMarshaller = CreditscoreCancelRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditscoreCancelResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditscoreCancelResponse>(CreditscoreCancelResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditscoreCancelRequest, CreditscoreCancelResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditscoreCompleteResponse creditscoreComplete(CreditscoreCompleteRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditscoreCompleteRequest> requestMarshaller = CreditscoreCompleteRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditscoreCompleteResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditscoreCompleteResponse>(CreditscoreCompleteResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditscoreCompleteRequest, CreditscoreCompleteResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditscoreCreateResponse creditscoreCreate(CreditscoreCreateRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditscoreCreateRequest> requestMarshaller = CreditscoreCreateRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditscoreCreateResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditscoreCreateResponse>(CreditscoreCreateResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditscoreCreateRequest, CreditscoreCreateResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditscoreModifyResponse creditscoreModify(CreditscoreModifyRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditscoreModifyRequest> requestMarshaller = CreditscoreModifyRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditscoreModifyResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditscoreModifyResponse>(CreditscoreModifyResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditscoreModifyRequest, CreditscoreModifyResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditscorePayResponse creditscorePay(CreditscorePayRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditscorePayRequest> requestMarshaller = CreditscorePayRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditscorePayResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditscorePayResponse>(CreditscorePayResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditscorePayRequest, CreditscorePayResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditscoreQueryResponse creditscoreQuery(CreditscoreQueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditscoreQueryRequest> requestMarshaller = CreditscoreQueryRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditscoreQueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditscoreQueryResponse>(CreditscoreQueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditscoreQueryRequest, CreditscoreQueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditscoreSyncResponse creditscoreSync(CreditscoreSyncRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditscoreSyncRequest> requestMarshaller = CreditscoreSyncRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditscoreSyncResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditscoreSyncResponse>(CreditscoreSyncResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditscoreSyncRequest, CreditscoreSyncResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public CreditscoreUnauthorizationResponse creditscoreUnauthorization(CreditscoreUnauthorizationRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<CreditscoreUnauthorizationRequest> requestMarshaller = CreditscoreUnauthorizationRequestMarshaller.getInstance();
+        HttpResponseHandler<CreditscoreUnauthorizationResponse> responseHandler =
+                new DefaultHttpResponseHandler<CreditscoreUnauthorizationResponse>(CreditscoreUnauthorizationResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<CreditscoreUnauthorizationRequest, CreditscoreUnauthorizationResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public EntryReapplyResponse entryReapply(EntryReapplyRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<EntryReapplyRequest> requestMarshaller = EntryReapplyRequestMarshaller.getInstance();
+        HttpResponseHandler<EntryReapplyResponse> responseHandler =
+                new DefaultHttpResponseHandler<EntryReapplyResponse>(EntryReapplyResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<EntryReapplyRequest, EntryReapplyResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public EntryReapplyResponse entry_reapply(EntryReapplyRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<EntryReapplyRequest> requestMarshaller = EntryReapplyRequestMarshaller.getInstance();
+        HttpResponseHandler<EntryReapplyResponse> responseHandler =
+                new DefaultHttpResponseHandler<EntryReapplyResponse>(EntryReapplyResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<EntryReapplyRequest, EntryReapplyResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public GetAuthInfoResponse getAuthInfo(GetAuthInfoRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<GetAuthInfoRequest> requestMarshaller = GetAuthInfoRequestMarshaller.getInstance();
+        HttpResponseHandler<GetAuthInfoResponse> responseHandler =
+                new DefaultHttpResponseHandler<GetAuthInfoResponse>(GetAuthInfoResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<GetAuthInfoRequest, GetAuthInfoResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public GetUserIdResponse getUserId(GetUserIdRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<GetUserIdRequest> requestMarshaller = GetUserIdRequestMarshaller.getInstance();
+        HttpResponseHandler<GetUserIdResponse> responseHandler =
+                new DefaultHttpResponseHandler<GetUserIdResponse>(GetUserIdResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<GetUserIdRequest, GetUserIdResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public GetAuthInfoV10Response get_auth_info_v1_0(GetAuthInfoV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<GetAuthInfoV10Request> requestMarshaller = GetAuthInfoV10RequestMarshaller.getInstance();
+        HttpResponseHandler<GetAuthInfoV10Response> responseHandler =
+                new DefaultHttpResponseHandler<GetAuthInfoV10Response>(GetAuthInfoV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<GetAuthInfoV10Request, GetAuthInfoV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public HbfqAwardReceiveResponse hbfqAwardReceive(HbfqAwardReceiveRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<HbfqAwardReceiveRequest> requestMarshaller = HbfqAwardReceiveRequestMarshaller.getInstance();
+        HttpResponseHandler<HbfqAwardReceiveResponse> responseHandler =
+                new DefaultHttpResponseHandler<HbfqAwardReceiveResponse>(HbfqAwardReceiveResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<HbfqAwardReceiveRequest, HbfqAwardReceiveResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public HbfqMarketingConsultResponse hbfqMarketingConsult(HbfqMarketingConsultRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<HbfqMarketingConsultRequest> requestMarshaller = HbfqMarketingConsultRequestMarshaller.getInstance();
+        HttpResponseHandler<HbfqMarketingConsultResponse> responseHandler =
+                new DefaultHttpResponseHandler<HbfqMarketingConsultResponse>(HbfqMarketingConsultResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<HbfqMarketingConsultRequest, HbfqMarketingConsultResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public MiniprogramDetailsResponse miniprogramDetails(MiniprogramDetailsRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<MiniprogramDetailsRequest> requestMarshaller = MiniprogramDetailsRequestMarshaller.getInstance();
+        HttpResponseHandler<MiniprogramDetailsResponse> responseHandler =
+                new DefaultHttpResponseHandler<MiniprogramDetailsResponse>(MiniprogramDetailsResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<MiniprogramDetailsRequest, MiniprogramDetailsResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public MiniprogramFeedbackResponse miniprogramFeedback(MiniprogramFeedbackRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<MiniprogramFeedbackRequest> requestMarshaller = MiniprogramFeedbackRequestMarshaller.getInstance();
+        HttpResponseHandler<MiniprogramFeedbackResponse> responseHandler =
+                new DefaultHttpResponseHandler<MiniprogramFeedbackResponse>(MiniprogramFeedbackResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<MiniprogramFeedbackRequest, MiniprogramFeedbackResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public MiniprogramNegotiationHistoryResponse miniprogramNegotiationHistory(MiniprogramNegotiationHistoryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<MiniprogramNegotiationHistoryRequest> requestMarshaller = MiniprogramNegotiationHistoryRequestMarshaller.getInstance();
+        HttpResponseHandler<MiniprogramNegotiationHistoryResponse> responseHandler =
+                new DefaultHttpResponseHandler<MiniprogramNegotiationHistoryResponse>(MiniprogramNegotiationHistoryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<MiniprogramNegotiationHistoryRequest, MiniprogramNegotiationHistoryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public OrderQueryV2Response orderQueryV2(OrderQueryV2Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<OrderQueryV2Request> requestMarshaller = OrderQueryV2RequestMarshaller.getInstance();
+        HttpResponseHandler<OrderQueryV2Response> responseHandler =
+                new DefaultHttpResponseHandler<OrderQueryV2Response>(OrderQueryV2Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<OrderQueryV2Request, OrderQueryV2Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public PayResponse pay(PayRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<PayRequest> requestMarshaller = PayRequestMarshaller.getInstance();
+        HttpResponseHandler<PayResponse> responseHandler =
+                new DefaultHttpResponseHandler<PayResponse>(PayResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<PayRequest, PayResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public PayLinkResponse payLink(PayLinkRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<PayLinkRequest> requestMarshaller = PayLinkRequestMarshaller.getInstance();
+        HttpResponseHandler<PayLinkResponse> responseHandler =
+                new DefaultHttpResponseHandler<PayLinkResponse>(PayLinkResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<PayLinkRequest, PayLinkResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public PayLinkV10Response pay_link_v1_0(PayLinkV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<PayLinkV10Request> requestMarshaller = PayLinkV10RequestMarshaller.getInstance();
+        HttpResponseHandler<PayLinkV10Response> responseHandler =
+                new DefaultHttpResponseHandler<PayLinkV10Response>(PayLinkV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<PayLinkV10Request, PayLinkV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public PayV10Response pay_v1_0(PayV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<PayV10Request> requestMarshaller = PayV10RequestMarshaller.getInstance();
+        HttpResponseHandler<PayV10Response> responseHandler =
+                new DefaultHttpResponseHandler<PayV10Response>(PayV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<PayV10Request, PayV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public PrePayResponse prePay(PrePayRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<PrePayRequest> requestMarshaller = PrePayRequestMarshaller.getInstance();
+        HttpResponseHandler<PrePayResponse> responseHandler =
+                new DefaultHttpResponseHandler<PrePayResponse>(PrePayResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<PrePayRequest, PrePayResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public PrePayV10Response pre_pay_v1_0(PrePayV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<PrePayV10Request> requestMarshaller = PrePayV10RequestMarshaller.getInstance();
+        HttpResponseHandler<PrePayV10Response> responseHandler =
+                new DefaultHttpResponseHandler<PrePayV10Response>(PrePayV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<PrePayV10Request, PrePayV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public QueryAccountInfoResponse queryAccountInfo(QueryAccountInfoRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<QueryAccountInfoRequest> requestMarshaller = QueryAccountInfoRequestMarshaller.getInstance();
+        HttpResponseHandler<QueryAccountInfoResponse> responseHandler =
+                new DefaultHttpResponseHandler<QueryAccountInfoResponse>(QueryAccountInfoResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<QueryAccountInfoRequest, QueryAccountInfoResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public QueryAccountUpdateResultResponse queryAccountUpdateResult(QueryAccountUpdateResultRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<QueryAccountUpdateResultRequest> requestMarshaller = QueryAccountUpdateResultRequestMarshaller.getInstance();
+        HttpResponseHandler<QueryAccountUpdateResultResponse> responseHandler =
+                new DefaultHttpResponseHandler<QueryAccountUpdateResultResponse>(QueryAccountUpdateResultResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<QueryAccountUpdateResultRequest, QueryAccountUpdateResultResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public QueryApplyChannelNoResponse queryApplyChannelNo(QueryApplyChannelNoRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<QueryApplyChannelNoRequest> requestMarshaller = QueryApplyChannelNoRequestMarshaller.getInstance();
+        HttpResponseHandler<QueryApplyChannelNoResponse> responseHandler =
+                new DefaultHttpResponseHandler<QueryApplyChannelNoResponse>(QueryApplyChannelNoResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<QueryApplyChannelNoRequest, QueryApplyChannelNoResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public QueryComplaintNegotiationHistoryResponse queryComplaintNegotiationHistory(QueryComplaintNegotiationHistoryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<QueryComplaintNegotiationHistoryRequest> requestMarshaller = QueryComplaintNegotiationHistoryRequestMarshaller.getInstance();
+        HttpResponseHandler<QueryComplaintNegotiationHistoryResponse> responseHandler =
+                new DefaultHttpResponseHandler<QueryComplaintNegotiationHistoryResponse>(QueryComplaintNegotiationHistoryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<QueryComplaintNegotiationHistoryRequest, QueryComplaintNegotiationHistoryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public QueryMiniProgramDetailResponse queryMiniProgramDetail(QueryMiniProgramDetailRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<QueryMiniProgramDetailRequest> requestMarshaller = QueryMiniProgramDetailRequestMarshaller.getInstance();
+        HttpResponseHandler<QueryMiniProgramDetailResponse> responseHandler =
+                new DefaultHttpResponseHandler<QueryMiniProgramDetailResponse>(QueryMiniProgramDetailResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<QueryMiniProgramDetailRequest, QueryMiniProgramDetailResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public QueryUseridResponse queryUserid(QueryUseridRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<QueryUseridRequest> requestMarshaller = QueryUseridRequestMarshaller.getInstance();
+        HttpResponseHandler<QueryUseridResponse> responseHandler =
+                new DefaultHttpResponseHandler<QueryUseridResponse>(QueryUseridResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<QueryUseridRequest, QueryUseridResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public QueryOrderV20Response query_order_v2_0(QueryOrderV20Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<QueryOrderV20Request> requestMarshaller = QueryOrderV20RequestMarshaller.getInstance();
+        HttpResponseHandler<QueryOrderV20Response> responseHandler =
+                new DefaultHttpResponseHandler<QueryOrderV20Response>(QueryOrderV20Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<QueryOrderV20Request, QueryOrderV20Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public QueryUseridV10Response query_userid_v1_0(QueryUseridV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<QueryUseridV10Request> requestMarshaller = QueryUseridV10RequestMarshaller.getInstance();
+        HttpResponseHandler<QueryUseridV10Response> responseHandler =
+                new DefaultHttpResponseHandler<QueryUseridV10Response>(QueryUseridV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<QueryUseridV10Request, QueryUseridV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ReportAttachResponse reportAttach(ReportAttachRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ReportAttachRequest> requestMarshaller = ReportAttachRequestMarshaller.getInstance();
+        HttpResponseHandler<ReportAttachResponse> responseHandler =
+                new DefaultHttpResponseHandler<ReportAttachResponse>(ReportAttachResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ReportAttachRequest, ReportAttachResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ReportBackUpResponse reportBackUp(ReportBackUpRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ReportBackUpRequest> requestMarshaller = ReportBackUpRequestMarshaller.getInstance();
+        HttpResponseHandler<ReportBackUpResponse> responseHandler =
+                new DefaultHttpResponseHandler<ReportBackUpResponse>(ReportBackUpResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ReportBackUpRequest, ReportBackUpResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ReportQueryResponse reportQuery(ReportQueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ReportQueryRequest> requestMarshaller = ReportQueryRequestMarshaller.getInstance();
+        HttpResponseHandler<ReportQueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<ReportQueryResponse>(ReportQueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ReportQueryRequest, ReportQueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ReportQueryAllResponse reportQueryAll(ReportQueryAllRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ReportQueryAllRequest> requestMarshaller = ReportQueryAllRequestMarshaller.getInstance();
+        HttpResponseHandler<ReportQueryAllResponse> responseHandler =
+                new DefaultHttpResponseHandler<ReportQueryAllResponse>(ReportQueryAllResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ReportQueryAllRequest, ReportQueryAllResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ReportUpdateResponse reportUpdate(ReportUpdateRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ReportUpdateRequest> requestMarshaller = ReportUpdateRequestMarshaller.getInstance();
+        HttpResponseHandler<ReportUpdateResponse> responseHandler =
+                new DefaultHttpResponseHandler<ReportUpdateResponse>(ReportUpdateResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ReportUpdateRequest, ReportUpdateResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public RetailBatchCreateResponse retailBatchCreate(RetailBatchCreateRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<RetailBatchCreateRequest> requestMarshaller = RetailBatchCreateRequestMarshaller.getInstance();
+        HttpResponseHandler<RetailBatchCreateResponse> responseHandler =
+                new DefaultHttpResponseHandler<RetailBatchCreateResponse>(RetailBatchCreateResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<RetailBatchCreateRequest, RetailBatchCreateResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public RetailGetInfoResponse retailGetInfo(RetailGetInfoRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<RetailGetInfoRequest> requestMarshaller = RetailGetInfoRequestMarshaller.getInstance();
+        HttpResponseHandler<RetailGetInfoResponse> responseHandler =
+                new DefaultHttpResponseHandler<RetailGetInfoResponse>(RetailGetInfoResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<RetailGetInfoRequest, RetailGetInfoResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ShareTokenGenerateResponse shareTokenGenerate(ShareTokenGenerateRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ShareTokenGenerateRequest> requestMarshaller = ShareTokenGenerateRequestMarshaller.getInstance();
+        HttpResponseHandler<ShareTokenGenerateResponse> responseHandler =
+                new DefaultHttpResponseHandler<ShareTokenGenerateResponse>(ShareTokenGenerateResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ShareTokenGenerateRequest, ShareTokenGenerateResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ShareTokenMarketQueryResponse shareTokenMarketQuery(ShareTokenMarketQueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ShareTokenMarketQueryRequest> requestMarshaller = ShareTokenMarketQueryRequestMarshaller.getInstance();
+        HttpResponseHandler<ShareTokenMarketQueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<ShareTokenMarketQueryResponse>(ShareTokenMarketQueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ShareTokenMarketQueryRequest, ShareTokenMarketQueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ShareTokenGenerateV10Response share_token_generate_v1_0(ShareTokenGenerateV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ShareTokenGenerateV10Request> requestMarshaller = ShareTokenGenerateV10RequestMarshaller.getInstance();
+        HttpResponseHandler<ShareTokenGenerateV10Response> responseHandler =
+                new DefaultHttpResponseHandler<ShareTokenGenerateV10Response>(ShareTokenGenerateV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ShareTokenGenerateV10Request, ShareTokenGenerateV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ShareTokenMarketQueryV10Response share_token_market_query_v1_0(ShareTokenMarketQueryV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ShareTokenMarketQueryV10Request> requestMarshaller = ShareTokenMarketQueryV10RequestMarshaller.getInstance();
+        HttpResponseHandler<ShareTokenMarketQueryV10Response> responseHandler =
+                new DefaultHttpResponseHandler<ShareTokenMarketQueryV10Response>(ShareTokenMarketQueryV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ShareTokenMarketQueryV10Request, ShareTokenMarketQueryV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public SignResponse sign(SignRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<SignRequest> requestMarshaller = SignRequestMarshaller.getInstance();
+        HttpResponseHandler<SignResponse> responseHandler =
+                new DefaultHttpResponseHandler<SignResponse>(SignResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<SignRequest, SignResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public SignQueryResponse signQuery(SignQueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<SignQueryRequest> requestMarshaller = SignQueryRequestMarshaller.getInstance();
+        HttpResponseHandler<SignQueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<SignQueryResponse>(SignQueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<SignQueryRequest, SignQueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public SignQueryV10Response sign_query_v1_0(SignQueryV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<SignQueryV10Request> requestMarshaller = SignQueryV10RequestMarshaller.getInstance();
+        HttpResponseHandler<SignQueryV10Response> responseHandler =
+                new DefaultHttpResponseHandler<SignQueryV10Response>(SignQueryV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<SignQueryV10Request, SignQueryV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public SignV10Response sign_v1_0(SignV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<SignV10Request> requestMarshaller = SignV10RequestMarshaller.getInstance();
+        HttpResponseHandler<SignV10Response> responseHandler =
+                new DefaultHttpResponseHandler<SignV10Response>(SignV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<SignV10Request, SignV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public TutelagePrePayResponse tutelagePrePay(TutelagePrePayRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<TutelagePrePayRequest> requestMarshaller = TutelagePrePayRequestMarshaller.getInstance();
+        HttpResponseHandler<TutelagePrePayResponse> responseHandler =
+                new DefaultHttpResponseHandler<TutelagePrePayResponse>(TutelagePrePayResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<TutelagePrePayRequest, TutelagePrePayResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public TutelagePrePayV10Response tutelage_pre_pay_v1_0(TutelagePrePayV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<TutelagePrePayV10Request> requestMarshaller = TutelagePrePayV10RequestMarshaller.getInstance();
+        HttpResponseHandler<TutelagePrePayV10Response> responseHandler =
+                new DefaultHttpResponseHandler<TutelagePrePayV10Response>(TutelagePrePayV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<TutelagePrePayV10Request, TutelagePrePayV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public UnifiedOrderV2Response unifiedOrderV2(UnifiedOrderV2Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<UnifiedOrderV2Request> requestMarshaller = UnifiedOrderV2RequestMarshaller.getInstance();
+        HttpResponseHandler<UnifiedOrderV2Response> responseHandler =
+                new DefaultHttpResponseHandler<UnifiedOrderV2Response>(UnifiedOrderV2Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<UnifiedOrderV2Request, UnifiedOrderV2Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public UnifiedOrderV20Response unified_order_v2_0(UnifiedOrderV20Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<UnifiedOrderV20Request> requestMarshaller = UnifiedOrderV20RequestMarshaller.getInstance();
+        HttpResponseHandler<UnifiedOrderV20Response> responseHandler =
+                new DefaultHttpResponseHandler<UnifiedOrderV20Response>(UnifiedOrderV20Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<UnifiedOrderV20Request, UnifiedOrderV20Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public UnsignResponse unsign(UnsignRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<UnsignRequest> requestMarshaller = UnsignRequestMarshaller.getInstance();
+        HttpResponseHandler<UnsignResponse> responseHandler =
+                new DefaultHttpResponseHandler<UnsignResponse>(UnsignResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<UnsignRequest, UnsignResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public UnsignV10Response unsign_v1_0(UnsignV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<UnsignV10Request> requestMarshaller = UnsignV10RequestMarshaller.getInstance();
+        HttpResponseHandler<UnsignV10Response> responseHandler =
+                new DefaultHttpResponseHandler<UnsignV10Response>(UnsignV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<UnsignV10Request, UnsignV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public UpdateAccountInfoResponse updateAccountInfo(UpdateAccountInfoRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<UpdateAccountInfoRequest> requestMarshaller = UpdateAccountInfoRequestMarshaller.getInstance();
+        HttpResponseHandler<UpdateAccountInfoResponse> responseHandler =
+                new DefaultHttpResponseHandler<UpdateAccountInfoResponse>(UpdateAccountInfoResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<UpdateAccountInfoRequest, UpdateAccountInfoResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public UpdateRefundProgressResponse updateRefundProgress(UpdateRefundProgressRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<UpdateRefundProgressRequest> requestMarshaller = UpdateRefundProgressRequestMarshaller.getInstance();
+        HttpResponseHandler<UpdateRefundProgressResponse> responseHandler =
+                new DefaultHttpResponseHandler<UpdateRefundProgressResponse>(UpdateRefundProgressResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<UpdateRefundProgressRequest, UpdateRefundProgressResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public UploadElectronicReceiptResponse uploadElectronicReceipt(UploadElectronicReceiptRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<UploadElectronicReceiptRequest> requestMarshaller = UploadElectronicReceiptRequestMarshaller.getInstance();
+        HttpResponseHandler<UploadElectronicReceiptResponse> responseHandler =
+                new DefaultHttpResponseHandler<UploadElectronicReceiptResponse>(UploadElectronicReceiptResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<UploadElectronicReceiptRequest, UploadElectronicReceiptResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public UploadElectronicReceiptV10Response upload_electronic_receipt_v1_0(UploadElectronicReceiptV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<UploadElectronicReceiptV10Request> requestMarshaller = UploadElectronicReceiptV10RequestMarshaller.getInstance();
+        HttpResponseHandler<UploadElectronicReceiptV10Response> responseHandler =
+                new DefaultHttpResponseHandler<UploadElectronicReceiptV10Response>(UploadElectronicReceiptV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<UploadElectronicReceiptV10Request, UploadElectronicReceiptV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ViolationWechatChannelResponse violationWechatChannel(ViolationWechatChannelRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ViolationWechatChannelRequest> requestMarshaller = ViolationWechatChannelRequestMarshaller.getInstance();
+        HttpResponseHandler<ViolationWechatChannelResponse> responseHandler =
+                new DefaultHttpResponseHandler<ViolationWechatChannelResponse>(ViolationWechatChannelResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ViolationWechatChannelRequest, ViolationWechatChannelResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public ViolationWechatChannelV10Response violation_wechat_channel_v1_0(ViolationWechatChannelV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<ViolationWechatChannelV10Request> requestMarshaller = ViolationWechatChannelV10RequestMarshaller.getInstance();
+        HttpResponseHandler<ViolationWechatChannelV10Response> responseHandler =
+                new DefaultHttpResponseHandler<ViolationWechatChannelV10Response>(ViolationWechatChannelV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<ViolationWechatChannelV10Request, ViolationWechatChannelV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatComplaintFeedbackResponse wechatComplaintFeedback(WechatComplaintFeedbackRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatComplaintFeedbackRequest> requestMarshaller = WechatComplaintFeedbackRequestMarshaller.getInstance();
+        HttpResponseHandler<WechatComplaintFeedbackResponse> responseHandler =
+                new DefaultHttpResponseHandler<WechatComplaintFeedbackResponse>(WechatComplaintFeedbackResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatComplaintFeedbackRequest, WechatComplaintFeedbackResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatConfigAddResponse wechatConfigAdd(WechatConfigAddRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatConfigAddRequest> requestMarshaller = WechatConfigAddRequestMarshaller.getInstance();
+        HttpResponseHandler<WechatConfigAddResponse> responseHandler =
+                new DefaultHttpResponseHandler<WechatConfigAddResponse>(WechatConfigAddResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatConfigAddRequest, WechatConfigAddResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatConfigAddSyncResponse wechatConfigAddSync(WechatConfigAddSyncRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatConfigAddSyncRequest> requestMarshaller = WechatConfigAddSyncRequestMarshaller.getInstance();
+        HttpResponseHandler<WechatConfigAddSyncResponse> responseHandler =
+                new DefaultHttpResponseHandler<WechatConfigAddSyncResponse>(WechatConfigAddSyncResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatConfigAddSyncRequest, WechatConfigAddSyncResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatConfigAddV2Response wechatConfigAddV2(WechatConfigAddV2Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatConfigAddV2Request> requestMarshaller = WechatConfigAddV2RequestMarshaller.getInstance();
+        HttpResponseHandler<WechatConfigAddV2Response> responseHandler =
+                new DefaultHttpResponseHandler<WechatConfigAddV2Response>(WechatConfigAddV2Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatConfigAddV2Request, WechatConfigAddV2Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatConfigQueryResponse wechatConfigQuery(WechatConfigQueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatConfigQueryRequest> requestMarshaller = WechatConfigQueryRequestMarshaller.getInstance();
+        HttpResponseHandler<WechatConfigQueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<WechatConfigQueryResponse>(WechatConfigQueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatConfigQueryRequest, WechatConfigQueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatConfigQueryV2Response wechatConfigQueryV2(WechatConfigQueryV2Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatConfigQueryV2Request> requestMarshaller = WechatConfigQueryV2RequestMarshaller.getInstance();
+        HttpResponseHandler<WechatConfigQueryV2Response> responseHandler =
+                new DefaultHttpResponseHandler<WechatConfigQueryV2Response>(WechatConfigQueryV2Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatConfigQueryV2Request, WechatConfigQueryV2Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatDisposalQueryResponse wechatDisposalQuery(WechatDisposalQueryRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatDisposalQueryRequest> requestMarshaller = WechatDisposalQueryRequestMarshaller.getInstance();
+        HttpResponseHandler<WechatDisposalQueryResponse> responseHandler =
+                new DefaultHttpResponseHandler<WechatDisposalQueryResponse>(WechatDisposalQueryResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatDisposalQueryRequest, WechatDisposalQueryResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatConfigAddSyncV10Response wechat_config_add_sync_v1_0(WechatConfigAddSyncV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatConfigAddSyncV10Request> requestMarshaller = WechatConfigAddSyncV10RequestMarshaller.getInstance();
+        HttpResponseHandler<WechatConfigAddSyncV10Response> responseHandler =
+                new DefaultHttpResponseHandler<WechatConfigAddSyncV10Response>(WechatConfigAddSyncV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatConfigAddSyncV10Request, WechatConfigAddSyncV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatConfigAddV10Response wechat_config_add_v1_0(WechatConfigAddV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatConfigAddV10Request> requestMarshaller = WechatConfigAddV10RequestMarshaller.getInstance();
+        HttpResponseHandler<WechatConfigAddV10Response> responseHandler =
+                new DefaultHttpResponseHandler<WechatConfigAddV10Response>(WechatConfigAddV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatConfigAddV10Request, WechatConfigAddV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatConfigAddV20Response wechat_config_add_v2_0(WechatConfigAddV20Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatConfigAddV20Request> requestMarshaller = WechatConfigAddV20RequestMarshaller.getInstance();
+        HttpResponseHandler<WechatConfigAddV20Response> responseHandler =
+                new DefaultHttpResponseHandler<WechatConfigAddV20Response>(WechatConfigAddV20Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatConfigAddV20Request, WechatConfigAddV20Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatConfigQueryV10Response wechat_config_query_v1_0(WechatConfigQueryV10Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatConfigQueryV10Request> requestMarshaller = WechatConfigQueryV10RequestMarshaller.getInstance();
+        HttpResponseHandler<WechatConfigQueryV10Response> responseHandler =
+                new DefaultHttpResponseHandler<WechatConfigQueryV10Response>(WechatConfigQueryV10Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatConfigQueryV10Request, WechatConfigQueryV10Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WechatConfigQueryV20Response wechat_config_query_v2_0(WechatConfigQueryV20Request request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WechatConfigQueryV20Request> requestMarshaller = WechatConfigQueryV20RequestMarshaller.getInstance();
+        HttpResponseHandler<WechatConfigQueryV20Response> responseHandler =
+                new DefaultHttpResponseHandler<WechatConfigQueryV20Response>(WechatConfigQueryV20Response.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WechatConfigQueryV20Request, WechatConfigQueryV20Response>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WecomPayLinkResponse wecomPayLink(WecomPayLinkRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WecomPayLinkRequest> requestMarshaller = WecomPayLinkRequestMarshaller.getInstance();
+        HttpResponseHandler<WecomPayLinkResponse> responseHandler =
+                new DefaultHttpResponseHandler<WecomPayLinkResponse>(WecomPayLinkResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WecomPayLinkRequest, WecomPayLinkResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+    @Override
+    public WecomPayLinkResponse wecom_pay_link(WecomPayLinkRequest request) throws YopClientException{
+        if (request == null) {
+            throw new YopClientException("request is required.");
+        }
+        RequestMarshaller<WecomPayLinkRequest> requestMarshaller = WecomPayLinkRequestMarshaller.getInstance();
+        HttpResponseHandler<WecomPayLinkResponse> responseHandler =
+                new DefaultHttpResponseHandler<WecomPayLinkResponse>(WecomPayLinkResponse.class,
+                        HttpResponseAnalyzerSupport.getAnalyzerChain());
+
+        return clientHandler.execute(new ClientExecutionParams<WecomPayLinkRequest, WecomPayLinkResponse>()
+                .withInput(request)
+                .withRequestMarshaller(requestMarshaller)
+                .withResponseHandler(responseHandler));
+    }
+
+    @Override
+    public void shutdown() {
+        clientHandler.shutdown();
+    }
+
+}

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AccountInfoQueryResponseDTO.java

@@ -0,0 +1,378 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class AccountInfoQueryResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   *  <p>00000:成功，表示查询成功</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Qi27dnopYotXtcxxaVbccbqun6g\">验证状态</div> <div class=\"ace-line ace-line old-record-id-Qi27dnopYotXtcxxaVbccbqun6g\"> <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-DM3fdLhufoYV4XxLpxzcNYVtn7e\">VERIFY_SUCCESS: 验证成功，该账户可正常发起提现。</div> <div class=\"ace-line ace-line old-record-id-DM3fdLhufoYV4XxLpxzcNYVtn7e\">VERIFY_FAIL: 验证失败，该账户无法发起提现，请检查修改。</div> <div class=\"ace-line ace-line old-record-id-DM3fdLhufoYV4XxLpxzcNYVtn7e\">VERIFYING: 验证中，商户可发起提现尝试。</div> </div> </div> </div>
+   */
+  @JsonProperty("status")
+  private String status = null;
+
+  /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-RBPkdGlq7orUzHx4ZANcU9UHnTd\">验证失败原因</div> </div>
+   */
+  @JsonProperty("failReason")
+  private String failReason = null;
+
+  /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XFDbd0Zdvoz7GEx2ycjcSioZnsh\">结算卡号</div> </div>
+   */
+  @JsonProperty("accountNo")
+  private String accountNo = null;
+
+  /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-AEjCd3uxsoxrCXxgc7XcOxE2nhe\">结算卡户名</div> </div>
+   */
+  @JsonProperty("accountName")
+  private String accountName = null;
+
+  /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-DM9rdc7VwopvtKxA347cgtZ0nGf\">结算卡开户行名称</div> <div class=\"ace-line ace-line old-record-id-DM9rdc7VwopvtKxA347cgtZ0nGf\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/O9sjs9Qiqho8Hst7F2HcZ3Qbnfg?sheet=BR2vLC\">查询&修改渠道结算信息相关字段</a>枚举中【支持个人银行业务的银行列表】和【支持对公银行业务的银行列表】表单</div> </div>
+   */
+  @JsonProperty("accountBank")
+  private String accountBank = null;
+
+  /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VCuBddxBRo6VS3xzahRcGOeZn63\">结算卡开户行联行号</div> <div class=\"ace-line ace-line old-record-id-VCuBddxBRo6VS3xzahRcGOeZn63\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/MmMfsrTbnhn744tjYdEcvoNmn83?sheet=0Smsnm\">易宝支付总行编码</a></div> <div class=\"ace-line ace-line old-record-id-VCuBddxBRo6VS3xzahRcGOeZn63\"> <div data-page-id=\"C57DdJHaloryX1xssrjcswA7nDg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-NxzEdH96co0qX3xCA1gcITvqnnb\"> </div> </div> </div> </div>
+   */
+  @JsonProperty("accountBankNo")
+  private String accountBankNo = null;
+
+  /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Xi6od4LkWoh4hZxOxMdcLtsWnkh\">结算卡开户行名称</div> <div class=\"ace-line ace-line old-record-id-Xi6od4LkWoh4hZxOxMdcLtsWnkh\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/KHE9sYFfchk4PXtwNtccsNvmnOb\">开户银行全称（含支行）对照表</a></div> </div>
+   */
+  @JsonProperty("accountBankName")
+  private String accountBankName = null;
+
+  /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-PO87dkUGOoGbUFx2DPAcgXnjnEd\">结算卡开户行区级地区码</div> <div class=\"ace-line ace-line old-record-id-PO87dkUGOoGbUFx2DPAcgXnjnEd\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/O9sjs9Qiqho8Hst7F2HcZ3Qbnfg?sheet=5e713e\">查询&修改渠道结算信息相关字段</a>枚举中【省市区编码对照表】表单</div> </div>
+   */
+  @JsonProperty("accountBankDistinctCode")
+  private String accountBankDistinctCode = null;
+
+  /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-FLuod8oZHoL8vJxmPszcCNTMn0X\"> <p>结算卡账户类型</p> <div data-page-id=\"C57DdJHaloryX1xssrjcswA7nDg\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-AdXJd44Azo4viUxuqcdcUFoKnwf\">BANK_ACCOUNT_TYPE_CORPORATE：对公银行账户</div> <div class=\"ace-line ace-line old-record-id-AdXJd44Azo4viUxuqcdcUFoKnwf\">BANK_ACCOUNT_TYPE_PERSONAL：经营者个人银行卡</div> </div> </div> </div>
+   */
+  @JsonProperty("accountBankType")
+  private String accountBankType = null;
+
+  public AccountInfoQueryResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   *  <p>00000:成功，表示查询成功</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public AccountInfoQueryResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public AccountInfoQueryResponseDTO status(String status) {
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Qi27dnopYotXtcxxaVbccbqun6g\">验证状态</div> <div class=\"ace-line ace-line old-record-id-Qi27dnopYotXtcxxaVbccbqun6g\"> <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-DM3fdLhufoYV4XxLpxzcNYVtn7e\">VERIFY_SUCCESS: 验证成功，该账户可正常发起提现。</div> <div class=\"ace-line ace-line old-record-id-DM3fdLhufoYV4XxLpxzcNYVtn7e\">VERIFY_FAIL: 验证失败，该账户无法发起提现，请检查修改。</div> <div class=\"ace-line ace-line old-record-id-DM3fdLhufoYV4XxLpxzcNYVtn7e\">VERIFYING: 验证中，商户可发起提现尝试。</div> </div> </div> </div>
+   * @return status
+  **/
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  public AccountInfoQueryResponseDTO failReason(String failReason) {
+    this.failReason = failReason;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-RBPkdGlq7orUzHx4ZANcU9UHnTd\">验证失败原因</div> </div>
+   * @return failReason
+  **/
+
+  public String getFailReason() {
+    return failReason;
+  }
+
+  public void setFailReason(String failReason) {
+    this.failReason = failReason;
+  }
+
+  public AccountInfoQueryResponseDTO accountNo(String accountNo) {
+    this.accountNo = accountNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XFDbd0Zdvoz7GEx2ycjcSioZnsh\">结算卡号</div> </div>
+   * @return accountNo
+  **/
+
+  public String getAccountNo() {
+    return accountNo;
+  }
+
+  public void setAccountNo(String accountNo) {
+    this.accountNo = accountNo;
+  }
+
+  public AccountInfoQueryResponseDTO accountName(String accountName) {
+    this.accountName = accountName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-AEjCd3uxsoxrCXxgc7XcOxE2nhe\">结算卡户名</div> </div>
+   * @return accountName
+  **/
+
+  public String getAccountName() {
+    return accountName;
+  }
+
+  public void setAccountName(String accountName) {
+    this.accountName = accountName;
+  }
+
+  public AccountInfoQueryResponseDTO accountBank(String accountBank) {
+    this.accountBank = accountBank;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-DM9rdc7VwopvtKxA347cgtZ0nGf\">结算卡开户行名称</div> <div class=\"ace-line ace-line old-record-id-DM9rdc7VwopvtKxA347cgtZ0nGf\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/O9sjs9Qiqho8Hst7F2HcZ3Qbnfg?sheet=BR2vLC\">查询&修改渠道结算信息相关字段</a>枚举中【支持个人银行业务的银行列表】和【支持对公银行业务的银行列表】表单</div> </div>
+   * @return accountBank
+  **/
+
+  public String getAccountBank() {
+    return accountBank;
+  }
+
+  public void setAccountBank(String accountBank) {
+    this.accountBank = accountBank;
+  }
+
+  public AccountInfoQueryResponseDTO accountBankNo(String accountBankNo) {
+    this.accountBankNo = accountBankNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VCuBddxBRo6VS3xzahRcGOeZn63\">结算卡开户行联行号</div> <div class=\"ace-line ace-line old-record-id-VCuBddxBRo6VS3xzahRcGOeZn63\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/MmMfsrTbnhn744tjYdEcvoNmn83?sheet=0Smsnm\">易宝支付总行编码</a></div> <div class=\"ace-line ace-line old-record-id-VCuBddxBRo6VS3xzahRcGOeZn63\"> <div data-page-id=\"C57DdJHaloryX1xssrjcswA7nDg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-NxzEdH96co0qX3xCA1gcITvqnnb\"> </div> </div> </div> </div>
+   * @return accountBankNo
+  **/
+
+  public String getAccountBankNo() {
+    return accountBankNo;
+  }
+
+  public void setAccountBankNo(String accountBankNo) {
+    this.accountBankNo = accountBankNo;
+  }
+
+  public AccountInfoQueryResponseDTO accountBankName(String accountBankName) {
+    this.accountBankName = accountBankName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Xi6od4LkWoh4hZxOxMdcLtsWnkh\">结算卡开户行名称</div> <div class=\"ace-line ace-line old-record-id-Xi6od4LkWoh4hZxOxMdcLtsWnkh\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/KHE9sYFfchk4PXtwNtccsNvmnOb\">开户银行全称（含支行）对照表</a></div> </div>
+   * @return accountBankName
+  **/
+
+  public String getAccountBankName() {
+    return accountBankName;
+  }
+
+  public void setAccountBankName(String accountBankName) {
+    this.accountBankName = accountBankName;
+  }
+
+  public AccountInfoQueryResponseDTO accountBankDistinctCode(String accountBankDistinctCode) {
+    this.accountBankDistinctCode = accountBankDistinctCode;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-PO87dkUGOoGbUFx2DPAcgXnjnEd\">结算卡开户行区级地区码</div> <div class=\"ace-line ace-line old-record-id-PO87dkUGOoGbUFx2DPAcgXnjnEd\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/O9sjs9Qiqho8Hst7F2HcZ3Qbnfg?sheet=5e713e\">查询&修改渠道结算信息相关字段</a>枚举中【省市区编码对照表】表单</div> </div>
+   * @return accountBankDistinctCode
+  **/
+
+  public String getAccountBankDistinctCode() {
+    return accountBankDistinctCode;
+  }
+
+  public void setAccountBankDistinctCode(String accountBankDistinctCode) {
+    this.accountBankDistinctCode = accountBankDistinctCode;
+  }
+
+  public AccountInfoQueryResponseDTO accountBankType(String accountBankType) {
+    this.accountBankType = accountBankType;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EQSud2ampom8wyxRtG1cWO7onkc\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-FLuod8oZHoL8vJxmPszcCNTMn0X\"> <p>结算卡账户类型</p> <div data-page-id=\"C57DdJHaloryX1xssrjcswA7nDg\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-AdXJd44Azo4viUxuqcdcUFoKnwf\">BANK_ACCOUNT_TYPE_CORPORATE：对公银行账户</div> <div class=\"ace-line ace-line old-record-id-AdXJd44Azo4viUxuqcdcUFoKnwf\">BANK_ACCOUNT_TYPE_PERSONAL：经营者个人银行卡</div> </div> </div> </div>
+   * @return accountBankType
+  **/
+
+  public String getAccountBankType() {
+    return accountBankType;
+  }
+
+  public void setAccountBankType(String accountBankType) {
+    this.accountBankType = accountBankType;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AccountInfoQueryResponseDTO accountInfoQueryResponseDTO = (AccountInfoQueryResponseDTO) o;
+    return ObjectUtils.equals(this.code, accountInfoQueryResponseDTO.code) &&
+    ObjectUtils.equals(this.message, accountInfoQueryResponseDTO.message) &&
+    ObjectUtils.equals(this.status, accountInfoQueryResponseDTO.status) &&
+    ObjectUtils.equals(this.failReason, accountInfoQueryResponseDTO.failReason) &&
+    ObjectUtils.equals(this.accountNo, accountInfoQueryResponseDTO.accountNo) &&
+    ObjectUtils.equals(this.accountName, accountInfoQueryResponseDTO.accountName) &&
+    ObjectUtils.equals(this.accountBank, accountInfoQueryResponseDTO.accountBank) &&
+    ObjectUtils.equals(this.accountBankNo, accountInfoQueryResponseDTO.accountBankNo) &&
+    ObjectUtils.equals(this.accountBankName, accountInfoQueryResponseDTO.accountBankName) &&
+    ObjectUtils.equals(this.accountBankDistinctCode, accountInfoQueryResponseDTO.accountBankDistinctCode) &&
+    ObjectUtils.equals(this.accountBankType, accountInfoQueryResponseDTO.accountBankType);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, status, failReason, accountNo, accountName, accountBank, accountBankNo, accountBankName, accountBankDistinctCode, accountBankType);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AccountInfoQueryResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    failReason: ").append(toIndentedString(failReason)).append("\n");
+    sb.append("    accountNo: ").append(toIndentedString(accountNo)).append("\n");
+    sb.append("    accountName: ").append(toIndentedString(accountName)).append("\n");
+    sb.append("    accountBank: ").append(toIndentedString(accountBank)).append("\n");
+    sb.append("    accountBankNo: ").append(toIndentedString(accountBankNo)).append("\n");
+    sb.append("    accountBankName: ").append(toIndentedString(accountBankName)).append("\n");
+    sb.append("    accountBankDistinctCode: ").append(toIndentedString(accountBankDistinctCode)).append("\n");
+    sb.append("    accountBankType: ").append(toIndentedString(accountBankType)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AccountInfoUpdateQueryResponseDTO.java

@@ -0,0 +1,378 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class AccountInfoUpdateQueryResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-S1fydfyFTouAZFxNQglcROwqn3e\">返回码</div> <div class=\"ace-line ace-line old-record-id-S1fydfyFTouAZFxNQglcROwqn3e\"> <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-S1fydfyFTouAZFxNQglcROwqn3e\">00000表示查询成功</div> </div> </div> </div>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-UFILd5TzaoewvGx9si0cg9ndnSd\">返回信息</div> </div>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-IQIYd09ProSqXSxgqvUcDJAhnve\">状态</div> <div class=\"ace-line ace-line old-record-id-IQIYd09ProSqXSxgqvUcDJAhnve\"> <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-MoZ4dlHAtoLALdxuDdecj4cVnUc\">SUCCESS：成功</div> <div class=\"ace-line ace-line old-record-id-Xqdndn90MoJe4sxIYhzcQ87WnTg\">PROCESSING：处理中</div> <div class=\"ace-line ace-line old-record-id-ZW1zdA1VxofU6Yxtgm2c1evnnbe\">FAILED：失败</div> </div> </div> </div>
+   */
+  @JsonProperty("status")
+  private String status = null;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-V7JCdl2jio8lYJxRyOncILc3nvf\">失败原因</div> </div>
+   */
+  @JsonProperty("failReason")
+  private String failReason = null;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-G0X3dMoCnoypfFxwDgHct7UtnLe\">结算卡号</div> </div>
+   */
+  @JsonProperty("accountNo")
+  private String accountNo = null;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-BFbzdShB2oDTAgx8h6PcY9pOnbc\">结算卡户名</div> </div>
+   */
+  @JsonProperty("accountName")
+  private String accountName = null;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-SkCqdstNooODRvxEIOHc9459nRd\">结算卡开户行名称</div> <div class=\"ace-line ace-line old-record-id-SkCqdstNooODRvxEIOHc9459nRd\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/O9sjs9Qiqho8Hst7F2HcZ3Qbnfg?sheet=BR2vLC\">查询&修改渠道结算信息相关字段</a>枚举中【支持个人银行业务的银行列表】和【支持对公银行业务的银行列表】表单</div> </div>
+   */
+  @JsonProperty("accountBank")
+  private String accountBank = null;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-UC7Ad1AzVoX8Tmxf1KQcS2ihnVI\">结算卡开户行联行号</div> <div class=\"ace-line ace-line old-record-id-UC7Ad1AzVoX8Tmxf1KQcS2ihnVI\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/MmMfsrTbnhn744tjYdEcvoNmn83?sheet=0Smsnm\">易宝支付总行编码</a></div> </div>
+   */
+  @JsonProperty("accountBankNo")
+  private String accountBankNo = null;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-MszEdjoSIox2kkxkA0mc22Q3nVd\">结算卡开户行名称</div> <div class=\"ace-line ace-line old-record-id-MszEdjoSIox2kkxkA0mc22Q3nVd\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/KHE9sYFfchk4PXtwNtccsNvmnOb\">开户银行全称（含支行）对照表</a></div> </div>
+   */
+  @JsonProperty("accountBankName")
+  private String accountBankName = null;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Rqfdd4O9RouujPxmRuJc7xABnHf\">结算卡开户行区级地区码</div> <div class=\"ace-line ace-line old-record-id-Rqfdd4O9RouujPxmRuJc7xABnHf\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/O9sjs9Qiqho8Hst7F2HcZ3Qbnfg?sheet=5e713e\">查询&修改渠道结算信息相关字段</a>枚举中【省市区编码对照表】表单</div> </div>
+   */
+  @JsonProperty("accountBankDistinctCode")
+  private String accountBankDistinctCode = null;
+
+  /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ASvKdljZhoTvKHxCJivcaRITn0e\">结算卡账户类型</div> <div class=\"ace-line ace-line old-record-id-ASvKdljZhoTvKHxCJivcaRITn0e\"> <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-Mzl2dLZDpo3grdxrHijcJMI2nIB\">BANK_ACCOUNT_TYPE_CORPORATE：对公银行账户</div> <div class=\" old-record-id-Mzl2dLZDpo3grdxrHijcJMI2nIB\">BANK_ACCOUNT_TYPE_PERSONAL：经营者个人银行卡</div> </div> </div> </div>
+   */
+  @JsonProperty("accountBankType")
+  private String accountBankType = null;
+
+  public AccountInfoUpdateQueryResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-S1fydfyFTouAZFxNQglcROwqn3e\">返回码</div> <div class=\"ace-line ace-line old-record-id-S1fydfyFTouAZFxNQglcROwqn3e\"> <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-S1fydfyFTouAZFxNQglcROwqn3e\">00000表示查询成功</div> </div> </div> </div>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public AccountInfoUpdateQueryResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-UFILd5TzaoewvGx9si0cg9ndnSd\">返回信息</div> </div>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public AccountInfoUpdateQueryResponseDTO status(String status) {
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-IQIYd09ProSqXSxgqvUcDJAhnve\">状态</div> <div class=\"ace-line ace-line old-record-id-IQIYd09ProSqXSxgqvUcDJAhnve\"> <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-MoZ4dlHAtoLALdxuDdecj4cVnUc\">SUCCESS：成功</div> <div class=\"ace-line ace-line old-record-id-Xqdndn90MoJe4sxIYhzcQ87WnTg\">PROCESSING：处理中</div> <div class=\"ace-line ace-line old-record-id-ZW1zdA1VxofU6Yxtgm2c1evnnbe\">FAILED：失败</div> </div> </div> </div>
+   * @return status
+  **/
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  public AccountInfoUpdateQueryResponseDTO failReason(String failReason) {
+    this.failReason = failReason;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-V7JCdl2jio8lYJxRyOncILc3nvf\">失败原因</div> </div>
+   * @return failReason
+  **/
+
+  public String getFailReason() {
+    return failReason;
+  }
+
+  public void setFailReason(String failReason) {
+    this.failReason = failReason;
+  }
+
+  public AccountInfoUpdateQueryResponseDTO accountNo(String accountNo) {
+    this.accountNo = accountNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-G0X3dMoCnoypfFxwDgHct7UtnLe\">结算卡号</div> </div>
+   * @return accountNo
+  **/
+
+  public String getAccountNo() {
+    return accountNo;
+  }
+
+  public void setAccountNo(String accountNo) {
+    this.accountNo = accountNo;
+  }
+
+  public AccountInfoUpdateQueryResponseDTO accountName(String accountName) {
+    this.accountName = accountName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-BFbzdShB2oDTAgx8h6PcY9pOnbc\">结算卡户名</div> </div>
+   * @return accountName
+  **/
+
+  public String getAccountName() {
+    return accountName;
+  }
+
+  public void setAccountName(String accountName) {
+    this.accountName = accountName;
+  }
+
+  public AccountInfoUpdateQueryResponseDTO accountBank(String accountBank) {
+    this.accountBank = accountBank;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-SkCqdstNooODRvxEIOHc9459nRd\">结算卡开户行名称</div> <div class=\"ace-line ace-line old-record-id-SkCqdstNooODRvxEIOHc9459nRd\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/O9sjs9Qiqho8Hst7F2HcZ3Qbnfg?sheet=BR2vLC\">查询&修改渠道结算信息相关字段</a>枚举中【支持个人银行业务的银行列表】和【支持对公银行业务的银行列表】表单</div> </div>
+   * @return accountBank
+  **/
+
+  public String getAccountBank() {
+    return accountBank;
+  }
+
+  public void setAccountBank(String accountBank) {
+    this.accountBank = accountBank;
+  }
+
+  public AccountInfoUpdateQueryResponseDTO accountBankNo(String accountBankNo) {
+    this.accountBankNo = accountBankNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-UC7Ad1AzVoX8Tmxf1KQcS2ihnVI\">结算卡开户行联行号</div> <div class=\"ace-line ace-line old-record-id-UC7Ad1AzVoX8Tmxf1KQcS2ihnVI\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/MmMfsrTbnhn744tjYdEcvoNmn83?sheet=0Smsnm\">易宝支付总行编码</a></div> </div>
+   * @return accountBankNo
+  **/
+
+  public String getAccountBankNo() {
+    return accountBankNo;
+  }
+
+  public void setAccountBankNo(String accountBankNo) {
+    this.accountBankNo = accountBankNo;
+  }
+
+  public AccountInfoUpdateQueryResponseDTO accountBankName(String accountBankName) {
+    this.accountBankName = accountBankName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-MszEdjoSIox2kkxkA0mc22Q3nVd\">结算卡开户行名称</div> <div class=\"ace-line ace-line old-record-id-MszEdjoSIox2kkxkA0mc22Q3nVd\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/KHE9sYFfchk4PXtwNtccsNvmnOb\">开户银行全称（含支行）对照表</a></div> </div>
+   * @return accountBankName
+  **/
+
+  public String getAccountBankName() {
+    return accountBankName;
+  }
+
+  public void setAccountBankName(String accountBankName) {
+    this.accountBankName = accountBankName;
+  }
+
+  public AccountInfoUpdateQueryResponseDTO accountBankDistinctCode(String accountBankDistinctCode) {
+    this.accountBankDistinctCode = accountBankDistinctCode;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Rqfdd4O9RouujPxmRuJc7xABnHf\">结算卡开户行区级地区码</div> <div class=\"ace-line ace-line old-record-id-Rqfdd4O9RouujPxmRuJc7xABnHf\">枚举详见<a href=\"https://yeepay.feishu.cn/sheets/O9sjs9Qiqho8Hst7F2HcZ3Qbnfg?sheet=5e713e\">查询&修改渠道结算信息相关字段</a>枚举中【省市区编码对照表】表单</div> </div>
+   * @return accountBankDistinctCode
+  **/
+
+  public String getAccountBankDistinctCode() {
+    return accountBankDistinctCode;
+  }
+
+  public void setAccountBankDistinctCode(String accountBankDistinctCode) {
+    this.accountBankDistinctCode = accountBankDistinctCode;
+  }
+
+  public AccountInfoUpdateQueryResponseDTO accountBankType(String accountBankType) {
+    this.accountBankType = accountBankType;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ASvKdljZhoTvKHxCJivcaRITn0e\">结算卡账户类型</div> <div class=\"ace-line ace-line old-record-id-ASvKdljZhoTvKHxCJivcaRITn0e\"> <div data-page-id=\"ZdBKdEh3NoozUhxp3WpcRqv0nCd\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-Mzl2dLZDpo3grdxrHijcJMI2nIB\">BANK_ACCOUNT_TYPE_CORPORATE：对公银行账户</div> <div class=\" old-record-id-Mzl2dLZDpo3grdxrHijcJMI2nIB\">BANK_ACCOUNT_TYPE_PERSONAL：经营者个人银行卡</div> </div> </div> </div>
+   * @return accountBankType
+  **/
+
+  public String getAccountBankType() {
+    return accountBankType;
+  }
+
+  public void setAccountBankType(String accountBankType) {
+    this.accountBankType = accountBankType;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AccountInfoUpdateQueryResponseDTO accountInfoUpdateQueryResponseDTO = (AccountInfoUpdateQueryResponseDTO) o;
+    return ObjectUtils.equals(this.code, accountInfoUpdateQueryResponseDTO.code) &&
+    ObjectUtils.equals(this.message, accountInfoUpdateQueryResponseDTO.message) &&
+    ObjectUtils.equals(this.status, accountInfoUpdateQueryResponseDTO.status) &&
+    ObjectUtils.equals(this.failReason, accountInfoUpdateQueryResponseDTO.failReason) &&
+    ObjectUtils.equals(this.accountNo, accountInfoUpdateQueryResponseDTO.accountNo) &&
+    ObjectUtils.equals(this.accountName, accountInfoUpdateQueryResponseDTO.accountName) &&
+    ObjectUtils.equals(this.accountBank, accountInfoUpdateQueryResponseDTO.accountBank) &&
+    ObjectUtils.equals(this.accountBankNo, accountInfoUpdateQueryResponseDTO.accountBankNo) &&
+    ObjectUtils.equals(this.accountBankName, accountInfoUpdateQueryResponseDTO.accountBankName) &&
+    ObjectUtils.equals(this.accountBankDistinctCode, accountInfoUpdateQueryResponseDTO.accountBankDistinctCode) &&
+    ObjectUtils.equals(this.accountBankType, accountInfoUpdateQueryResponseDTO.accountBankType);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, status, failReason, accountNo, accountName, accountBank, accountBankNo, accountBankName, accountBankDistinctCode, accountBankType);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AccountInfoUpdateQueryResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    failReason: ").append(toIndentedString(failReason)).append("\n");
+    sb.append("    accountNo: ").append(toIndentedString(accountNo)).append("\n");
+    sb.append("    accountName: ").append(toIndentedString(accountName)).append("\n");
+    sb.append("    accountBank: ").append(toIndentedString(accountBank)).append("\n");
+    sb.append("    accountBankNo: ").append(toIndentedString(accountBankNo)).append("\n");
+    sb.append("    accountBankName: ").append(toIndentedString(accountBankName)).append("\n");
+    sb.append("    accountBankDistinctCode: ").append(toIndentedString(accountBankDistinctCode)).append("\n");
+    sb.append("    accountBankType: ").append(toIndentedString(accountBankType)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AccountInfoUpdateResponseDTO.java

@@ -0,0 +1,144 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class AccountInfoUpdateResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-page-id=\"C57DdJHaloryX1xssrjcswA7nDg\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XNHpdQCRxoBg61xiEevc2HagnFr\">返回码</div> <div class=\"ace-line ace-line old-record-id-XNHpdQCRxoBg61xiEevc2HagnFr\"> <div data-page-id=\"C57DdJHaloryX1xssrjcswA7nDg\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-OxRpd8WwRobWqox9nqtcmCKCnZe\">00000：成功表示申请成功，请调用查询修改结果接口</div> </div> </div> </div>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  public AccountInfoUpdateResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"C57DdJHaloryX1xssrjcswA7nDg\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XNHpdQCRxoBg61xiEevc2HagnFr\">返回码</div> <div class=\"ace-line ace-line old-record-id-XNHpdQCRxoBg61xiEevc2HagnFr\"> <div data-page-id=\"C57DdJHaloryX1xssrjcswA7nDg\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-OxRpd8WwRobWqox9nqtcmCKCnZe\">00000：成功表示申请成功，请调用查询修改结果接口</div> </div> </div> </div>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public AccountInfoUpdateResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AccountInfoUpdateResponseDTO accountInfoUpdateResponseDTO = (AccountInfoUpdateResponseDTO) o;
+    return ObjectUtils.equals(this.code, accountInfoUpdateResponseDTO.code) &&
+    ObjectUtils.equals(this.message, accountInfoUpdateResponseDTO.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AccountInfoUpdateResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AggregatePayOrderReqDTO.java

@@ -0,0 +1,738 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fs.ybPay.request.serializer.YopCustomSerializer;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 聚合支付统一下单请求参数
+ */
+public class AggregatePayOrderReqDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantInfo")
+  private MerchantDTO merchantInfo = null;
+
+  /**
+   * <p>由商户侧生成的唯一请求标识，用于标记一次支付交易请求。若同一笔订单更换支付方式或更换付款人，该商户请求流水号也许更换，否则会被幂等返回。</p>
+   */
+  @JsonProperty("mchTransactionNo")
+  private String mchTransactionNo = null;
+
+  /**
+   * <p>交易时传入，原样返回</p>
+   */
+  @JsonProperty("mchOrderNo")
+  private String mchOrderNo = null;
+
+  /**
+   * <p>单位： 元， 两位小数， 最低 0.01</p>
+   */
+  @JsonProperty("amount")
+  private BigDecimal amount = null;
+
+  /**
+   * <div> <pre>支付方式：</pre> <pre> </pre> </div> 可选项如下: WECHAT_JSAPI:微信公众号支付 WECHAT_APP:微信APP支付 WECHAT_APPLET:微信小程序支付 ALIPAY_LIFE:支付宝生活号支付 ALIPAY_APPLET:支付宝小程序支付 ALIPAY_NATIVE:支付宝主扫支付 
+   */
+  public enum PayTypeEnum {
+    WECHAT_JSAPI("WECHAT_JSAPI"),
+    
+    WECHAT_APP("WECHAT_APP"),
+    
+    WECHAT_APPLET("WECHAT_APPLET"),
+    
+    ALIPAY_LIFE("ALIPAY_LIFE"),
+    
+    ALIPAY_APPLET("ALIPAY_APPLET"),
+    
+    ALIPAY_NATIVE("ALIPAY_NATIVE");
+
+    private String value;
+
+    PayTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PayTypeEnum fromValue(String text) {
+      for (PayTypeEnum b : PayTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   * <div> <pre>支付方式：</pre> <pre> </pre> </div> 可选项如下: WECHAT_JSAPI:微信公众号支付 WECHAT_APP:微信APP支付 WECHAT_APPLET:微信小程序支付 ALIPAY_LIFE:支付宝生活号支付 ALIPAY_APPLET:支付宝小程序支付 ALIPAY_NATIVE:支付宝主扫支付 
+   */
+  @JsonProperty("payType")
+  private PayTypeEnum payType = null;
+
+  /**
+   * <p>本次交易禁用的付款方式，默认不禁用；示例值：NO_CREDIT</p>
+   */
+  @JsonProperty("payLimit")
+  private String payLimit = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("wechatPayParams")
+  private WechatPayParamsDTO wechatPayParams = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("aliPayParams")
+  private AliPayParamsDTO aliPayParams = null;
+
+  /**
+   * <p>场景支付方式为微信时，可选值ONLINE/OFFLINE/BAOXIAN/GONGYI/DC_SEPARATION/DIGITAL/REGISTRATION/PRIVATE_EDUCATION； 支付方式为支付宝支付时，可选值OFFLINE/LARGE/REGISTRATION</p>
+   */
+  @JsonProperty("scene")
+  private String scene = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("remark")
+  private String remark = null;
+
+  /**
+   * <p>本次订单可用的单品券id列表</p>
+   */
+  @JsonProperty("productCoupons")
+  private List<ProductCouponDTO> productCoupons = null;
+
+  /**
+   * &lt;p&gt;amount:营销金额（自定义补贴商户时，不需要传参）&lt;br /&gt;type:营销类型&lt;/p&gt; &lt;p&gt;营销类型枚举值：&lt;br /&gt;CUSTOM_REDUCTION:自定义用户支付立减&lt;br /&gt;用户支付金额&#x3D;订单金额-自定义立减金额&lt;br /&gt;订单入账金额&#x3D;订单金额&lt;br /&gt;CUSTOM_ALLOWANCE:自定义补贴商户（自定义补贴商户需要在支付清算完成后，发起调用补贴申请）&lt;br /&gt;用户支付金额&#x3D;订单金额&lt;br /&gt;订单入账金额&#x3D;订单金额+自定义补贴金额&lt;/p&gt;
+   */
+  @JsonProperty("ypPromotions")
+  private List<YpPromotionDTO> ypPromotions = null;
+
+  /**
+   * &lt;p&gt;该笔订单允许付款最晚时间，建议大于1分钟；注意：微信、支付宝交易有订单超时时间，默认两小时关单；请求格式：yyyy-MM-dd HH:mm:ss；&lt;/p&gt;
+   */
+  @JsonProperty("expiredTime")
+  private String expiredTime = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("riskInfo")
+  private RiskInfoDTO riskInfo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("terminalDevice")
+  private TerminalDeviceDTO terminalDevice = null;
+
+  /**
+   * &lt;p&gt;支付结果异步通知地址，http或https开头&lt;/p&gt;
+   */
+  @JsonProperty("notifyUrl")
+  private String notifyUrl = null;
+
+  /**
+   * &lt;p&gt;需同时传入divideDetail&lt;/p&gt; 可选项如下: DELAY_SETTLE:需要分账 REAL_TIME:不需要分账 REAL_TIME_DIVIDE:实时分账 
+   */
+  public enum FundProcessTypeEnum {
+    DELAY_SETTLE("DELAY_SETTLE"),
+    
+    REAL_TIME("REAL_TIME"),
+    
+    REAL_TIME_DIVIDE("REAL_TIME_DIVIDE");
+
+    private String value;
+
+    FundProcessTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static FundProcessTypeEnum fromValue(String text) {
+      for (FundProcessTypeEnum b : FundProcessTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   * &lt;p&gt;需同时传入divideDetail&lt;/p&gt; 可选项如下: DELAY_SETTLE:需要分账 REAL_TIME:不需要分账 REAL_TIME_DIVIDE:实时分账 
+   */
+  @JsonProperty("fundProcessType")
+  private FundProcessTypeEnum fundProcessType = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("divideAccountInfo")
+  private DivideAccountInfoDTO divideAccountInfo = null;
+
+  /**
+   * &lt;p&gt;记账簿编号&lt;br /&gt;支持收款至预收账户&lt;br /&gt;记账簿编号不为空时，fundProcessType必须上送REAL_TIM&lt;/p&gt;
+   */
+  @JsonProperty("ypAccountBookNo")
+  private String ypAccountBookNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("feeSubsidy")
+  private FeeSubsidyDTO feeSubsidy = null;
+
+  /**
+   * &lt;p&gt;清算成功服务器回调地址，不传则不通知。详见&lt;a href&#x3D;\&quot;https://open.yeepay.com/docs/products/ptssfk/spis/5fc9ae6896818f001b300bce\&quot;&gt;清算结果通知&lt;/a&gt;&lt;/p&gt;
+   */
+  @JsonProperty("csUrl")
+  private String csUrl = null;
+
+  public AggregatePayOrderReqDTO merchantInfo(MerchantDTO merchantInfo) {
+    this.merchantInfo = merchantInfo;
+    return this;
+  }
+
+   /**
+   * Get merchantInfo
+   * @return merchantInfo
+  **/
+
+  public MerchantDTO getMerchantInfo() {
+    return merchantInfo;
+  }
+
+  public void setMerchantInfo(MerchantDTO merchantInfo) {
+    this.merchantInfo = merchantInfo;
+  }
+
+  public AggregatePayOrderReqDTO mchTransactionNo(String mchTransactionNo) {
+    this.mchTransactionNo = mchTransactionNo;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;由商户侧生成的唯一请求标识，用于标记一次支付交易请求。若同一笔订单更换支付方式或更换付款人，该商户请求流水号也许更换，否则会被幂等返回。&lt;/p&gt;
+   * @return mchTransactionNo
+  **/
+
+  public String getMchTransactionNo() {
+    return mchTransactionNo;
+  }
+
+  public void setMchTransactionNo(String mchTransactionNo) {
+    this.mchTransactionNo = mchTransactionNo;
+  }
+
+  public AggregatePayOrderReqDTO mchOrderNo(String mchOrderNo) {
+    this.mchOrderNo = mchOrderNo;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;交易时传入，原样返回&lt;/p&gt;
+   * @return mchOrderNo
+  **/
+
+  public String getMchOrderNo() {
+    return mchOrderNo;
+  }
+
+  public void setMchOrderNo(String mchOrderNo) {
+    this.mchOrderNo = mchOrderNo;
+  }
+
+  public AggregatePayOrderReqDTO amount(BigDecimal amount) {
+    this.amount = amount;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;单位： 元， 两位小数， 最低 0.01&lt;/p&gt;
+   * minimum: 0
+   * @return amount
+  **/
+
+  public BigDecimal getAmount() {
+    return amount;
+  }
+
+  public void setAmount(BigDecimal amount) {
+    this.amount = amount;
+  }
+
+  public AggregatePayOrderReqDTO payType(PayTypeEnum payType) {
+    this.payType = payType;
+    return this;
+  }
+
+   /**
+   * &lt;div&gt; &lt;pre&gt;支付方式：&lt;/pre&gt; &lt;pre&gt;&amp;nbsp;&lt;/pre&gt; &lt;/div&gt; 可选项如下: WECHAT_JSAPI:微信公众号支付 WECHAT_APP:微信APP支付 WECHAT_APPLET:微信小程序支付 ALIPAY_LIFE:支付宝生活号支付 ALIPAY_APPLET:支付宝小程序支付 ALIPAY_NATIVE:支付宝主扫支付 
+   * @return payType
+  **/
+
+  public PayTypeEnum getPayType() {
+    return payType;
+  }
+
+  public void setPayType(PayTypeEnum payType) {
+    this.payType = payType;
+  }
+
+  public AggregatePayOrderReqDTO payLimit(String payLimit) {
+    this.payLimit = payLimit;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;本次交易禁用的付款方式，默认不禁用；示例值：NO_CREDIT&lt;/p&gt;
+   * @return payLimit
+  **/
+
+  public String getPayLimit() {
+    return payLimit;
+  }
+
+  public void setPayLimit(String payLimit) {
+    this.payLimit = payLimit;
+  }
+
+  public AggregatePayOrderReqDTO wechatPayParams(WechatPayParamsDTO wechatPayParams) {
+    this.wechatPayParams = wechatPayParams;
+    return this;
+  }
+
+   /**
+   * Get wechatPayParams
+   * @return wechatPayParams
+  **/
+
+  public WechatPayParamsDTO getWechatPayParams() {
+    return wechatPayParams;
+  }
+
+  public void setWechatPayParams(WechatPayParamsDTO wechatPayParams) {
+    this.wechatPayParams = wechatPayParams;
+  }
+
+  public AggregatePayOrderReqDTO aliPayParams(AliPayParamsDTO aliPayParams) {
+    this.aliPayParams = aliPayParams;
+    return this;
+  }
+
+   /**
+   * Get aliPayParams
+   * @return aliPayParams
+  **/
+
+  public AliPayParamsDTO getAliPayParams() {
+    return aliPayParams;
+  }
+
+  public void setAliPayParams(AliPayParamsDTO aliPayParams) {
+    this.aliPayParams = aliPayParams;
+  }
+
+  public AggregatePayOrderReqDTO scene(String scene) {
+    this.scene = scene;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;场景支付方式为微信时，可选值ONLINE/OFFLINE/BAOXIAN/GONGYI/DC_SEPARATION/DIGITAL/REGISTRATION/PRIVATE_EDUCATION； 支付方式为支付宝支付时，可选值OFFLINE/LARGE/REGISTRATION&lt;/p&gt;
+   * @return scene
+  **/
+
+  public String getScene() {
+    return scene;
+  }
+
+  public void setScene(String scene) {
+    this.scene = scene;
+  }
+
+  public AggregatePayOrderReqDTO remark(String remark) {
+    this.remark = remark;
+    return this;
+  }
+
+   /**
+   * Get remark
+   * @return remark
+  **/
+
+  public String getRemark() {
+    return remark;
+  }
+
+  public void setRemark(String remark) {
+    this.remark = remark;
+  }
+
+  public AggregatePayOrderReqDTO productCoupons(List<ProductCouponDTO> productCoupons) {
+    this.productCoupons = productCoupons;
+    return this;
+  }
+
+  public AggregatePayOrderReqDTO addProductCouponsItem(ProductCouponDTO productCouponsItem) {
+    if (this.productCoupons == null) {
+      this.productCoupons = new ArrayList<>();
+    }
+    this.productCoupons.add(productCouponsItem);
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;本次订单可用的单品券id列表&lt;/p&gt;
+   * @return productCoupons
+  **/
+
+  public List<ProductCouponDTO> getProductCoupons() {
+    return productCoupons;
+  }
+
+  public void setProductCoupons(List<ProductCouponDTO> productCoupons) {
+    this.productCoupons = productCoupons;
+  }
+
+  public AggregatePayOrderReqDTO ypPromotions(List<YpPromotionDTO> ypPromotions) {
+    this.ypPromotions = ypPromotions;
+    return this;
+  }
+
+  public AggregatePayOrderReqDTO addYpPromotionsItem(YpPromotionDTO ypPromotionsItem) {
+    if (this.ypPromotions == null) {
+      this.ypPromotions = new ArrayList<>();
+    }
+    this.ypPromotions.add(ypPromotionsItem);
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;amount:营销金额（自定义补贴商户时，不需要传参）&lt;br /&gt;type:营销类型&lt;/p&gt; &lt;p&gt;营销类型枚举值：&lt;br /&gt;CUSTOM_REDUCTION:自定义用户支付立减&lt;br /&gt;用户支付金额&#x3D;订单金额-自定义立减金额&lt;br /&gt;订单入账金额&#x3D;订单金额&lt;br /&gt;CUSTOM_ALLOWANCE:自定义补贴商户（自定义补贴商户需要在支付清算完成后，发起调用补贴申请）&lt;br /&gt;用户支付金额&#x3D;订单金额&lt;br /&gt;订单入账金额&#x3D;订单金额+自定义补贴金额&lt;/p&gt;
+   * @return ypPromotions
+  **/
+
+  public List<YpPromotionDTO> getYpPromotions() {
+    return ypPromotions;
+  }
+
+  public void setYpPromotions(List<YpPromotionDTO> ypPromotions) {
+    this.ypPromotions = ypPromotions;
+  }
+
+  public AggregatePayOrderReqDTO expiredTime(String expiredTime) {
+    this.expiredTime = expiredTime;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;该笔订单允许付款最晚时间，建议大于1分钟；注意：微信、支付宝交易有订单超时时间，默认两小时关单；请求格式：yyyy-MM-dd HH:mm:ss；&lt;/p&gt;
+   * @return expiredTime
+  **/
+
+  public String getExpiredTime() {
+    return expiredTime;
+  }
+
+  public void setExpiredTime(String expiredTime) {
+    this.expiredTime = expiredTime;
+  }
+
+  public AggregatePayOrderReqDTO riskInfo(RiskInfoDTO riskInfo) {
+    this.riskInfo = riskInfo;
+    return this;
+  }
+
+   /**
+   * Get riskInfo
+   * @return riskInfo
+  **/
+
+  public RiskInfoDTO getRiskInfo() {
+    return riskInfo;
+  }
+
+  public void setRiskInfo(RiskInfoDTO riskInfo) {
+    this.riskInfo = riskInfo;
+  }
+
+  public AggregatePayOrderReqDTO terminalDevice(TerminalDeviceDTO terminalDevice) {
+    this.terminalDevice = terminalDevice;
+    return this;
+  }
+
+   /**
+   * Get terminalDevice
+   * @return terminalDevice
+  **/
+
+  public TerminalDeviceDTO getTerminalDevice() {
+    return terminalDevice;
+  }
+
+  public void setTerminalDevice(TerminalDeviceDTO terminalDevice) {
+    this.terminalDevice = terminalDevice;
+  }
+
+  public AggregatePayOrderReqDTO notifyUrl(String notifyUrl) {
+    this.notifyUrl = notifyUrl;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;支付结果异步通知地址，http或https开头&lt;/p&gt;
+   * @return notifyUrl
+  **/
+
+  @JsonSerialize(using = YopCustomSerializer.class)
+  public String getNotifyUrl() {
+    return notifyUrl;
+  }
+
+  public void setNotifyUrl(String notifyUrl) {
+    this.notifyUrl = notifyUrl;
+  }
+
+  public AggregatePayOrderReqDTO fundProcessType(FundProcessTypeEnum fundProcessType) {
+    this.fundProcessType = fundProcessType;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;需同时传入divideDetail&lt;/p&gt; 可选项如下: DELAY_SETTLE:需要分账 REAL_TIME:不需要分账 REAL_TIME_DIVIDE:实时分账 
+   * @return fundProcessType
+  **/
+
+  public FundProcessTypeEnum getFundProcessType() {
+    return fundProcessType;
+  }
+
+  public void setFundProcessType(FundProcessTypeEnum fundProcessType) {
+    this.fundProcessType = fundProcessType;
+  }
+
+  public AggregatePayOrderReqDTO divideAccountInfo(DivideAccountInfoDTO divideAccountInfo) {
+    this.divideAccountInfo = divideAccountInfo;
+    return this;
+  }
+
+   /**
+   * Get divideAccountInfo
+   * @return divideAccountInfo
+  **/
+
+  public DivideAccountInfoDTO getDivideAccountInfo() {
+    return divideAccountInfo;
+  }
+
+  public void setDivideAccountInfo(DivideAccountInfoDTO divideAccountInfo) {
+    this.divideAccountInfo = divideAccountInfo;
+  }
+
+  public AggregatePayOrderReqDTO ypAccountBookNo(String ypAccountBookNo) {
+    this.ypAccountBookNo = ypAccountBookNo;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;记账簿编号&lt;br /&gt;支持收款至预收账户&lt;br /&gt;记账簿编号不为空时，fundProcessType必须上送REAL_TIM&lt;/p&gt;
+   * @return ypAccountBookNo
+  **/
+
+  public String getYpAccountBookNo() {
+    return ypAccountBookNo;
+  }
+
+  public void setYpAccountBookNo(String ypAccountBookNo) {
+    this.ypAccountBookNo = ypAccountBookNo;
+  }
+
+  public AggregatePayOrderReqDTO feeSubsidy(FeeSubsidyDTO feeSubsidy) {
+    this.feeSubsidy = feeSubsidy;
+    return this;
+  }
+
+   /**
+   * Get feeSubsidy
+   * @return feeSubsidy
+  **/
+
+  public FeeSubsidyDTO getFeeSubsidy() {
+    return feeSubsidy;
+  }
+
+  public void setFeeSubsidy(FeeSubsidyDTO feeSubsidy) {
+    this.feeSubsidy = feeSubsidy;
+  }
+
+  public AggregatePayOrderReqDTO csUrl(String csUrl) {
+    this.csUrl = csUrl;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;清算成功服务器回调地址，不传则不通知。详见&lt;a href&#x3D;\&quot;https://open.yeepay.com/docs/products/ptssfk/spis/5fc9ae6896818f001b300bce\&quot;&gt;清算结果通知&lt;/a&gt;&lt;/p&gt;
+   * @return csUrl
+  **/
+
+  public String getCsUrl() {
+    return csUrl;
+  }
+
+  public void setCsUrl(String csUrl) {
+    this.csUrl = csUrl;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AggregatePayOrderReqDTO aggregatePayOrderReqDTO = (AggregatePayOrderReqDTO) o;
+    return ObjectUtils.equals(this.merchantInfo, aggregatePayOrderReqDTO.merchantInfo) &&
+    ObjectUtils.equals(this.mchTransactionNo, aggregatePayOrderReqDTO.mchTransactionNo) &&
+    ObjectUtils.equals(this.mchOrderNo, aggregatePayOrderReqDTO.mchOrderNo) &&
+    ObjectUtils.equals(this.amount, aggregatePayOrderReqDTO.amount) &&
+    ObjectUtils.equals(this.payType, aggregatePayOrderReqDTO.payType) &&
+    ObjectUtils.equals(this.payLimit, aggregatePayOrderReqDTO.payLimit) &&
+    ObjectUtils.equals(this.wechatPayParams, aggregatePayOrderReqDTO.wechatPayParams) &&
+    ObjectUtils.equals(this.aliPayParams, aggregatePayOrderReqDTO.aliPayParams) &&
+    ObjectUtils.equals(this.scene, aggregatePayOrderReqDTO.scene) &&
+    ObjectUtils.equals(this.remark, aggregatePayOrderReqDTO.remark) &&
+    ObjectUtils.equals(this.productCoupons, aggregatePayOrderReqDTO.productCoupons) &&
+    ObjectUtils.equals(this.ypPromotions, aggregatePayOrderReqDTO.ypPromotions) &&
+    ObjectUtils.equals(this.expiredTime, aggregatePayOrderReqDTO.expiredTime) &&
+    ObjectUtils.equals(this.riskInfo, aggregatePayOrderReqDTO.riskInfo) &&
+    ObjectUtils.equals(this.terminalDevice, aggregatePayOrderReqDTO.terminalDevice) &&
+    ObjectUtils.equals(this.notifyUrl, aggregatePayOrderReqDTO.notifyUrl) &&
+    ObjectUtils.equals(this.fundProcessType, aggregatePayOrderReqDTO.fundProcessType) &&
+    ObjectUtils.equals(this.divideAccountInfo, aggregatePayOrderReqDTO.divideAccountInfo) &&
+    ObjectUtils.equals(this.ypAccountBookNo, aggregatePayOrderReqDTO.ypAccountBookNo) &&
+    ObjectUtils.equals(this.feeSubsidy, aggregatePayOrderReqDTO.feeSubsidy) &&
+    ObjectUtils.equals(this.csUrl, aggregatePayOrderReqDTO.csUrl);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(merchantInfo, mchTransactionNo, mchOrderNo, amount, payType, payLimit, wechatPayParams, aliPayParams, scene, remark, productCoupons, ypPromotions, expiredTime, riskInfo, terminalDevice, notifyUrl, fundProcessType, divideAccountInfo, ypAccountBookNo, feeSubsidy, csUrl);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AggregatePayOrderReqDTO {\n");
+    
+    sb.append("    merchantInfo: ").append(toIndentedString(merchantInfo)).append("\n");
+    sb.append("    mchTransactionNo: ").append(toIndentedString(mchTransactionNo)).append("\n");
+    sb.append("    mchOrderNo: ").append(toIndentedString(mchOrderNo)).append("\n");
+    sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
+    sb.append("    payType: ").append(toIndentedString(payType)).append("\n");
+    sb.append("    payLimit: ").append(toIndentedString(payLimit)).append("\n");
+    sb.append("    wechatPayParams: ").append(toIndentedString(wechatPayParams)).append("\n");
+    sb.append("    aliPayParams: ").append(toIndentedString(aliPayParams)).append("\n");
+    sb.append("    scene: ").append(toIndentedString(scene)).append("\n");
+    sb.append("    remark: ").append(toIndentedString(remark)).append("\n");
+    sb.append("    productCoupons: ").append(toIndentedString(productCoupons)).append("\n");
+    sb.append("    ypPromotions: ").append(toIndentedString(ypPromotions)).append("\n");
+    sb.append("    expiredTime: ").append(toIndentedString(expiredTime)).append("\n");
+    sb.append("    riskInfo: ").append(toIndentedString(riskInfo)).append("\n");
+    sb.append("    terminalDevice: ").append(toIndentedString(terminalDevice)).append("\n");
+    sb.append("    notifyUrl: ").append(toIndentedString(notifyUrl)).append("\n");
+    sb.append("    fundProcessType: ").append(toIndentedString(fundProcessType)).append("\n");
+    sb.append("    divideAccountInfo: ").append(toIndentedString(divideAccountInfo)).append("\n");
+    sb.append("    ypAccountBookNo: ").append(toIndentedString(ypAccountBookNo)).append("\n");
+    sb.append("    feeSubsidy: ").append(toIndentedString(feeSubsidy)).append("\n");
+    sb.append("    csUrl: ").append(toIndentedString(csUrl)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AliChannelPromotion.java

@@ -0,0 +1,374 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 支付宝渠道营销信息
+ */
+public class AliChannelPromotion implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Juh2d7AgvoSr8lxNFIfcLmznnCc\">优惠券唯一标识</div> </div>
+   */
+  @JsonProperty("id")
+  private String id = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VA7sd6lQRoMNmRxLFuycV9jLnPb\">优惠券显示名称</div> </div>
+   */
+  @JsonProperty("name")
+  private String name = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("type")
+  private String type = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-FAMMdUsJ7ous4Tx0oPpc2rAFnGb\">单位：元， <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ANnUdMPDooZlxkxUm1IcfXLwnve\">金额，最多 10 位整数、2 位小数</div> </div> </div> </div>
+   */
+  @JsonProperty("promotionAmount")
+  private String promotionAmount = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-FAMMdUsJ7ous4Tx0oPpc2rAFnGb\">单位：元， <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ANnUdMPDooZlxkxUm1IcfXLwnve\">金额，最多 10 位整数、2 位小数</div> </div> </div> </div>
+   */
+  @JsonProperty("merchantContribute")
+  private String merchantContribute = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-C0GXdYnS4oNoVWxaHracRvwyn9b\">其他方承担的优惠部分，单位：元，</div> <div class=\"ace-line ace-line old-record-id-C0GXdYnS4oNoVWxaHracRvwyn9b\"> <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-THO8dPKtYoRn0kxkOL7cWLognYd\">金额，最多 10 位整数、2 位小数</div> </div> </div> </div>
+   */
+  @JsonProperty("otherContribute")
+  private String otherContribute = null;
+
+  /**
+   * <p>Json数组字符串，详见下面</p>
+   */
+  @JsonProperty("goodsDetails")
+  private List<AliChannelPromotionGoodsDetail> goodsDetails = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-TjJUd4nfdoEGdExWabRcTYyCnag\&quot;&gt;优惠备注信息&lt;/div&gt; &lt;/div&gt;
+   */
+  @JsonProperty("memo")
+  private String memo = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot; old-record-id-LmOZdfNZros7tcxGkgIcpd0knEb\&quot;&gt;优惠适用范围&lt;/div&gt; &lt;/div&gt; 可选项如下: ALIPAY_FIX_VOUCHER:支付宝全场代金券 ALIPAY_DISCOUNT_VOUCHER:支付宝折扣券 ALIPAY_ITEM_VOUCHER:支付宝单品优惠券 ALIPAY_CASH_VOUCHER:支付宝现金抵价券 ALIPAY_BIZ_VOUCHER:支付宝商家全场券 
+   */
+  public enum PromotionScopeEnum {
+    FIX_VOUCHER("ALIPAY_FIX_VOUCHER"),
+    
+    DISCOUNT_VOUCHER("ALIPAY_DISCOUNT_VOUCHER"),
+    
+    ITEM_VOUCHER("ALIPAY_ITEM_VOUCHER"),
+    
+    CASH_VOUCHER("ALIPAY_CASH_VOUCHER"),
+    
+    BIZ_VOUCHER("ALIPAY_BIZ_VOUCHER");
+
+    private String value;
+
+    PromotionScopeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PromotionScopeEnum fromValue(String text) {
+      for (PromotionScopeEnum b : PromotionScopeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot; old-record-id-LmOZdfNZros7tcxGkgIcpd0knEb\&quot;&gt;优惠适用范围&lt;/div&gt; &lt;/div&gt; 可选项如下: ALIPAY_FIX_VOUCHER:支付宝全场代金券 ALIPAY_DISCOUNT_VOUCHER:支付宝折扣券 ALIPAY_ITEM_VOUCHER:支付宝单品优惠券 ALIPAY_CASH_VOUCHER:支付宝现金抵价券 ALIPAY_BIZ_VOUCHER:支付宝商家全场券 
+   */
+  @JsonProperty("promotionScope")
+  private PromotionScopeEnum promotionScope = null;
+
+  public AliChannelPromotion id(String id) {
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-Juh2d7AgvoSr8lxNFIfcLmznnCc\&quot;&gt;优惠券唯一标识&lt;/div&gt; &lt;/div&gt;
+   * @return id
+  **/
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public AliChannelPromotion name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-VA7sd6lQRoMNmRxLFuycV9jLnPb\&quot;&gt;优惠券显示名称&lt;/div&gt; &lt;/div&gt;
+   * @return name
+  **/
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public AliChannelPromotion type(String type) {
+    this.type = type;
+    return this;
+  }
+
+   /**
+   * Get type
+   * @return type
+  **/
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  public AliChannelPromotion promotionAmount(String promotionAmount) {
+    this.promotionAmount = promotionAmount;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-FAMMdUsJ7ous4Tx0oPpc2rAFnGb\&quot;&gt;单位：元， &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-ANnUdMPDooZlxkxUm1IcfXLwnve\&quot;&gt;金额，最多 10 位整数、2 位小数&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; &lt;/div&gt;
+   * @return promotionAmount
+  **/
+
+  public String getPromotionAmount() {
+    return promotionAmount;
+  }
+
+  public void setPromotionAmount(String promotionAmount) {
+    this.promotionAmount = promotionAmount;
+  }
+
+  public AliChannelPromotion merchantContribute(String merchantContribute) {
+    this.merchantContribute = merchantContribute;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-FAMMdUsJ7ous4Tx0oPpc2rAFnGb\&quot;&gt;单位：元， &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-ANnUdMPDooZlxkxUm1IcfXLwnve\&quot;&gt;金额，最多 10 位整数、2 位小数&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; &lt;/div&gt;
+   * @return merchantContribute
+  **/
+
+  public String getMerchantContribute() {
+    return merchantContribute;
+  }
+
+  public void setMerchantContribute(String merchantContribute) {
+    this.merchantContribute = merchantContribute;
+  }
+
+  public AliChannelPromotion otherContribute(String otherContribute) {
+    this.otherContribute = otherContribute;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-C0GXdYnS4oNoVWxaHracRvwyn9b\&quot;&gt;其他方承担的优惠部分，单位：元，&lt;/div&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-C0GXdYnS4oNoVWxaHracRvwyn9b\&quot;&gt; &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-THO8dPKtYoRn0kxkOL7cWLognYd\&quot;&gt;金额，最多 10 位整数、2 位小数&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; &lt;/div&gt;
+   * @return otherContribute
+  **/
+
+  public String getOtherContribute() {
+    return otherContribute;
+  }
+
+  public void setOtherContribute(String otherContribute) {
+    this.otherContribute = otherContribute;
+  }
+
+  public AliChannelPromotion goodsDetails(List<AliChannelPromotionGoodsDetail> goodsDetails) {
+    this.goodsDetails = goodsDetails;
+    return this;
+  }
+
+  public AliChannelPromotion addGoodsDetailsItem(AliChannelPromotionGoodsDetail goodsDetailsItem) {
+    if (this.goodsDetails == null) {
+      this.goodsDetails = new ArrayList<>();
+    }
+    this.goodsDetails.add(goodsDetailsItem);
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;Json数组字符串，详见下面&lt;/p&gt;
+   * @return goodsDetails
+  **/
+
+  public List<AliChannelPromotionGoodsDetail> getGoodsDetails() {
+    return goodsDetails;
+  }
+
+  public void setGoodsDetails(List<AliChannelPromotionGoodsDetail> goodsDetails) {
+    this.goodsDetails = goodsDetails;
+  }
+
+  public AliChannelPromotion memo(String memo) {
+    this.memo = memo;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-TjJUd4nfdoEGdExWabRcTYyCnag\&quot;&gt;优惠备注信息&lt;/div&gt; &lt;/div&gt;
+   * @return memo
+  **/
+
+  public String getMemo() {
+    return memo;
+  }
+
+  public void setMemo(String memo) {
+    this.memo = memo;
+  }
+
+  public AliChannelPromotion promotionScope(PromotionScopeEnum promotionScope) {
+    this.promotionScope = promotionScope;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot; old-record-id-LmOZdfNZros7tcxGkgIcpd0knEb\&quot;&gt;优惠适用范围&lt;/div&gt; &lt;/div&gt; 可选项如下: ALIPAY_FIX_VOUCHER:支付宝全场代金券 ALIPAY_DISCOUNT_VOUCHER:支付宝折扣券 ALIPAY_ITEM_VOUCHER:支付宝单品优惠券 ALIPAY_CASH_VOUCHER:支付宝现金抵价券 ALIPAY_BIZ_VOUCHER:支付宝商家全场券 
+   * @return promotionScope
+  **/
+
+  public PromotionScopeEnum getPromotionScope() {
+    return promotionScope;
+  }
+
+  public void setPromotionScope(PromotionScopeEnum promotionScope) {
+    this.promotionScope = promotionScope;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AliChannelPromotion aliChannelPromotion = (AliChannelPromotion) o;
+    return ObjectUtils.equals(this.id, aliChannelPromotion.id) &&
+    ObjectUtils.equals(this.name, aliChannelPromotion.name) &&
+    ObjectUtils.equals(this.type, aliChannelPromotion.type) &&
+    ObjectUtils.equals(this.promotionAmount, aliChannelPromotion.promotionAmount) &&
+    ObjectUtils.equals(this.merchantContribute, aliChannelPromotion.merchantContribute) &&
+    ObjectUtils.equals(this.otherContribute, aliChannelPromotion.otherContribute) &&
+    ObjectUtils.equals(this.goodsDetails, aliChannelPromotion.goodsDetails) &&
+    ObjectUtils.equals(this.memo, aliChannelPromotion.memo) &&
+    ObjectUtils.equals(this.promotionScope, aliChannelPromotion.promotionScope);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(id, name, type, promotionAmount, merchantContribute, otherContribute, goodsDetails, memo, promotionScope);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AliChannelPromotion {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    promotionAmount: ").append(toIndentedString(promotionAmount)).append("\n");
+    sb.append("    merchantContribute: ").append(toIndentedString(merchantContribute)).append("\n");
+    sb.append("    otherContribute: ").append(toIndentedString(otherContribute)).append("\n");
+    sb.append("    goodsDetails: ").append(toIndentedString(goodsDetails)).append("\n");
+    sb.append("    memo: ").append(toIndentedString(memo)).append("\n");
+    sb.append("    promotionScope: ").append(toIndentedString(promotionScope)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AliChannelPromotionGoodsDetail.java

@@ -0,0 +1,196 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 支付宝商品详情
+ */
+public class AliChannelPromotionGoodsDetail implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-P36GdBBXcop1EixCthcc2suknFf\">商品唯一标识</div> </div>
+   */
+  @JsonProperty("goodsId")
+  private String goodsId = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VizmdGLCEo2sLLxqttAcZGOnnGd\">商品附加信息</div> </div>
+   */
+  @JsonProperty("goodsName")
+  private String goodsName = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VizmdGLCEo2sLLxqttAcZGOnnGd\"> <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-NSgCdQmPqojpLHxU0iHcdlMJnPd\">该商品享受的优惠金额，单位：元，</div> <div class=\"ace-line ace-line old-record-id-NSgCdQmPqojpLHxU0iHcdlMJnPd\"> <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-OHaqd3rP2oareKx1NfHc3Sh2nsb\">金额，最多 10 位整数、2 位小数</div> </div> </div> </div> </div> </div>
+   */
+  @JsonProperty("discountAmount")
+  private String discountAmount = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("voucherId")
+  private String voucherId = null;
+
+  public AliChannelPromotionGoodsDetail goodsId(String goodsId) {
+    this.goodsId = goodsId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-P36GdBBXcop1EixCthcc2suknFf\">商品唯一标识</div> </div>
+   * @return goodsId
+  **/
+
+  public String getGoodsId() {
+    return goodsId;
+  }
+
+  public void setGoodsId(String goodsId) {
+    this.goodsId = goodsId;
+  }
+
+  public AliChannelPromotionGoodsDetail goodsName(String goodsName) {
+    this.goodsName = goodsName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VizmdGLCEo2sLLxqttAcZGOnnGd\">商品附加信息</div> </div>
+   * @return goodsName
+  **/
+
+  public String getGoodsName() {
+    return goodsName;
+  }
+
+  public void setGoodsName(String goodsName) {
+    this.goodsName = goodsName;
+  }
+
+  public AliChannelPromotionGoodsDetail discountAmount(String discountAmount) {
+    this.discountAmount = discountAmount;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VizmdGLCEo2sLLxqttAcZGOnnGd\"> <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-NSgCdQmPqojpLHxU0iHcdlMJnPd\">该商品享受的优惠金额，单位：元，</div> <div class=\"ace-line ace-line old-record-id-NSgCdQmPqojpLHxU0iHcdlMJnPd\"> <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-OHaqd3rP2oareKx1NfHc3Sh2nsb\">金额，最多 10 位整数、2 位小数</div> </div> </div> </div> </div> </div>
+   * @return discountAmount
+  **/
+
+  public String getDiscountAmount() {
+    return discountAmount;
+  }
+
+  public void setDiscountAmount(String discountAmount) {
+    this.discountAmount = discountAmount;
+  }
+
+  public AliChannelPromotionGoodsDetail voucherId(String voucherId) {
+    this.voucherId = voucherId;
+    return this;
+  }
+
+   /**
+   * Get voucherId
+   * @return voucherId
+  **/
+
+  public String getVoucherId() {
+    return voucherId;
+  }
+
+  public void setVoucherId(String voucherId) {
+    this.voucherId = voucherId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AliChannelPromotionGoodsDetail aliChannelPromotion$GoodsDetail = (AliChannelPromotionGoodsDetail) o;
+    return ObjectUtils.equals(this.goodsId, aliChannelPromotion$GoodsDetail.goodsId) &&
+    ObjectUtils.equals(this.goodsName, aliChannelPromotion$GoodsDetail.goodsName) &&
+    ObjectUtils.equals(this.discountAmount, aliChannelPromotion$GoodsDetail.discountAmount) &&
+    ObjectUtils.equals(this.voucherId, aliChannelPromotion$GoodsDetail.voucherId);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(goodsId, goodsName, discountAmount, voucherId);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AliChannelPromotionGoodsDetail {\n");
+    
+    sb.append("    goodsId: ").append(toIndentedString(goodsId)).append("\n");
+    sb.append("    goodsName: ").append(toIndentedString(goodsName)).append("\n");
+    sb.append("    discountAmount: ").append(toIndentedString(discountAmount)).append("\n");
+    sb.append("    voucherId: ").append(toIndentedString(voucherId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AliGoodsDetail.java

@@ -0,0 +1,222 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 【描述】订单包含的商品列表信息
+ */
+public class AliGoodsDetail implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>【描述】商品的编号，该参数传入支付券上绑定商品goods_id，倘若无支付券需要消费，该字段传入商品最小粒度的商品 ID（如：若商品有 sku 粒度，则传商户 sku 粒度的ID）。<br />当前接口的extendParams.tradeComponentOrderId</p> <p>字段不为空时，该字段需与交易组件订单参数保持一致</p>
+   */
+  @JsonProperty("goodsId")
+  private String goodsId = null;
+
+  /**
+   * <div> <pre>商品名称</pre> </div>
+   */
+  @JsonProperty("goodsName")
+  private String goodsName = null;
+
+  /**
+   * <p>【描述】商品单价，单位为元</p>
+   */
+  @JsonProperty("price")
+  private String price = null;
+
+  /**
+   * <p>【描述】商品数量，支持小数，精确到小数点后两位</p>
+   */
+  @JsonProperty("quantity")
+  private String quantity = null;
+
+  /**
+   * <p>支付宝定义的统一商品编号</p>
+   */
+  @JsonProperty("alipayGoodsId")
+  private String alipayGoodsId = null;
+
+  public AliGoodsDetail goodsId(String goodsId) {
+    this.goodsId = goodsId;
+    return this;
+  }
+
+   /**
+   * <p>【描述】商品的编号，该参数传入支付券上绑定商品goods_id，倘若无支付券需要消费，该字段传入商品最小粒度的商品 ID（如：若商品有 sku 粒度，则传商户 sku 粒度的ID）。<br />当前接口的extendParams.tradeComponentOrderId</p> <p>字段不为空时，该字段需与交易组件订单参数保持一致</p>
+   * @return goodsId
+  **/
+
+  public String getGoodsId() {
+    return goodsId;
+  }
+
+  public void setGoodsId(String goodsId) {
+    this.goodsId = goodsId;
+  }
+
+  public AliGoodsDetail goodsName(String goodsName) {
+    this.goodsName = goodsName;
+    return this;
+  }
+
+   /**
+   * <div> <pre>商品名称</pre> </div>
+   * @return goodsName
+  **/
+
+  public String getGoodsName() {
+    return goodsName;
+  }
+
+  public void setGoodsName(String goodsName) {
+    this.goodsName = goodsName;
+  }
+
+  public AliGoodsDetail price(String price) {
+    this.price = price;
+    return this;
+  }
+
+   /**
+   * <p>【描述】商品单价，单位为元</p>
+   * @return price
+  **/
+
+  public String getPrice() {
+    return price;
+  }
+
+  public void setPrice(String price) {
+    this.price = price;
+  }
+
+  public AliGoodsDetail quantity(String quantity) {
+    this.quantity = quantity;
+    return this;
+  }
+
+   /**
+   * <p>【描述】商品数量，支持小数，精确到小数点后两位</p>
+   * @return quantity
+  **/
+
+  public String getQuantity() {
+    return quantity;
+  }
+
+  public void setQuantity(String quantity) {
+    this.quantity = quantity;
+  }
+
+  public AliGoodsDetail alipayGoodsId(String alipayGoodsId) {
+    this.alipayGoodsId = alipayGoodsId;
+    return this;
+  }
+
+   /**
+   * <p>支付宝定义的统一商品编号</p>
+   * @return alipayGoodsId
+  **/
+
+  public String getAlipayGoodsId() {
+    return alipayGoodsId;
+  }
+
+  public void setAlipayGoodsId(String alipayGoodsId) {
+    this.alipayGoodsId = alipayGoodsId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AliGoodsDetail aliGoodsDetail = (AliGoodsDetail) o;
+    return ObjectUtils.equals(this.goodsId, aliGoodsDetail.goodsId) &&
+    ObjectUtils.equals(this.goodsName, aliGoodsDetail.goodsName) &&
+    ObjectUtils.equals(this.price, aliGoodsDetail.price) &&
+    ObjectUtils.equals(this.quantity, aliGoodsDetail.quantity) &&
+    ObjectUtils.equals(this.alipayGoodsId, aliGoodsDetail.alipayGoodsId);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(goodsId, goodsName, price, quantity, alipayGoodsId);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AliGoodsDetail {\n");
+    
+    sb.append("    goodsId: ").append(toIndentedString(goodsId)).append("\n");
+    sb.append("    goodsName: ").append(toIndentedString(goodsName)).append("\n");
+    sb.append("    price: ").append(toIndentedString(price)).append("\n");
+    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    alipayGoodsId: ").append(toIndentedString(alipayGoodsId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AliMarketQueryResponseDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 响应结果
+ */
+public class AliMarketQueryResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 营销内容列表花呗支付渠道信息、银行卡渠道优惠信息等JSON格式
+   */
+  @JsonProperty("channelInfoList")
+  private String channelInfoList = null;
+
+  public AliMarketQueryResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * 
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public AliMarketQueryResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * 
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public AliMarketQueryResponseDTO channelInfoList(String channelInfoList) {
+    this.channelInfoList = channelInfoList;
+    return this;
+  }
+
+   /**
+   * 营销内容列表花呗支付渠道信息、银行卡渠道优惠信息等JSON格式
+   * @return channelInfoList
+  **/
+
+  public String getChannelInfoList() {
+    return channelInfoList;
+  }
+
+  public void setChannelInfoList(String channelInfoList) {
+    this.channelInfoList = channelInfoList;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AliMarketQueryResponseDTO aliMarketQueryResponseDTO = (AliMarketQueryResponseDTO) o;
+    return ObjectUtils.equals(this.code, aliMarketQueryResponseDTO.code) &&
+    ObjectUtils.equals(this.message, aliMarketQueryResponseDTO.message) &&
+    ObjectUtils.equals(this.channelInfoList, aliMarketQueryResponseDTO.channelInfoList);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, channelInfoList);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AliMarketQueryResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    channelInfoList: ").append(toIndentedString(channelInfoList)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AliPayParamsDTO.java

@@ -0,0 +1,524 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 支付宝支付参数
+ */
+public class AliPayParamsDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div> <pre>小程序支付中，商户实际经营主体的小程序应用的opAppId</pre> </div>
+   */
+  @JsonProperty("opAppId")
+  private String opAppId = null;
+
+  /**
+   * <div> <pre>买家的支付宝唯一用户号 </pre> </div>
+   */
+  @JsonProperty("buyerId")
+  private String buyerId = null;
+
+  /**
+   * <p>【描述】订单标题。<br />注意：不可使用特殊字符，如 /，=，& 等。</p>
+   */
+  @JsonProperty("subject")
+  private String subject = null;
+
+  /**
+   * <p>【描述】订单包含的商品列表信息，json格式。</p>
+   */
+  @JsonProperty("goodsDetails")
+  private List<AliGoodsDetail> goodsDetails = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("extendParams")
+  private AliPayParamsDTOExtendParams extendParams = null;
+
+  /**
+   * &lt;p&gt;商户传入业务信息，具体值要和支付宝约定，应用于安全，营销等参数直传场景&lt;/p&gt;
+   */
+  @JsonProperty("aliBusinessParams")
+  private String aliBusinessParams = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("extUserInfo")
+  private AliPayParamsDTOExtUserInfo extUserInfo = null;
+
+  /**
+   * &lt;p&gt;优惠明细参数，通过此属性补充营销参数。注：仅与支付宝协商后可用。&lt;/p&gt;
+   */
+  @JsonProperty("promoParams")
+  private String promoParams = null;
+
+  /**
+   * &lt;p&gt;指商户创建门店后支付宝生成的门店ID&lt;/p&gt;
+   */
+  @JsonProperty("alipayStoreId")
+  private String alipayStoreId = null;
+
+  /**
+   * &lt;p&gt;指商户创建门店时输入的门店编号&lt;/p&gt;
+   */
+  @JsonProperty("storeId")
+  private String storeId = null;
+
+  /**
+   * &lt;p&gt;商户原始订单号&lt;/p&gt;
+   */
+  @JsonProperty("merchantOrderNo")
+  private String merchantOrderNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("areaCode")
+  private String areaCode = null;
+
+  /**
+   * &lt;p&gt;商户操作员编号&lt;/p&gt;
+   */
+  @JsonProperty("operatorId")
+  private String operatorId = null;
+
+  /**
+   * &lt;p&gt;指定报备商户号&lt;/p&gt;
+   */
+  @JsonProperty("subMerchantNo")
+  private String subMerchantNo = null;
+
+  /**
+   * &lt;p&gt;是否企业支付&lt;br /&gt;如需要返回支付宝企业支付信息时传入&lt;/p&gt; 可选项如下: Y:是 N:否 
+   */
+  public enum IsEnterprisePayEnum {
+    Y("Y"),
+    
+    N("N");
+
+    private String value;
+
+    IsEnterprisePayEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static IsEnterprisePayEnum fromValue(String text) {
+      for (IsEnterprisePayEnum b : IsEnterprisePayEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   * &lt;p&gt;是否企业支付&lt;br /&gt;如需要返回支付宝企业支付信息时传入&lt;/p&gt; 可选项如下: Y:是 N:否 
+   */
+  @JsonProperty("isEnterprisePay")
+  private IsEnterprisePayEnum isEnterprisePay = null;
+
+  public AliPayParamsDTO opAppId(String opAppId) {
+    this.opAppId = opAppId;
+    return this;
+  }
+
+   /**
+   * &lt;div&gt; &lt;pre&gt;小程序支付中，商户实际经营主体的小程序应用的opAppId&lt;/pre&gt; &lt;/div&gt;
+   * @return opAppId
+  **/
+
+  public String getOpAppId() {
+    return opAppId;
+  }
+
+  public void setOpAppId(String opAppId) {
+    this.opAppId = opAppId;
+  }
+
+  public AliPayParamsDTO buyerId(String buyerId) {
+    this.buyerId = buyerId;
+    return this;
+  }
+
+   /**
+   * &lt;div&gt; &lt;pre&gt;买家的支付宝唯一用户号 &lt;/pre&gt; &lt;/div&gt;
+   * @return buyerId
+  **/
+
+  public String getBuyerId() {
+    return buyerId;
+  }
+
+  public void setBuyerId(String buyerId) {
+    this.buyerId = buyerId;
+  }
+
+  public AliPayParamsDTO subject(String subject) {
+    this.subject = subject;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;【描述】订单标题。&lt;br /&gt;注意：不可使用特殊字符，如 /，&#x3D;，&amp;amp; 等。&lt;/p&gt;
+   * @return subject
+  **/
+
+  public String getSubject() {
+    return subject;
+  }
+
+  public void setSubject(String subject) {
+    this.subject = subject;
+  }
+
+  public AliPayParamsDTO goodsDetails(List<AliGoodsDetail> goodsDetails) {
+    this.goodsDetails = goodsDetails;
+    return this;
+  }
+
+  public AliPayParamsDTO addGoodsDetailsItem(AliGoodsDetail goodsDetailsItem) {
+    if (this.goodsDetails == null) {
+      this.goodsDetails = new ArrayList<>();
+    }
+    this.goodsDetails.add(goodsDetailsItem);
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;【描述】订单包含的商品列表信息，json格式。&lt;/p&gt;
+   * @return goodsDetails
+  **/
+
+  public List<AliGoodsDetail> getGoodsDetails() {
+    return goodsDetails;
+  }
+
+  public void setGoodsDetails(List<AliGoodsDetail> goodsDetails) {
+    this.goodsDetails = goodsDetails;
+  }
+
+  public AliPayParamsDTO extendParams(AliPayParamsDTOExtendParams extendParams) {
+    this.extendParams = extendParams;
+    return this;
+  }
+
+   /**
+   * Get extendParams
+   * @return extendParams
+  **/
+
+  public AliPayParamsDTOExtendParams getExtendParams() {
+    return extendParams;
+  }
+
+  public void setExtendParams(AliPayParamsDTOExtendParams extendParams) {
+    this.extendParams = extendParams;
+  }
+
+  public AliPayParamsDTO aliBusinessParams(String aliBusinessParams) {
+    this.aliBusinessParams = aliBusinessParams;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;商户传入业务信息，具体值要和支付宝约定，应用于安全，营销等参数直传场景&lt;/p&gt;
+   * @return aliBusinessParams
+  **/
+
+  public String getAliBusinessParams() {
+    return aliBusinessParams;
+  }
+
+  public void setAliBusinessParams(String aliBusinessParams) {
+    this.aliBusinessParams = aliBusinessParams;
+  }
+
+  public AliPayParamsDTO extUserInfo(AliPayParamsDTOExtUserInfo extUserInfo) {
+    this.extUserInfo = extUserInfo;
+    return this;
+  }
+
+   /**
+   * Get extUserInfo
+   * @return extUserInfo
+  **/
+
+  public AliPayParamsDTOExtUserInfo getExtUserInfo() {
+    return extUserInfo;
+  }
+
+  public void setExtUserInfo(AliPayParamsDTOExtUserInfo extUserInfo) {
+    this.extUserInfo = extUserInfo;
+  }
+
+  public AliPayParamsDTO promoParams(String promoParams) {
+    this.promoParams = promoParams;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;优惠明细参数，通过此属性补充营销参数。注：仅与支付宝协商后可用。&lt;/p&gt;
+   * @return promoParams
+  **/
+
+  public String getPromoParams() {
+    return promoParams;
+  }
+
+  public void setPromoParams(String promoParams) {
+    this.promoParams = promoParams;
+  }
+
+  public AliPayParamsDTO alipayStoreId(String alipayStoreId) {
+    this.alipayStoreId = alipayStoreId;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;指商户创建门店后支付宝生成的门店ID&lt;/p&gt;
+   * @return alipayStoreId
+  **/
+
+  public String getAlipayStoreId() {
+    return alipayStoreId;
+  }
+
+  public void setAlipayStoreId(String alipayStoreId) {
+    this.alipayStoreId = alipayStoreId;
+  }
+
+  public AliPayParamsDTO storeId(String storeId) {
+    this.storeId = storeId;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;指商户创建门店时输入的门店编号&lt;/p&gt;
+   * @return storeId
+  **/
+
+  public String getStoreId() {
+    return storeId;
+  }
+
+  public void setStoreId(String storeId) {
+    this.storeId = storeId;
+  }
+
+  public AliPayParamsDTO merchantOrderNo(String merchantOrderNo) {
+    this.merchantOrderNo = merchantOrderNo;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;商户原始订单号&lt;/p&gt;
+   * @return merchantOrderNo
+  **/
+
+  public String getMerchantOrderNo() {
+    return merchantOrderNo;
+  }
+
+  public void setMerchantOrderNo(String merchantOrderNo) {
+    this.merchantOrderNo = merchantOrderNo;
+  }
+
+  public AliPayParamsDTO areaCode(String areaCode) {
+    this.areaCode = areaCode;
+    return this;
+  }
+
+   /**
+   * Get areaCode
+   * @return areaCode
+  **/
+
+  public String getAreaCode() {
+    return areaCode;
+  }
+
+  public void setAreaCode(String areaCode) {
+    this.areaCode = areaCode;
+  }
+
+  public AliPayParamsDTO operatorId(String operatorId) {
+    this.operatorId = operatorId;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;商户操作员编号&lt;/p&gt;
+   * @return operatorId
+  **/
+
+  public String getOperatorId() {
+    return operatorId;
+  }
+
+  public void setOperatorId(String operatorId) {
+    this.operatorId = operatorId;
+  }
+
+  public AliPayParamsDTO subMerchantNo(String subMerchantNo) {
+    this.subMerchantNo = subMerchantNo;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;指定报备商户号&lt;/p&gt;
+   * @return subMerchantNo
+  **/
+
+  public String getSubMerchantNo() {
+    return subMerchantNo;
+  }
+
+  public void setSubMerchantNo(String subMerchantNo) {
+    this.subMerchantNo = subMerchantNo;
+  }
+
+  public AliPayParamsDTO isEnterprisePay(IsEnterprisePayEnum isEnterprisePay) {
+    this.isEnterprisePay = isEnterprisePay;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;是否企业支付&lt;br /&gt;如需要返回支付宝企业支付信息时传入&lt;/p&gt; 可选项如下: Y:是 N:否 
+   * @return isEnterprisePay
+  **/
+
+  public IsEnterprisePayEnum getIsEnterprisePay() {
+    return isEnterprisePay;
+  }
+
+  public void setIsEnterprisePay(IsEnterprisePayEnum isEnterprisePay) {
+    this.isEnterprisePay = isEnterprisePay;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AliPayParamsDTO aliPayParamsDTO = (AliPayParamsDTO) o;
+    return ObjectUtils.equals(this.opAppId, aliPayParamsDTO.opAppId) &&
+    ObjectUtils.equals(this.buyerId, aliPayParamsDTO.buyerId) &&
+    ObjectUtils.equals(this.subject, aliPayParamsDTO.subject) &&
+    ObjectUtils.equals(this.goodsDetails, aliPayParamsDTO.goodsDetails) &&
+    ObjectUtils.equals(this.extendParams, aliPayParamsDTO.extendParams) &&
+    ObjectUtils.equals(this.aliBusinessParams, aliPayParamsDTO.aliBusinessParams) &&
+    ObjectUtils.equals(this.extUserInfo, aliPayParamsDTO.extUserInfo) &&
+    ObjectUtils.equals(this.promoParams, aliPayParamsDTO.promoParams) &&
+    ObjectUtils.equals(this.alipayStoreId, aliPayParamsDTO.alipayStoreId) &&
+    ObjectUtils.equals(this.storeId, aliPayParamsDTO.storeId) &&
+    ObjectUtils.equals(this.merchantOrderNo, aliPayParamsDTO.merchantOrderNo) &&
+    ObjectUtils.equals(this.areaCode, aliPayParamsDTO.areaCode) &&
+    ObjectUtils.equals(this.operatorId, aliPayParamsDTO.operatorId) &&
+    ObjectUtils.equals(this.subMerchantNo, aliPayParamsDTO.subMerchantNo) &&
+    ObjectUtils.equals(this.isEnterprisePay, aliPayParamsDTO.isEnterprisePay);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(opAppId, buyerId, subject, goodsDetails, extendParams, aliBusinessParams, extUserInfo, promoParams, alipayStoreId, storeId, merchantOrderNo, areaCode, operatorId, subMerchantNo, isEnterprisePay);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AliPayParamsDTO {\n");
+    
+    sb.append("    opAppId: ").append(toIndentedString(opAppId)).append("\n");
+    sb.append("    buyerId: ").append(toIndentedString(buyerId)).append("\n");
+    sb.append("    subject: ").append(toIndentedString(subject)).append("\n");
+    sb.append("    goodsDetails: ").append(toIndentedString(goodsDetails)).append("\n");
+    sb.append("    extendParams: ").append(toIndentedString(extendParams)).append("\n");
+    sb.append("    aliBusinessParams: ").append(toIndentedString(aliBusinessParams)).append("\n");
+    sb.append("    extUserInfo: ").append(toIndentedString(extUserInfo)).append("\n");
+    sb.append("    promoParams: ").append(toIndentedString(promoParams)).append("\n");
+    sb.append("    alipayStoreId: ").append(toIndentedString(alipayStoreId)).append("\n");
+    sb.append("    storeId: ").append(toIndentedString(storeId)).append("\n");
+    sb.append("    merchantOrderNo: ").append(toIndentedString(merchantOrderNo)).append("\n");
+    sb.append("    areaCode: ").append(toIndentedString(areaCode)).append("\n");
+    sb.append("    operatorId: ").append(toIndentedString(operatorId)).append("\n");
+    sb.append("    subMerchantNo: ").append(toIndentedString(subMerchantNo)).append("\n");
+    sb.append("    isEnterprisePay: ").append(toIndentedString(isEnterprisePay)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AliPayParamsDTOExtUserInfo.java

@@ -0,0 +1,286 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 外部指定买家
+ */
+public class AliPayParamsDTOExtUserInfo implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>注：need_check_info=T时，该参数才有效</p>
+   */
+  @JsonProperty("certNo")
+  private String certNo = null;
+
+  /**
+   * <p>【描述】允许的最小买家年龄。<br />买家年龄必须大于等于所传数值<br />注：<br />1. need_check_info=T时该参数才有效<br />2. min_age为整数，必须大于等于0</p>
+   */
+  @JsonProperty("minAge")
+  private String minAge = null;
+
+  /**
+   * <p>【描述】指定买家姓名。<br />注： need_check_info=T时该参数才有效</p>
+   */
+  @JsonProperty("name")
+  private String name = null;
+
+  /**
+   * <p>【描述】指定买家手机号。<br />注：该参数暂不校验</p>
+   */
+  @JsonProperty("mobile")
+  private String mobile = null;
+
+  /**
+   * <p>【描述】指定买家证件类型。</p> 可选项如下: IDENTITY_CARD:身份证 PASSPORT:护照 OFFICER_CARD:军 官 证 SOLDIER_CARD:士 兵 证 HOKOU:户口本 
+   */
+  public enum CertTypeEnum {
+    IDENTITY_CARD("IDENTITY_CARD"),
+    
+    PASSPORT("PASSPORT"),
+    
+    OFFICER_CARD("OFFICER_CARD"),
+    
+    SOLDIER_CARD("SOLDIER_CARD"),
+    
+    HOKOU("HOKOU");
+
+    private String value;
+
+    CertTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static CertTypeEnum fromValue(String text) {
+      for (CertTypeEnum b : CertTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   * <p>【描述】指定买家证件类型。</p> 可选项如下: IDENTITY_CARD:身份证 PASSPORT:护照 OFFICER_CARD:军 官 证 SOLDIER_CARD:士 兵 证 HOKOU:户口本 
+   */
+  @JsonProperty("certType")
+  private CertTypeEnum certType = null;
+
+  /**
+   * <p>【描述】是否强制校验买家信息；<br />需要强制校验传：T;<br />不需要强制校验传：F或者不传；<br />当传T时，支付宝会校验支付买家的信息与接口上传递的cert_type、cert_no、name或age是否匹配，只有接口传递了信息才会进行对应项的校验；只要有任何一项信息校验不匹配交易都会失败。如果传递了need_check_info，但是没有传任何校验项，则不进行任何校验。<br />默认为不校验。</p>
+   */
+  @JsonProperty("needCheckInfo")
+  private String needCheckInfo = null;
+
+  public AliPayParamsDTOExtUserInfo certNo(String certNo) {
+    this.certNo = certNo;
+    return this;
+  }
+
+   /**
+   * <p>注：need_check_info=T时，该参数才有效</p>
+   * @return certNo
+  **/
+
+  public String getCertNo() {
+    return certNo;
+  }
+
+  public void setCertNo(String certNo) {
+    this.certNo = certNo;
+  }
+
+  public AliPayParamsDTOExtUserInfo minAge(String minAge) {
+    this.minAge = minAge;
+    return this;
+  }
+
+   /**
+   * <p>【描述】允许的最小买家年龄。<br />买家年龄必须大于等于所传数值<br />注：<br />1. need_check_info=T时该参数才有效<br />2. min_age为整数，必须大于等于0</p>
+   * @return minAge
+  **/
+
+  public String getMinAge() {
+    return minAge;
+  }
+
+  public void setMinAge(String minAge) {
+    this.minAge = minAge;
+  }
+
+  public AliPayParamsDTOExtUserInfo name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * <p>【描述】指定买家姓名。<br />注： need_check_info=T时该参数才有效</p>
+   * @return name
+  **/
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public AliPayParamsDTOExtUserInfo mobile(String mobile) {
+    this.mobile = mobile;
+    return this;
+  }
+
+   /**
+   * <p>【描述】指定买家手机号。<br />注：该参数暂不校验</p>
+   * @return mobile
+  **/
+
+  public String getMobile() {
+    return mobile;
+  }
+
+  public void setMobile(String mobile) {
+    this.mobile = mobile;
+  }
+
+  public AliPayParamsDTOExtUserInfo certType(CertTypeEnum certType) {
+    this.certType = certType;
+    return this;
+  }
+
+   /**
+   * <p>【描述】指定买家证件类型。</p> 可选项如下: IDENTITY_CARD:身份证 PASSPORT:护照 OFFICER_CARD:军 官 证 SOLDIER_CARD:士 兵 证 HOKOU:户口本 
+   * @return certType
+  **/
+
+  public CertTypeEnum getCertType() {
+    return certType;
+  }
+
+  public void setCertType(CertTypeEnum certType) {
+    this.certType = certType;
+  }
+
+  public AliPayParamsDTOExtUserInfo needCheckInfo(String needCheckInfo) {
+    this.needCheckInfo = needCheckInfo;
+    return this;
+  }
+
+   /**
+   * <p>【描述】是否强制校验买家信息；<br />需要强制校验传：T;<br />不需要强制校验传：F或者不传；<br />当传T时，支付宝会校验支付买家的信息与接口上传递的cert_type、cert_no、name或age是否匹配，只有接口传递了信息才会进行对应项的校验；只要有任何一项信息校验不匹配交易都会失败。如果传递了need_check_info，但是没有传任何校验项，则不进行任何校验。<br />默认为不校验。</p>
+   * @return needCheckInfo
+  **/
+
+  public String getNeedCheckInfo() {
+    return needCheckInfo;
+  }
+
+  public void setNeedCheckInfo(String needCheckInfo) {
+    this.needCheckInfo = needCheckInfo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AliPayParamsDTOExtUserInfo aliPayParamsDTO$ExtUserInfo = (AliPayParamsDTOExtUserInfo) o;
+    return ObjectUtils.equals(this.certNo, aliPayParamsDTO$ExtUserInfo.certNo) &&
+    ObjectUtils.equals(this.minAge, aliPayParamsDTO$ExtUserInfo.minAge) &&
+    ObjectUtils.equals(this.name, aliPayParamsDTO$ExtUserInfo.name) &&
+    ObjectUtils.equals(this.mobile, aliPayParamsDTO$ExtUserInfo.mobile) &&
+    ObjectUtils.equals(this.certType, aliPayParamsDTO$ExtUserInfo.certType) &&
+    ObjectUtils.equals(this.needCheckInfo, aliPayParamsDTO$ExtUserInfo.needCheckInfo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(certNo, minAge, name, mobile, certType, needCheckInfo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AliPayParamsDTOExtUserInfo {\n");
+    
+    sb.append("    certNo: ").append(toIndentedString(certNo)).append("\n");
+    sb.append("    minAge: ").append(toIndentedString(minAge)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    mobile: ").append(toIndentedString(mobile)).append("\n");
+    sb.append("    certType: ").append(toIndentedString(certType)).append("\n");
+    sb.append("    needCheckInfo: ").append(toIndentedString(needCheckInfo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AliPayParamsDTOExtendParams.java

@@ -0,0 +1,274 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 业务扩展参数
+ */
+public class AliPayParamsDTOExtendParams implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>【描述】系统商编号<br />该参数作为系统商返佣数据提取的依据，请填写系统商签约协议的PID</p>
+   */
+  @JsonProperty("sysServiceProviderId")
+  private String sysServiceProviderId = null;
+
+  /**
+   * <div class=\"margin___UPEqS not-match-aku\">【描述】使用花呗分期要进行的分期数</div>
+   */
+  @JsonProperty("hbFqNum")
+  private String hbFqNum = null;
+
+  /**
+   * <pre>【描述】使用花呗分期需要卖家承担的手续费比例的百分值，传入100代表100%</pre>
+   */
+  @JsonProperty("hbFqSellerPercent")
+  private String hbFqSellerPercent = null;
+
+  /**
+   * <div> <pre>qr_order（店内扫码点餐）</pre> </div>
+   */
+  @JsonProperty("foodOrderType")
+  private String foodOrderType = null;
+
+  /**
+   * <p>代表优先使用资产类型；alipayfq_cc：表示信⽤卡分期，为空时默认花呗。</p>
+   */
+  @JsonProperty("fqChannels")
+  private String fqChannels = null;
+
+  /**
+   * <p>公域商品交易业务订单ID</p>
+   */
+  @JsonProperty("tradeComponentOrderId")
+  private String tradeComponentOrderId = null;
+
+  /**
+   * <p>isv停车场id、向支付宝停车平台申请获得的支付宝停车场的唯一标识；</p>
+   */
+  @JsonProperty("parkingId")
+  private String parkingId = null;
+
+  public AliPayParamsDTOExtendParams sysServiceProviderId(String sysServiceProviderId) {
+    this.sysServiceProviderId = sysServiceProviderId;
+    return this;
+  }
+
+   /**
+   * <p>【描述】系统商编号<br />该参数作为系统商返佣数据提取的依据，请填写系统商签约协议的PID</p>
+   * @return sysServiceProviderId
+  **/
+
+  public String getSysServiceProviderId() {
+    return sysServiceProviderId;
+  }
+
+  public void setSysServiceProviderId(String sysServiceProviderId) {
+    this.sysServiceProviderId = sysServiceProviderId;
+  }
+
+  public AliPayParamsDTOExtendParams hbFqNum(String hbFqNum) {
+    this.hbFqNum = hbFqNum;
+    return this;
+  }
+
+   /**
+   * <div class=\"margin___UPEqS not-match-aku\">【描述】使用花呗分期要进行的分期数</div>
+   * @return hbFqNum
+  **/
+
+  public String getHbFqNum() {
+    return hbFqNum;
+  }
+
+  public void setHbFqNum(String hbFqNum) {
+    this.hbFqNum = hbFqNum;
+  }
+
+  public AliPayParamsDTOExtendParams hbFqSellerPercent(String hbFqSellerPercent) {
+    this.hbFqSellerPercent = hbFqSellerPercent;
+    return this;
+  }
+
+   /**
+   * <pre>【描述】使用花呗分期需要卖家承担的手续费比例的百分值，传入100代表100%</pre>
+   * @return hbFqSellerPercent
+  **/
+
+  public String getHbFqSellerPercent() {
+    return hbFqSellerPercent;
+  }
+
+  public void setHbFqSellerPercent(String hbFqSellerPercent) {
+    this.hbFqSellerPercent = hbFqSellerPercent;
+  }
+
+  public AliPayParamsDTOExtendParams foodOrderType(String foodOrderType) {
+    this.foodOrderType = foodOrderType;
+    return this;
+  }
+
+   /**
+   * <div> <pre>qr_order（店内扫码点餐）</pre> </div>
+   * @return foodOrderType
+  **/
+
+  public String getFoodOrderType() {
+    return foodOrderType;
+  }
+
+  public void setFoodOrderType(String foodOrderType) {
+    this.foodOrderType = foodOrderType;
+  }
+
+  public AliPayParamsDTOExtendParams fqChannels(String fqChannels) {
+    this.fqChannels = fqChannels;
+    return this;
+  }
+
+   /**
+   * <p>代表优先使用资产类型；alipayfq_cc：表示信⽤卡分期，为空时默认花呗。</p>
+   * @return fqChannels
+  **/
+
+  public String getFqChannels() {
+    return fqChannels;
+  }
+
+  public void setFqChannels(String fqChannels) {
+    this.fqChannels = fqChannels;
+  }
+
+  public AliPayParamsDTOExtendParams tradeComponentOrderId(String tradeComponentOrderId) {
+    this.tradeComponentOrderId = tradeComponentOrderId;
+    return this;
+  }
+
+   /**
+   * <p>公域商品交易业务订单ID</p>
+   * @return tradeComponentOrderId
+  **/
+
+  public String getTradeComponentOrderId() {
+    return tradeComponentOrderId;
+  }
+
+  public void setTradeComponentOrderId(String tradeComponentOrderId) {
+    this.tradeComponentOrderId = tradeComponentOrderId;
+  }
+
+  public AliPayParamsDTOExtendParams parkingId(String parkingId) {
+    this.parkingId = parkingId;
+    return this;
+  }
+
+   /**
+   * <p>isv停车场id、向支付宝停车平台申请获得的支付宝停车场的唯一标识；</p>
+   * @return parkingId
+  **/
+
+  public String getParkingId() {
+    return parkingId;
+  }
+
+  public void setParkingId(String parkingId) {
+    this.parkingId = parkingId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AliPayParamsDTOExtendParams aliPayParamsDTO$ExtendParams = (AliPayParamsDTOExtendParams) o;
+    return ObjectUtils.equals(this.sysServiceProviderId, aliPayParamsDTO$ExtendParams.sysServiceProviderId) &&
+    ObjectUtils.equals(this.hbFqNum, aliPayParamsDTO$ExtendParams.hbFqNum) &&
+    ObjectUtils.equals(this.hbFqSellerPercent, aliPayParamsDTO$ExtendParams.hbFqSellerPercent) &&
+    ObjectUtils.equals(this.foodOrderType, aliPayParamsDTO$ExtendParams.foodOrderType) &&
+    ObjectUtils.equals(this.fqChannels, aliPayParamsDTO$ExtendParams.fqChannels) &&
+    ObjectUtils.equals(this.tradeComponentOrderId, aliPayParamsDTO$ExtendParams.tradeComponentOrderId) &&
+    ObjectUtils.equals(this.parkingId, aliPayParamsDTO$ExtendParams.parkingId);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(sysServiceProviderId, hbFqNum, hbFqSellerPercent, foodOrderType, fqChannels, tradeComponentOrderId, parkingId);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AliPayParamsDTOExtendParams {\n");
+    
+    sb.append("    sysServiceProviderId: ").append(toIndentedString(sysServiceProviderId)).append("\n");
+    sb.append("    hbFqNum: ").append(toIndentedString(hbFqNum)).append("\n");
+    sb.append("    hbFqSellerPercent: ").append(toIndentedString(hbFqSellerPercent)).append("\n");
+    sb.append("    foodOrderType: ").append(toIndentedString(foodOrderType)).append("\n");
+    sb.append("    fqChannels: ").append(toIndentedString(fqChannels)).append("\n");
+    sb.append("    tradeComponentOrderId: ").append(toIndentedString(tradeComponentOrderId)).append("\n");
+    sb.append("    parkingId: ").append(toIndentedString(parkingId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AliPayResponse.java

@@ -0,0 +1,206 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 支付宝响应信息
+ */
+public class AliPayResponse implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("payerInfo")
+  private AliPayerInfo payerInfo = null;
+
+  /**
+   * <p>支付宝资金来源渠道</p>
+   */
+  @JsonProperty("fundChannel")
+  private String fundChannel = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-GTQUdKzotolyh7xcHSqcu8tHnse\"> <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Lk4Fd3xPxo7xlwxR93Bco0sBnyb\">支付宝平台优惠信息</div> </div> </div> </div>
+   */
+  @JsonProperty("channelPromotions")
+  private List<AliChannelPromotion> channelPromotions = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("enterprisePayInfo")
+  private String enterprisePayInfo = null;
+
+  public AliPayResponse payerInfo(AliPayerInfo payerInfo) {
+    this.payerInfo = payerInfo;
+    return this;
+  }
+
+   /**
+   * Get payerInfo
+   * @return payerInfo
+  **/
+
+  public AliPayerInfo getPayerInfo() {
+    return payerInfo;
+  }
+
+  public void setPayerInfo(AliPayerInfo payerInfo) {
+    this.payerInfo = payerInfo;
+  }
+
+  public AliPayResponse fundChannel(String fundChannel) {
+    this.fundChannel = fundChannel;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;支付宝资金来源渠道&lt;/p&gt;
+   * @return fundChannel
+  **/
+
+  public String getFundChannel() {
+    return fundChannel;
+  }
+
+  public void setFundChannel(String fundChannel) {
+    this.fundChannel = fundChannel;
+  }
+
+  public AliPayResponse channelPromotions(List<AliChannelPromotion> channelPromotions) {
+    this.channelPromotions = channelPromotions;
+    return this;
+  }
+
+  public AliPayResponse addChannelPromotionsItem(AliChannelPromotion channelPromotionsItem) {
+    if (this.channelPromotions == null) {
+      this.channelPromotions = new ArrayList<>();
+    }
+    this.channelPromotions.add(channelPromotionsItem);
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-GTQUdKzotolyh7xcHSqcu8tHnse\&quot;&gt; &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-Lk4Fd3xPxo7xlwxR93Bco0sBnyb\&quot;&gt;支付宝平台优惠信息&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; &lt;/div&gt;
+   * @return channelPromotions
+  **/
+
+  public List<AliChannelPromotion> getChannelPromotions() {
+    return channelPromotions;
+  }
+
+  public void setChannelPromotions(List<AliChannelPromotion> channelPromotions) {
+    this.channelPromotions = channelPromotions;
+  }
+
+  public AliPayResponse enterprisePayInfo(String enterprisePayInfo) {
+    this.enterprisePayInfo = enterprisePayInfo;
+    return this;
+  }
+
+   /**
+   * Get enterprisePayInfo
+   * @return enterprisePayInfo
+  **/
+
+  public String getEnterprisePayInfo() {
+    return enterprisePayInfo;
+  }
+
+  public void setEnterprisePayInfo(String enterprisePayInfo) {
+    this.enterprisePayInfo = enterprisePayInfo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AliPayResponse aliPayResponse = (AliPayResponse) o;
+    return ObjectUtils.equals(this.payerInfo, aliPayResponse.payerInfo) &&
+    ObjectUtils.equals(this.fundChannel, aliPayResponse.fundChannel) &&
+    ObjectUtils.equals(this.channelPromotions, aliPayResponse.channelPromotions) &&
+    ObjectUtils.equals(this.enterprisePayInfo, aliPayResponse.enterprisePayInfo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(payerInfo, fundChannel, channelPromotions, enterprisePayInfo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AliPayResponse {\n");
+    
+    sb.append("    payerInfo: ").append(toIndentedString(payerInfo)).append("\n");
+    sb.append("    fundChannel: ").append(toIndentedString(fundChannel)).append("\n");
+    sb.append("    channelPromotions: ").append(toIndentedString(channelPromotions)).append("\n");
+    sb.append("    enterprisePayInfo: ").append(toIndentedString(enterprisePayInfo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AliPayerInfo.java

@@ -0,0 +1,144 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 支付宝付款人信息
+ */
+public class AliPayerInfo implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-K9bjdZDa2oTQt8xVSjUcBE1bnfg\">买家支付宝唯一用户号</div> </div>
+   */
+  @JsonProperty("buyerUserId")
+  private String buyerUserId = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-RFz6dVj0ZoeLPKxCPS4cDXtTnEd\">买家支付宝账号</div> </div>
+   */
+  @JsonProperty("buyerLogonId")
+  private String buyerLogonId = null;
+
+  public AliPayerInfo buyerUserId(String buyerUserId) {
+    this.buyerUserId = buyerUserId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-K9bjdZDa2oTQt8xVSjUcBE1bnfg\">买家支付宝唯一用户号</div> </div>
+   * @return buyerUserId
+  **/
+
+  public String getBuyerUserId() {
+    return buyerUserId;
+  }
+
+  public void setBuyerUserId(String buyerUserId) {
+    this.buyerUserId = buyerUserId;
+  }
+
+  public AliPayerInfo buyerLogonId(String buyerLogonId) {
+    this.buyerLogonId = buyerLogonId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-RFz6dVj0ZoeLPKxCPS4cDXtTnEd\">买家支付宝账号</div> </div>
+   * @return buyerLogonId
+  **/
+
+  public String getBuyerLogonId() {
+    return buyerLogonId;
+  }
+
+  public void setBuyerLogonId(String buyerLogonId) {
+    this.buyerLogonId = buyerLogonId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AliPayerInfo aliPayerInfo = (AliPayerInfo) o;
+    return ObjectUtils.equals(this.buyerUserId, aliPayerInfo.buyerUserId) &&
+    ObjectUtils.equals(this.buyerLogonId, aliPayerInfo.buyerLogonId);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(buyerUserId, buyerLogonId);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AliPayerInfo {\n");
+    
+    sb.append("    buyerUserId: ").append(toIndentedString(buyerUserId)).append("\n");
+    sb.append("    buyerLogonId: ").append(toIndentedString(buyerLogonId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AliShareTokenResponseDTO.java

@@ -0,0 +1,379 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+import org.joda.time.DateTime;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 响应结果
+ */
+public class AliShareTokenResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("parentMerchantNo")
+  private String parentMerchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("orderId")
+  private String orderId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("uniqueOrderNo")
+  private String uniqueOrderNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("channelInfoList")
+  private String channelInfoList = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("shareToken")
+  private String shareToken = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("shareTokenExpiredTime")
+  private DateTime shareTokenExpiredTime = null;
+
+  /**
+   * 吱口令分析引导文案前半段
+   */
+  @JsonProperty("guideText1")
+  private String guideText1 = null;
+
+  /**
+   * 吱口令分析引导文案后半段
+   */
+  @JsonProperty("guideText2")
+  private String guideText2 = null;
+
+  public AliShareTokenResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * 
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public AliShareTokenResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * 
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public AliShareTokenResponseDTO parentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+    return this;
+  }
+
+   /**
+   * 
+   * @return parentMerchantNo
+  **/
+
+  public String getParentMerchantNo() {
+    return parentMerchantNo;
+  }
+
+  public void setParentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+  }
+
+  public AliShareTokenResponseDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * 
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public AliShareTokenResponseDTO orderId(String orderId) {
+    this.orderId = orderId;
+    return this;
+  }
+
+   /**
+   * 
+   * @return orderId
+  **/
+
+  public String getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(String orderId) {
+    this.orderId = orderId;
+  }
+
+  public AliShareTokenResponseDTO uniqueOrderNo(String uniqueOrderNo) {
+    this.uniqueOrderNo = uniqueOrderNo;
+    return this;
+  }
+
+   /**
+   * 
+   * @return uniqueOrderNo
+  **/
+
+  public String getUniqueOrderNo() {
+    return uniqueOrderNo;
+  }
+
+  public void setUniqueOrderNo(String uniqueOrderNo) {
+    this.uniqueOrderNo = uniqueOrderNo;
+  }
+
+  public AliShareTokenResponseDTO channelInfoList(String channelInfoList) {
+    this.channelInfoList = channelInfoList;
+    return this;
+  }
+
+   /**
+   * 
+   * @return channelInfoList
+  **/
+
+  public String getChannelInfoList() {
+    return channelInfoList;
+  }
+
+  public void setChannelInfoList(String channelInfoList) {
+    this.channelInfoList = channelInfoList;
+  }
+
+  public AliShareTokenResponseDTO shareToken(String shareToken) {
+    this.shareToken = shareToken;
+    return this;
+  }
+
+   /**
+   * 
+   * @return shareToken
+  **/
+
+  public String getShareToken() {
+    return shareToken;
+  }
+
+  public void setShareToken(String shareToken) {
+    this.shareToken = shareToken;
+  }
+
+  public AliShareTokenResponseDTO shareTokenExpiredTime(DateTime shareTokenExpiredTime) {
+    this.shareTokenExpiredTime = shareTokenExpiredTime;
+    return this;
+  }
+
+   /**
+   * 
+   * @return shareTokenExpiredTime
+  **/
+
+  public DateTime getShareTokenExpiredTime() {
+    return shareTokenExpiredTime;
+  }
+
+  public void setShareTokenExpiredTime(DateTime shareTokenExpiredTime) {
+    this.shareTokenExpiredTime = shareTokenExpiredTime;
+  }
+
+  public AliShareTokenResponseDTO guideText1(String guideText1) {
+    this.guideText1 = guideText1;
+    return this;
+  }
+
+   /**
+   * 吱口令分析引导文案前半段
+   * @return guideText1
+  **/
+
+  public String getGuideText1() {
+    return guideText1;
+  }
+
+  public void setGuideText1(String guideText1) {
+    this.guideText1 = guideText1;
+  }
+
+  public AliShareTokenResponseDTO guideText2(String guideText2) {
+    this.guideText2 = guideText2;
+    return this;
+  }
+
+   /**
+   * 吱口令分析引导文案后半段
+   * @return guideText2
+  **/
+
+  public String getGuideText2() {
+    return guideText2;
+  }
+
+  public void setGuideText2(String guideText2) {
+    this.guideText2 = guideText2;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AliShareTokenResponseDTO aliShareTokenResponseDTO = (AliShareTokenResponseDTO) o;
+    return ObjectUtils.equals(this.code, aliShareTokenResponseDTO.code) &&
+    ObjectUtils.equals(this.message, aliShareTokenResponseDTO.message) &&
+    ObjectUtils.equals(this.parentMerchantNo, aliShareTokenResponseDTO.parentMerchantNo) &&
+    ObjectUtils.equals(this.merchantNo, aliShareTokenResponseDTO.merchantNo) &&
+    ObjectUtils.equals(this.orderId, aliShareTokenResponseDTO.orderId) &&
+    ObjectUtils.equals(this.uniqueOrderNo, aliShareTokenResponseDTO.uniqueOrderNo) &&
+    ObjectUtils.equals(this.channelInfoList, aliShareTokenResponseDTO.channelInfoList) &&
+    ObjectUtils.equals(this.shareToken, aliShareTokenResponseDTO.shareToken) &&
+    ObjectUtils.equals(this.shareTokenExpiredTime, aliShareTokenResponseDTO.shareTokenExpiredTime) &&
+    ObjectUtils.equals(this.guideText1, aliShareTokenResponseDTO.guideText1) &&
+    ObjectUtils.equals(this.guideText2, aliShareTokenResponseDTO.guideText2);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, parentMerchantNo, merchantNo, orderId, uniqueOrderNo, channelInfoList, shareToken, shareTokenExpiredTime, guideText1, guideText2);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AliShareTokenResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    parentMerchantNo: ").append(toIndentedString(parentMerchantNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
+    sb.append("    uniqueOrderNo: ").append(toIndentedString(uniqueOrderNo)).append("\n");
+    sb.append("    channelInfoList: ").append(toIndentedString(channelInfoList)).append("\n");
+    sb.append("    shareToken: ").append(toIndentedString(shareToken)).append("\n");
+    sb.append("    shareTokenExpiredTime: ").append(toIndentedString(shareTokenExpiredTime)).append("\n");
+    sb.append("    guideText1: ").append(toIndentedString(guideText1)).append("\n");
+    sb.append("    guideText2: ").append(toIndentedString(guideText2)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AppIdConfigDetail.java

@@ -0,0 +1,248 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 未命名
+ */
+public class AppIdConfigDetail implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 支付appId
+   */
+  @JsonProperty("appId")
+  private String appId = null;
+
+  /**
+   * 支付appSecret
+   */
+  @JsonProperty("appSecret")
+  private String appSecret = null;
+
+  /**
+   * appId类型
+   */
+  @JsonProperty("appIdType")
+  private String appIdType = null;
+
+  /**
+   * 关注appId
+   */
+  @JsonProperty("subscribeAppId")
+  private String subscribeAppId = null;
+
+  /**
+   * 配置状态
+   */
+  @JsonProperty("status")
+  private String status = null;
+
+  /**
+   * 失败原因
+   */
+  @JsonProperty("failReason")
+  private String failReason = null;
+
+  public AppIdConfigDetail appId(String appId) {
+    this.appId = appId;
+    return this;
+  }
+
+   /**
+   * 支付appId
+   * @return appId
+  **/
+
+  public String getAppId() {
+    return appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public AppIdConfigDetail appSecret(String appSecret) {
+    this.appSecret = appSecret;
+    return this;
+  }
+
+   /**
+   * 支付appSecret
+   * @return appSecret
+  **/
+
+  public String getAppSecret() {
+    return appSecret;
+  }
+
+  public void setAppSecret(String appSecret) {
+    this.appSecret = appSecret;
+  }
+
+  public AppIdConfigDetail appIdType(String appIdType) {
+    this.appIdType = appIdType;
+    return this;
+  }
+
+   /**
+   * appId类型
+   * @return appIdType
+  **/
+
+  public String getAppIdType() {
+    return appIdType;
+  }
+
+  public void setAppIdType(String appIdType) {
+    this.appIdType = appIdType;
+  }
+
+  public AppIdConfigDetail subscribeAppId(String subscribeAppId) {
+    this.subscribeAppId = subscribeAppId;
+    return this;
+  }
+
+   /**
+   * 关注appId
+   * @return subscribeAppId
+  **/
+
+  public String getSubscribeAppId() {
+    return subscribeAppId;
+  }
+
+  public void setSubscribeAppId(String subscribeAppId) {
+    this.subscribeAppId = subscribeAppId;
+  }
+
+  public AppIdConfigDetail status(String status) {
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * 配置状态
+   * @return status
+  **/
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  public AppIdConfigDetail failReason(String failReason) {
+    this.failReason = failReason;
+    return this;
+  }
+
+   /**
+   * 失败原因
+   * @return failReason
+  **/
+
+  public String getFailReason() {
+    return failReason;
+  }
+
+  public void setFailReason(String failReason) {
+    this.failReason = failReason;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AppIdConfigDetail appIdConfigDetail = (AppIdConfigDetail) o;
+    return ObjectUtils.equals(this.appId, appIdConfigDetail.appId) &&
+    ObjectUtils.equals(this.appSecret, appIdConfigDetail.appSecret) &&
+    ObjectUtils.equals(this.appIdType, appIdConfigDetail.appIdType) &&
+    ObjectUtils.equals(this.subscribeAppId, appIdConfigDetail.subscribeAppId) &&
+    ObjectUtils.equals(this.status, appIdConfigDetail.status) &&
+    ObjectUtils.equals(this.failReason, appIdConfigDetail.failReason);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(appId, appSecret, appIdType, subscribeAppId, status, failReason);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AppIdConfigDetail {\n");
+    
+    sb.append("    appId: ").append(toIndentedString(appId)).append("\n");
+    sb.append("    appSecret: ").append(toIndentedString(appSecret)).append("\n");
+    sb.append("    appIdType: ").append(toIndentedString(appIdType)).append("\n");
+    sb.append("    subscribeAppId: ").append(toIndentedString(subscribeAppId)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    failReason: ").append(toIndentedString(failReason)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/ApplyChannelNoRequestDTO.java

@@ -0,0 +1,742 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class ApplyChannelNoRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>申请渠道号的商编</p>
+   */
+  @JsonProperty("applyMerchantNo")
+  private String applyMerchantNo = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-I802dCHvZoP5SkxgnsMcwZsxn9f\">场景</div> <div class=\"ace-line ace-line old-record-id-KpACdOpHroZRE9xIV4vcvtdInLg\">枚举值：</div> <div class=\"ace-line ace-line old-record-id-FrVhdl8cWoDMjGxuWyac9gX3neq\">ONLINE:线上</div> <div class=\"ace-line ace-line old-record-id-UoVgdeHE3oXneoxZvBtcVpqqncd\">OFFLINE:线下</div> <div class=\"ace-line ace-line old-record-id-VQZKdHdshotEtHxnEmwczJpdnqu\">BAOXIAN:保险</div> <div class=\"ace-line ace-line old-record-id-WwbxdXVjiorBKsxvAozcirVHngf\">GONGYI:公益</div> <div class=\"ace-line ace-line old-record-id-ULTbdUvmwoGxo4xHA2VcQrGLn7c\">DC_SEPARATION:借贷分离</div> <div class=\"ace-line ace-line old-record-id-FHALdSvv4okPn4xSzKfcx2w3nfh\">DIGITAL:数娱</div> <div class=\"ace-line ace-line old-record-id-UTNCdHVTKozSvfxCbEfcQkhQn5c\">REGISTRATION:报名(需要先优惠费率报名成功)</div> <div class=\"ace-line ace-line old-record-id-VCGudfNMLo9PMQxWKxocbyiVnyf\">PRIVATE_EDUCATION:民办教育</div> </div>
+   */
+  @JsonProperty("scene")
+  private String scene = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-SB8VdCKETozWwHxLLLrclUV5nvg\">活动类型</div> <div class=\"ace-line ace-line old-record-id-IFucd9ebTo1BG0x5YsvcJLsbneg\">当场景为报名时，需要指定</div> <div class=\"ace-line ace-line old-record-id-HK8KdtZekoXGoLxN7fvcHUUEngb\">枚举值：</div> <div class=\"ace-line ace-line old-record-id-ZTcDdu0qLoWvjnxPGTbcUJIFnyU\">EDUCATION:教培机构</div> <div class=\"ace-line ace-line old-record-id-JMrNdVB64orSdhxyB6mcC6tbnVh\">HEALTHCARE:商业医疗</div> <div class=\"ace-line ace-line old-record-id-PBLVdCUOkovPOzxHO4ocenjMnHb\">PARKING:停车缴费</div> </div>
+   */
+  @JsonProperty("promotionType")
+  private String promotionType = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-RIrRdNcA5oxWxixweaWcij2XnKg\">联系人姓名</div> </div>
+   */
+  @JsonProperty("contactName")
+  private String contactName = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-IEPRdW3mhoxcekx1FJ0cj40lnUg\">联系人手机号</div> </div>
+   */
+  @JsonProperty("contactPhone")
+  private String contactPhone = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-JlYvdEU2foxamaxUfRqcEe8Fnfg\">联系人邮箱</div> </div>
+   */
+  @JsonProperty("contactEmail")
+  private String contactEmail = null;
+
+  /**
+   * <p>请上传2M内的彩色照片 or 彩色扫描件 or 加盖公章鲜章的复印件（正反面分别盖章）<br />格式 ：文件格式为bmp、png、jpeg、jpg或gif</p>
+   */
+  @JsonProperty("contactIdFrontPicUrl")
+  private String contactIdFrontPicUrl = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-E7nDdymLQozDD2xeOLocHXYqnOd\">联系人证件反面照片</div> <div class=\"ace-line ace-line old-record-id-E7nDdymLQozDD2xeOLocHXYqnOd\"> <p>请上传2M内的彩色照片 or 彩色扫描件 or 加盖公章鲜章的复印件（正反面分别盖章）<br />格式 ：文件格式为bmp、png、jpeg、jpg或gif</p> </div> </div>
+   */
+  @JsonProperty("contactIdBackPicUrl")
+  private String contactIdBackPicUrl = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-JgVDdlybCoFbqAxIR14cpASgnZc\">联系人证件类型</div> <div class=\"ace-line ace-line old-record-id-JgVDdlybCoFbqAxIR14cpASgnZc\">IDENTITY_CARD：身份证<br />PASSPORT：护照<br />OFFICER_CARD ：军官证<br />SOLDIER_CARD ：士兵证<br />T_VISITORPASS：台湾来往大陆通行证<br />HM_VISITORPASS：港澳来往内地通行证<br />TAIWAN：台湾居住证<br />FPRP：外国人居留</div> </div>
+   */
+  @JsonProperty("contactIdType")
+  private String contactIdType = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-WM5Ddi2D2ossvVxkYEbccZ1Anfc\">业务办理授权函</div> <div class=\"ace-line ace-line old-record-id-WM5Ddi2D2ossvVxkYEbccZ1Anfc\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-MRW0dbKBUo9LWqx9U5Vcwot6nMd\">联系人不是法人时必填 请上传2M以内的图片</div> <div class=\"ace-line ace-line old-record-id-MRW0dbKBUo9LWqx9U5Vcwot6nMd\">格式：文件格式为bmp、png、jpeg、jpg或gif；</div> <div class=\"ace-line ace-line old-record-id-MRW0dbKBUo9LWqx9U5Vcwot6nMd\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-Aa0adr49eoouzExDB6UcNewBnrb\"><a href=\"https://yeepay.feishu.cn/file/boxcnCyE39HXrnvcnm69GQUgtcb\" data-lark-is-custom=\"true\">业务办理授权函</a></div> </div> </div> </div> </div> </div>
+   */
+  @JsonProperty("busiAuthorizationPicUrl")
+  private String busiAuthorizationPicUrl = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-BGtpdhZ5OostArx2lPicLg0anWb\">客服电话</div> </div>
+   */
+  @JsonProperty("servicePhone")
+  private String servicePhone = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-PELZdmxNtoeFHVxiaPucG3U1n0q\">商户简称</div> <div class=\"ace-line ace-line old-record-id-PELZdmxNtoeFHVxiaPucG3U1n0q\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-MyWIdhIoBoNt3uxmZfdcj2g2nmf\">微信要求：建议使用公司名称简称、或者品牌名称，需要与售卖商品内容有关联，该简称将在支付完成页向买家展示，需与微信经营类目相关</div> </div> </div> </div>
+   */
+  @JsonProperty("merchantShortName")
+  private String merchantShortName = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-SBLPdJzZOooz53xi8hNcPWgZnuh\">商户营业执照名称</div> <div class=\"ace-line ace-line old-record-id-SBLPdJzZOooz53xi8hNcPWgZnuh\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-PvzmdOmjfomsmvxShD9c5zCTnkh\">需与营业执照商户名称一致</div> </div> </div> </div>
+   */
+  @JsonProperty("merchantBusinessName")
+  private String merchantBusinessName = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-CEkBdOYQzoWUyOxYltycstdMn8e\">商户营业执照号</div> <div class=\"ace-line ace-line old-record-id-CEkBdOYQzoWUyOxYltycstdMn8e\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VvKDdKxAEomEojxKayQcwj5Bn9c\">需与营业执照一致</div> </div> </div> </div>
+   */
+  @JsonProperty("merchantBusinessLicense")
+  private String merchantBusinessLicense = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-MxYDdvTkEodu9Gx5B8DcsBwunVb\">商户营业执照注册地址</div> <div class=\"ace-line ace-line old-record-id-MxYDdvTkEodu9Gx5B8DcsBwunVb\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-WEmGdY9s0ob9jfxv2cEcFx9CnYd\">需与营业执照登记住所一致</div> </div> </div> </div>
+   */
+  @JsonProperty("merchantBusinessAddress")
+  private String merchantBusinessAddress = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-B7yjdyHaSowVKkxOVKNcJEGUnp2\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-I9Q5dVg80oVPwgxIUM7cTSgun8e\">商户营业执照照片</div> </div> </div> <div class=\"ace-line ace-line old-record-id-B7yjdyHaSowVKkxOVKNcJEGUnp2\">需年检章齐全（当年成立公司除外）; 必须为彩色图片且小于2M，文件格式为bmp、png、jpeg、jpg或gif；</div> <div class=\"ace-line ace-line old-record-id-UbOudgjfTodZc0xhHX9cHE1OnLh\">本字段传照片的Url地址</div> </div>
+   */
+  @JsonProperty("merchantBusinessLicensePicUrl")
+  private String merchantBusinessLicensePicUrl = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-TBmYdPg7koyerTxklqEcOTl0nYg\">商户结算卡号</div> </div>
+   */
+  @JsonProperty("accountNo")
+  private String accountNo = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-K0bfdCpagoUprGxuOFWcjRMbnne\">商户结算卡户名</div> <div class=\"ace-line ace-line old-record-id-K0bfdCpagoUprGxuOFWcjRMbnne\"> </div> </div>
+   */
+  @JsonProperty("accountName")
+  private String accountName = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-OhmJdu4yEoOI5mxg7MOcw82Bnah\">商户结算卡开户行名称</div> <div class=\"ace-line ace-line old-record-id-OhmJdu4yEoOI5mxg7MOcw82Bnah\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XNradyZTNobtHnx1kfNcjrxBnju\">请根据开户许可证填写</div> </div> </div> </div>
+   */
+  @JsonProperty("accountBankName")
+  private String accountBankName = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-QVaEde2Klo2PXMxFMiJc8oTsnsd\">商户结算卡开户支行名称</div> <div class=\"ace-line ace-line old-record-id-QVaEde2Klo2PXMxFMiJc8oTsnsd\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-IyoMd6DU5oeFQ4xHwgAc1DwVndd\">与开户许可证保持一致</div> </div> </div> </div>
+   */
+  @JsonProperty("accountBank")
+  private String accountBank = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-NAzvdMyeao98wrxp3QtcakNCnJY\">商户结算卡开户省份</div> <div class=\"ace-line ace-line old-record-id-NAzvdMyeao98wrxp3QtcakNCnJY\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ITN8dt7NcoPQdJxa8STcxaivnVE\">请填写具体省名称</div> <div class=\"ace-line ace-line old-record-id-ITN8dt7NcoPQdJxa8STcxaivnVE\">请参考<a href=\"https://yeepay.feishu.cn/sheets/LsJssFEwEh97BYtOF9rcPgptnGc\">省市区名称</a></div> </div> </div> </div>
+   */
+  @JsonProperty("accountBankProvinceName")
+  private String accountBankProvinceName = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Q8qyd6ut8oGZnUxO1mVcByfcnnb\">商户结算卡开户城市</div> <div class=\"ace-line ace-line old-record-id-Q8qyd6ut8oGZnUxO1mVcByfcnnb\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-EYYBdudWpooilQxO5NicQn06noh\">请填写具体市名称</div> </div> </div> <div class=\"ace-line ace-line old-record-id-Q8qyd6ut8oGZnUxO1mVcByfcnnb\">请参考<a href=\"https://yeepay.feishu.cn/sheets/LsJssFEwEh97BYtOF9rcPgptnGc\">省市区名称</a></div> </div>
+   */
+  @JsonProperty("accountBankCityName")
+  private String accountBankCityName = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-IZsudYn5RoylDPxCkyNclx73nkg\">法人证件正面照片</div> <div class=\"ace-line ace-line old-record-id-IZsudYn5RoylDPxCkyNclx73nkg\"> <p>支持证件类型 ：</p> <p>身份证</p> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">港澳来往内地通行证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">台湾来往大陆通行证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">台湾居住证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">护照</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">外国人居留证</div> </div> <p>请上传2M内的彩色照片 or 彩色扫描件 or 加盖公章鲜章的复印件（正反面分别盖章）<br />格式 ：文件格式为bmp、png、jpeg、jpg或gif</p> </div> </div>
+   */
+  @JsonProperty("legalBackPicUrl")
+  private String legalBackPicUrl = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VxLkd2OeAoFpzDx6UeocTEPZnqf\">法人证件反面照片</div> <div class=\"ace-line ace-line old-record-id-VxLkd2OeAoFpzDx6UeocTEPZnqf\"> <p>支持证件类型 ：</p> <p>身份证</p> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">港澳来往内地通行证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">台湾来往大陆通行证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">台湾居住证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">护照</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">外国人居留证</div> </div> <p>请上传2M内的彩色照片 or 彩色扫描件 or 加盖公章鲜章的复印件（正反面分别盖章）<br />格式 ：文件格式为bmp、png、jpeg、jpg或gif</p> </div> </div>
+   */
+  @JsonProperty("legalFrontPicUrl")
+  private String legalFrontPicUrl = null;
+
+  /**
+   * <p>通知地址</p> <p>不传则无通知</p>
+   */
+  @JsonProperty("notifyUrl")
+  private String notifyUrl = null;
+
+  public ApplyChannelNoRequestDTO applyMerchantNo(String applyMerchantNo) {
+    this.applyMerchantNo = applyMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>申请渠道号的商编</p>
+   * @return applyMerchantNo
+  **/
+
+  public String getApplyMerchantNo() {
+    return applyMerchantNo;
+  }
+
+  public void setApplyMerchantNo(String applyMerchantNo) {
+    this.applyMerchantNo = applyMerchantNo;
+  }
+
+  public ApplyChannelNoRequestDTO scene(String scene) {
+    this.scene = scene;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-I802dCHvZoP5SkxgnsMcwZsxn9f\">场景</div> <div class=\"ace-line ace-line old-record-id-KpACdOpHroZRE9xIV4vcvtdInLg\">枚举值：</div> <div class=\"ace-line ace-line old-record-id-FrVhdl8cWoDMjGxuWyac9gX3neq\">ONLINE:线上</div> <div class=\"ace-line ace-line old-record-id-UoVgdeHE3oXneoxZvBtcVpqqncd\">OFFLINE:线下</div> <div class=\"ace-line ace-line old-record-id-VQZKdHdshotEtHxnEmwczJpdnqu\">BAOXIAN:保险</div> <div class=\"ace-line ace-line old-record-id-WwbxdXVjiorBKsxvAozcirVHngf\">GONGYI:公益</div> <div class=\"ace-line ace-line old-record-id-ULTbdUvmwoGxo4xHA2VcQrGLn7c\">DC_SEPARATION:借贷分离</div> <div class=\"ace-line ace-line old-record-id-FHALdSvv4okPn4xSzKfcx2w3nfh\">DIGITAL:数娱</div> <div class=\"ace-line ace-line old-record-id-UTNCdHVTKozSvfxCbEfcQkhQn5c\">REGISTRATION:报名(需要先优惠费率报名成功)</div> <div class=\"ace-line ace-line old-record-id-VCGudfNMLo9PMQxWKxocbyiVnyf\">PRIVATE_EDUCATION:民办教育</div> </div>
+   * @return scene
+  **/
+
+  public String getScene() {
+    return scene;
+  }
+
+  public void setScene(String scene) {
+    this.scene = scene;
+  }
+
+  public ApplyChannelNoRequestDTO promotionType(String promotionType) {
+    this.promotionType = promotionType;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-SB8VdCKETozWwHxLLLrclUV5nvg\">活动类型</div> <div class=\"ace-line ace-line old-record-id-IFucd9ebTo1BG0x5YsvcJLsbneg\">当场景为报名时，需要指定</div> <div class=\"ace-line ace-line old-record-id-HK8KdtZekoXGoLxN7fvcHUUEngb\">枚举值：</div> <div class=\"ace-line ace-line old-record-id-ZTcDdu0qLoWvjnxPGTbcUJIFnyU\">EDUCATION:教培机构</div> <div class=\"ace-line ace-line old-record-id-JMrNdVB64orSdhxyB6mcC6tbnVh\">HEALTHCARE:商业医疗</div> <div class=\"ace-line ace-line old-record-id-PBLVdCUOkovPOzxHO4ocenjMnHb\">PARKING:停车缴费</div> </div>
+   * @return promotionType
+  **/
+
+  public String getPromotionType() {
+    return promotionType;
+  }
+
+  public void setPromotionType(String promotionType) {
+    this.promotionType = promotionType;
+  }
+
+  public ApplyChannelNoRequestDTO contactName(String contactName) {
+    this.contactName = contactName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-RIrRdNcA5oxWxixweaWcij2XnKg\">联系人姓名</div> </div>
+   * @return contactName
+  **/
+
+  public String getContactName() {
+    return contactName;
+  }
+
+  public void setContactName(String contactName) {
+    this.contactName = contactName;
+  }
+
+  public ApplyChannelNoRequestDTO contactPhone(String contactPhone) {
+    this.contactPhone = contactPhone;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-IEPRdW3mhoxcekx1FJ0cj40lnUg\">联系人手机号</div> </div>
+   * @return contactPhone
+  **/
+
+  public String getContactPhone() {
+    return contactPhone;
+  }
+
+  public void setContactPhone(String contactPhone) {
+    this.contactPhone = contactPhone;
+  }
+
+  public ApplyChannelNoRequestDTO contactEmail(String contactEmail) {
+    this.contactEmail = contactEmail;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-JlYvdEU2foxamaxUfRqcEe8Fnfg\">联系人邮箱</div> </div>
+   * @return contactEmail
+  **/
+
+  public String getContactEmail() {
+    return contactEmail;
+  }
+
+  public void setContactEmail(String contactEmail) {
+    this.contactEmail = contactEmail;
+  }
+
+  public ApplyChannelNoRequestDTO contactIdFrontPicUrl(String contactIdFrontPicUrl) {
+    this.contactIdFrontPicUrl = contactIdFrontPicUrl;
+    return this;
+  }
+
+   /**
+   * <p>请上传2M内的彩色照片 or 彩色扫描件 or 加盖公章鲜章的复印件（正反面分别盖章）<br />格式 ：文件格式为bmp、png、jpeg、jpg或gif</p>
+   * @return contactIdFrontPicUrl
+  **/
+
+  public String getContactIdFrontPicUrl() {
+    return contactIdFrontPicUrl;
+  }
+
+  public void setContactIdFrontPicUrl(String contactIdFrontPicUrl) {
+    this.contactIdFrontPicUrl = contactIdFrontPicUrl;
+  }
+
+  public ApplyChannelNoRequestDTO contactIdBackPicUrl(String contactIdBackPicUrl) {
+    this.contactIdBackPicUrl = contactIdBackPicUrl;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-E7nDdymLQozDD2xeOLocHXYqnOd\">联系人证件反面照片</div> <div class=\"ace-line ace-line old-record-id-E7nDdymLQozDD2xeOLocHXYqnOd\"> <p>请上传2M内的彩色照片 or 彩色扫描件 or 加盖公章鲜章的复印件（正反面分别盖章）<br />格式 ：文件格式为bmp、png、jpeg、jpg或gif</p> </div> </div>
+   * @return contactIdBackPicUrl
+  **/
+
+  public String getContactIdBackPicUrl() {
+    return contactIdBackPicUrl;
+  }
+
+  public void setContactIdBackPicUrl(String contactIdBackPicUrl) {
+    this.contactIdBackPicUrl = contactIdBackPicUrl;
+  }
+
+  public ApplyChannelNoRequestDTO contactIdType(String contactIdType) {
+    this.contactIdType = contactIdType;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-JgVDdlybCoFbqAxIR14cpASgnZc\">联系人证件类型</div> <div class=\"ace-line ace-line old-record-id-JgVDdlybCoFbqAxIR14cpASgnZc\">IDENTITY_CARD：身份证<br />PASSPORT：护照<br />OFFICER_CARD ：军官证<br />SOLDIER_CARD ：士兵证<br />T_VISITORPASS：台湾来往大陆通行证<br />HM_VISITORPASS：港澳来往内地通行证<br />TAIWAN：台湾居住证<br />FPRP：外国人居留</div> </div>
+   * @return contactIdType
+  **/
+
+  public String getContactIdType() {
+    return contactIdType;
+  }
+
+  public void setContactIdType(String contactIdType) {
+    this.contactIdType = contactIdType;
+  }
+
+  public ApplyChannelNoRequestDTO busiAuthorizationPicUrl(String busiAuthorizationPicUrl) {
+    this.busiAuthorizationPicUrl = busiAuthorizationPicUrl;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-WM5Ddi2D2ossvVxkYEbccZ1Anfc\">业务办理授权函</div> <div class=\"ace-line ace-line old-record-id-WM5Ddi2D2ossvVxkYEbccZ1Anfc\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-MRW0dbKBUo9LWqx9U5Vcwot6nMd\">联系人不是法人时必填 请上传2M以内的图片</div> <div class=\"ace-line ace-line old-record-id-MRW0dbKBUo9LWqx9U5Vcwot6nMd\">格式：文件格式为bmp、png、jpeg、jpg或gif；</div> <div class=\"ace-line ace-line old-record-id-MRW0dbKBUo9LWqx9U5Vcwot6nMd\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-Aa0adr49eoouzExDB6UcNewBnrb\"><a href=\"https://yeepay.feishu.cn/file/boxcnCyE39HXrnvcnm69GQUgtcb\" data-lark-is-custom=\"true\">业务办理授权函</a></div> </div> </div> </div> </div> </div>
+   * @return busiAuthorizationPicUrl
+  **/
+
+  public String getBusiAuthorizationPicUrl() {
+    return busiAuthorizationPicUrl;
+  }
+
+  public void setBusiAuthorizationPicUrl(String busiAuthorizationPicUrl) {
+    this.busiAuthorizationPicUrl = busiAuthorizationPicUrl;
+  }
+
+  public ApplyChannelNoRequestDTO servicePhone(String servicePhone) {
+    this.servicePhone = servicePhone;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-BGtpdhZ5OostArx2lPicLg0anWb\">客服电话</div> </div>
+   * @return servicePhone
+  **/
+
+  public String getServicePhone() {
+    return servicePhone;
+  }
+
+  public void setServicePhone(String servicePhone) {
+    this.servicePhone = servicePhone;
+  }
+
+  public ApplyChannelNoRequestDTO merchantShortName(String merchantShortName) {
+    this.merchantShortName = merchantShortName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-PELZdmxNtoeFHVxiaPucG3U1n0q\">商户简称</div> <div class=\"ace-line ace-line old-record-id-PELZdmxNtoeFHVxiaPucG3U1n0q\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-MyWIdhIoBoNt3uxmZfdcj2g2nmf\">微信要求：建议使用公司名称简称、或者品牌名称，需要与售卖商品内容有关联，该简称将在支付完成页向买家展示，需与微信经营类目相关</div> </div> </div> </div>
+   * @return merchantShortName
+  **/
+
+  public String getMerchantShortName() {
+    return merchantShortName;
+  }
+
+  public void setMerchantShortName(String merchantShortName) {
+    this.merchantShortName = merchantShortName;
+  }
+
+  public ApplyChannelNoRequestDTO merchantBusinessName(String merchantBusinessName) {
+    this.merchantBusinessName = merchantBusinessName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-SBLPdJzZOooz53xi8hNcPWgZnuh\">商户营业执照名称</div> <div class=\"ace-line ace-line old-record-id-SBLPdJzZOooz53xi8hNcPWgZnuh\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-PvzmdOmjfomsmvxShD9c5zCTnkh\">需与营业执照商户名称一致</div> </div> </div> </div>
+   * @return merchantBusinessName
+  **/
+
+  public String getMerchantBusinessName() {
+    return merchantBusinessName;
+  }
+
+  public void setMerchantBusinessName(String merchantBusinessName) {
+    this.merchantBusinessName = merchantBusinessName;
+  }
+
+  public ApplyChannelNoRequestDTO merchantBusinessLicense(String merchantBusinessLicense) {
+    this.merchantBusinessLicense = merchantBusinessLicense;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-CEkBdOYQzoWUyOxYltycstdMn8e\">商户营业执照号</div> <div class=\"ace-line ace-line old-record-id-CEkBdOYQzoWUyOxYltycstdMn8e\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VvKDdKxAEomEojxKayQcwj5Bn9c\">需与营业执照一致</div> </div> </div> </div>
+   * @return merchantBusinessLicense
+  **/
+
+  public String getMerchantBusinessLicense() {
+    return merchantBusinessLicense;
+  }
+
+  public void setMerchantBusinessLicense(String merchantBusinessLicense) {
+    this.merchantBusinessLicense = merchantBusinessLicense;
+  }
+
+  public ApplyChannelNoRequestDTO merchantBusinessAddress(String merchantBusinessAddress) {
+    this.merchantBusinessAddress = merchantBusinessAddress;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-MxYDdvTkEodu9Gx5B8DcsBwunVb\">商户营业执照注册地址</div> <div class=\"ace-line ace-line old-record-id-MxYDdvTkEodu9Gx5B8DcsBwunVb\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-WEmGdY9s0ob9jfxv2cEcFx9CnYd\">需与营业执照登记住所一致</div> </div> </div> </div>
+   * @return merchantBusinessAddress
+  **/
+
+  public String getMerchantBusinessAddress() {
+    return merchantBusinessAddress;
+  }
+
+  public void setMerchantBusinessAddress(String merchantBusinessAddress) {
+    this.merchantBusinessAddress = merchantBusinessAddress;
+  }
+
+  public ApplyChannelNoRequestDTO merchantBusinessLicensePicUrl(String merchantBusinessLicensePicUrl) {
+    this.merchantBusinessLicensePicUrl = merchantBusinessLicensePicUrl;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-B7yjdyHaSowVKkxOVKNcJEGUnp2\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-I9Q5dVg80oVPwgxIUM7cTSgun8e\">商户营业执照照片</div> </div> </div> <div class=\"ace-line ace-line old-record-id-B7yjdyHaSowVKkxOVKNcJEGUnp2\">需年检章齐全（当年成立公司除外）; 必须为彩色图片且小于2M，文件格式为bmp、png、jpeg、jpg或gif；</div> <div class=\"ace-line ace-line old-record-id-UbOudgjfTodZc0xhHX9cHE1OnLh\">本字段传照片的Url地址</div> </div>
+   * @return merchantBusinessLicensePicUrl
+  **/
+
+  public String getMerchantBusinessLicensePicUrl() {
+    return merchantBusinessLicensePicUrl;
+  }
+
+  public void setMerchantBusinessLicensePicUrl(String merchantBusinessLicensePicUrl) {
+    this.merchantBusinessLicensePicUrl = merchantBusinessLicensePicUrl;
+  }
+
+  public ApplyChannelNoRequestDTO accountNo(String accountNo) {
+    this.accountNo = accountNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-TBmYdPg7koyerTxklqEcOTl0nYg\">商户结算卡号</div> </div>
+   * @return accountNo
+  **/
+
+  public String getAccountNo() {
+    return accountNo;
+  }
+
+  public void setAccountNo(String accountNo) {
+    this.accountNo = accountNo;
+  }
+
+  public ApplyChannelNoRequestDTO accountName(String accountName) {
+    this.accountName = accountName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-K0bfdCpagoUprGxuOFWcjRMbnne\">商户结算卡户名</div> <div class=\"ace-line ace-line old-record-id-K0bfdCpagoUprGxuOFWcjRMbnne\"> </div> </div>
+   * @return accountName
+  **/
+
+  public String getAccountName() {
+    return accountName;
+  }
+
+  public void setAccountName(String accountName) {
+    this.accountName = accountName;
+  }
+
+  public ApplyChannelNoRequestDTO accountBankName(String accountBankName) {
+    this.accountBankName = accountBankName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-OhmJdu4yEoOI5mxg7MOcw82Bnah\">商户结算卡开户行名称</div> <div class=\"ace-line ace-line old-record-id-OhmJdu4yEoOI5mxg7MOcw82Bnah\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XNradyZTNobtHnx1kfNcjrxBnju\">请根据开户许可证填写</div> </div> </div> </div>
+   * @return accountBankName
+  **/
+
+  public String getAccountBankName() {
+    return accountBankName;
+  }
+
+  public void setAccountBankName(String accountBankName) {
+    this.accountBankName = accountBankName;
+  }
+
+  public ApplyChannelNoRequestDTO accountBank(String accountBank) {
+    this.accountBank = accountBank;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-QVaEde2Klo2PXMxFMiJc8oTsnsd\">商户结算卡开户支行名称</div> <div class=\"ace-line ace-line old-record-id-QVaEde2Klo2PXMxFMiJc8oTsnsd\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-IyoMd6DU5oeFQ4xHwgAc1DwVndd\">与开户许可证保持一致</div> </div> </div> </div>
+   * @return accountBank
+  **/
+
+  public String getAccountBank() {
+    return accountBank;
+  }
+
+  public void setAccountBank(String accountBank) {
+    this.accountBank = accountBank;
+  }
+
+  public ApplyChannelNoRequestDTO accountBankProvinceName(String accountBankProvinceName) {
+    this.accountBankProvinceName = accountBankProvinceName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-NAzvdMyeao98wrxp3QtcakNCnJY\">商户结算卡开户省份</div> <div class=\"ace-line ace-line old-record-id-NAzvdMyeao98wrxp3QtcakNCnJY\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ITN8dt7NcoPQdJxa8STcxaivnVE\">请填写具体省名称</div> <div class=\"ace-line ace-line old-record-id-ITN8dt7NcoPQdJxa8STcxaivnVE\">请参考<a href=\"https://yeepay.feishu.cn/sheets/LsJssFEwEh97BYtOF9rcPgptnGc\">省市区名称</a></div> </div> </div> </div>
+   * @return accountBankProvinceName
+  **/
+
+  public String getAccountBankProvinceName() {
+    return accountBankProvinceName;
+  }
+
+  public void setAccountBankProvinceName(String accountBankProvinceName) {
+    this.accountBankProvinceName = accountBankProvinceName;
+  }
+
+  public ApplyChannelNoRequestDTO accountBankCityName(String accountBankCityName) {
+    this.accountBankCityName = accountBankCityName;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Q8qyd6ut8oGZnUxO1mVcByfcnnb\">商户结算卡开户城市</div> <div class=\"ace-line ace-line old-record-id-Q8qyd6ut8oGZnUxO1mVcByfcnnb\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-EYYBdudWpooilQxO5NicQn06noh\">请填写具体市名称</div> </div> </div> <div class=\"ace-line ace-line old-record-id-Q8qyd6ut8oGZnUxO1mVcByfcnnb\">请参考<a href=\"https://yeepay.feishu.cn/sheets/LsJssFEwEh97BYtOF9rcPgptnGc\">省市区名称</a></div> </div>
+   * @return accountBankCityName
+  **/
+
+  public String getAccountBankCityName() {
+    return accountBankCityName;
+  }
+
+  public void setAccountBankCityName(String accountBankCityName) {
+    this.accountBankCityName = accountBankCityName;
+  }
+
+  public ApplyChannelNoRequestDTO legalBackPicUrl(String legalBackPicUrl) {
+    this.legalBackPicUrl = legalBackPicUrl;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-IZsudYn5RoylDPxCkyNclx73nkg\">法人证件正面照片</div> <div class=\"ace-line ace-line old-record-id-IZsudYn5RoylDPxCkyNclx73nkg\"> <p>支持证件类型 ：</p> <p>身份证</p> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">港澳来往内地通行证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">台湾来往大陆通行证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">台湾居住证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">护照</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">外国人居留证</div> </div> <p>请上传2M内的彩色照片 or 彩色扫描件 or 加盖公章鲜章的复印件（正反面分别盖章）<br />格式 ：文件格式为bmp、png、jpeg、jpg或gif</p> </div> </div>
+   * @return legalBackPicUrl
+  **/
+
+  public String getLegalBackPicUrl() {
+    return legalBackPicUrl;
+  }
+
+  public void setLegalBackPicUrl(String legalBackPicUrl) {
+    this.legalBackPicUrl = legalBackPicUrl;
+  }
+
+  public ApplyChannelNoRequestDTO legalFrontPicUrl(String legalFrontPicUrl) {
+    this.legalFrontPicUrl = legalFrontPicUrl;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VxLkd2OeAoFpzDx6UeocTEPZnqf\">法人证件反面照片</div> <div class=\"ace-line ace-line old-record-id-VxLkd2OeAoFpzDx6UeocTEPZnqf\"> <p>支持证件类型 ：</p> <p>身份证</p> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">港澳来往内地通行证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">台湾来往大陆通行证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">台湾居住证</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">护照</div> <div class=\" old-record-id-Dv5edyCKZopkSLxsRnrcZcrGnub\">外国人居留证</div> </div> <p>请上传2M内的彩色照片 or 彩色扫描件 or 加盖公章鲜章的复印件（正反面分别盖章）<br />格式 ：文件格式为bmp、png、jpeg、jpg或gif</p> </div> </div>
+   * @return legalFrontPicUrl
+  **/
+
+  public String getLegalFrontPicUrl() {
+    return legalFrontPicUrl;
+  }
+
+  public void setLegalFrontPicUrl(String legalFrontPicUrl) {
+    this.legalFrontPicUrl = legalFrontPicUrl;
+  }
+
+  public ApplyChannelNoRequestDTO notifyUrl(String notifyUrl) {
+    this.notifyUrl = notifyUrl;
+    return this;
+  }
+
+   /**
+   * <p>通知地址</p> <p>不传则无通知</p>
+   * @return notifyUrl
+  **/
+
+  public String getNotifyUrl() {
+    return notifyUrl;
+  }
+
+  public void setNotifyUrl(String notifyUrl) {
+    this.notifyUrl = notifyUrl;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    ApplyChannelNoRequestDTO applyChannelNoRequestDTO = (ApplyChannelNoRequestDTO) o;
+    return ObjectUtils.equals(this.applyMerchantNo, applyChannelNoRequestDTO.applyMerchantNo) &&
+    ObjectUtils.equals(this.scene, applyChannelNoRequestDTO.scene) &&
+    ObjectUtils.equals(this.promotionType, applyChannelNoRequestDTO.promotionType) &&
+    ObjectUtils.equals(this.contactName, applyChannelNoRequestDTO.contactName) &&
+    ObjectUtils.equals(this.contactPhone, applyChannelNoRequestDTO.contactPhone) &&
+    ObjectUtils.equals(this.contactEmail, applyChannelNoRequestDTO.contactEmail) &&
+    ObjectUtils.equals(this.contactIdFrontPicUrl, applyChannelNoRequestDTO.contactIdFrontPicUrl) &&
+    ObjectUtils.equals(this.contactIdBackPicUrl, applyChannelNoRequestDTO.contactIdBackPicUrl) &&
+    ObjectUtils.equals(this.contactIdType, applyChannelNoRequestDTO.contactIdType) &&
+    ObjectUtils.equals(this.busiAuthorizationPicUrl, applyChannelNoRequestDTO.busiAuthorizationPicUrl) &&
+    ObjectUtils.equals(this.servicePhone, applyChannelNoRequestDTO.servicePhone) &&
+    ObjectUtils.equals(this.merchantShortName, applyChannelNoRequestDTO.merchantShortName) &&
+    ObjectUtils.equals(this.merchantBusinessName, applyChannelNoRequestDTO.merchantBusinessName) &&
+    ObjectUtils.equals(this.merchantBusinessLicense, applyChannelNoRequestDTO.merchantBusinessLicense) &&
+    ObjectUtils.equals(this.merchantBusinessAddress, applyChannelNoRequestDTO.merchantBusinessAddress) &&
+    ObjectUtils.equals(this.merchantBusinessLicensePicUrl, applyChannelNoRequestDTO.merchantBusinessLicensePicUrl) &&
+    ObjectUtils.equals(this.accountNo, applyChannelNoRequestDTO.accountNo) &&
+    ObjectUtils.equals(this.accountName, applyChannelNoRequestDTO.accountName) &&
+    ObjectUtils.equals(this.accountBankName, applyChannelNoRequestDTO.accountBankName) &&
+    ObjectUtils.equals(this.accountBank, applyChannelNoRequestDTO.accountBank) &&
+    ObjectUtils.equals(this.accountBankProvinceName, applyChannelNoRequestDTO.accountBankProvinceName) &&
+    ObjectUtils.equals(this.accountBankCityName, applyChannelNoRequestDTO.accountBankCityName) &&
+    ObjectUtils.equals(this.legalBackPicUrl, applyChannelNoRequestDTO.legalBackPicUrl) &&
+    ObjectUtils.equals(this.legalFrontPicUrl, applyChannelNoRequestDTO.legalFrontPicUrl) &&
+    ObjectUtils.equals(this.notifyUrl, applyChannelNoRequestDTO.notifyUrl);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(applyMerchantNo, scene, promotionType, contactName, contactPhone, contactEmail, contactIdFrontPicUrl, contactIdBackPicUrl, contactIdType, busiAuthorizationPicUrl, servicePhone, merchantShortName, merchantBusinessName, merchantBusinessLicense, merchantBusinessAddress, merchantBusinessLicensePicUrl, accountNo, accountName, accountBankName, accountBank, accountBankProvinceName, accountBankCityName, legalBackPicUrl, legalFrontPicUrl, notifyUrl);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApplyChannelNoRequestDTO {\n");
+    
+    sb.append("    applyMerchantNo: ").append(toIndentedString(applyMerchantNo)).append("\n");
+    sb.append("    scene: ").append(toIndentedString(scene)).append("\n");
+    sb.append("    promotionType: ").append(toIndentedString(promotionType)).append("\n");
+    sb.append("    contactName: ").append(toIndentedString(contactName)).append("\n");
+    sb.append("    contactPhone: ").append(toIndentedString(contactPhone)).append("\n");
+    sb.append("    contactEmail: ").append(toIndentedString(contactEmail)).append("\n");
+    sb.append("    contactIdFrontPicUrl: ").append(toIndentedString(contactIdFrontPicUrl)).append("\n");
+    sb.append("    contactIdBackPicUrl: ").append(toIndentedString(contactIdBackPicUrl)).append("\n");
+    sb.append("    contactIdType: ").append(toIndentedString(contactIdType)).append("\n");
+    sb.append("    busiAuthorizationPicUrl: ").append(toIndentedString(busiAuthorizationPicUrl)).append("\n");
+    sb.append("    servicePhone: ").append(toIndentedString(servicePhone)).append("\n");
+    sb.append("    merchantShortName: ").append(toIndentedString(merchantShortName)).append("\n");
+    sb.append("    merchantBusinessName: ").append(toIndentedString(merchantBusinessName)).append("\n");
+    sb.append("    merchantBusinessLicense: ").append(toIndentedString(merchantBusinessLicense)).append("\n");
+    sb.append("    merchantBusinessAddress: ").append(toIndentedString(merchantBusinessAddress)).append("\n");
+    sb.append("    merchantBusinessLicensePicUrl: ").append(toIndentedString(merchantBusinessLicensePicUrl)).append("\n");
+    sb.append("    accountNo: ").append(toIndentedString(accountNo)).append("\n");
+    sb.append("    accountName: ").append(toIndentedString(accountName)).append("\n");
+    sb.append("    accountBankName: ").append(toIndentedString(accountBankName)).append("\n");
+    sb.append("    accountBank: ").append(toIndentedString(accountBank)).append("\n");
+    sb.append("    accountBankProvinceName: ").append(toIndentedString(accountBankProvinceName)).append("\n");
+    sb.append("    accountBankCityName: ").append(toIndentedString(accountBankCityName)).append("\n");
+    sb.append("    legalBackPicUrl: ").append(toIndentedString(legalBackPicUrl)).append("\n");
+    sb.append("    legalFrontPicUrl: ").append(toIndentedString(legalFrontPicUrl)).append("\n");
+    sb.append("    notifyUrl: ").append(toIndentedString(notifyUrl)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/ApplyChannelNoResponseDTO.java

@@ -0,0 +1,144 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class ApplyChannelNoResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  public ApplyChannelNoResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public ApplyChannelNoResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    ApplyChannelNoResponseDTO applyChannelNoResponseDTO = (ApplyChannelNoResponseDTO) o;
+    return ObjectUtils.equals(this.code, applyChannelNoResponseDTO.code) &&
+    ObjectUtils.equals(this.message, applyChannelNoResponseDTO.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApplyChannelNoResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AttachRecordQueryRequestDTO.java

@@ -0,0 +1,248 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class AttachRecordQueryRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>主商户号</p> <p>主商户号和从属商户号二选一必填</p>
+   */
+  @JsonProperty("mainMerchantNo")
+  private String mainMerchantNo = null;
+
+  /**
+   * <p>从属商户号</p> <p>主商户号和从属商户号二选一必填</p>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   *  <p>不传则全部查询</p> <p>WECHAT:微信</p> <p>ALIPAY:支付宝</p>
+   */
+  @JsonProperty("channel")
+  private String channel = null;
+
+  /**
+   * <p>配置状态</p> <div data-page-id=\"BhrgdNMNuoFInbxCPVAcTbqcn5b\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Qqk6d8Chzo4eepxaztRcI25Kn4c\">不传则全返</div> <div class=\"ace-line ace-line old-record-id-PbDddP80So76yUxn4vdclFMqnWd\">枚举：</div> <div class=\"ace-line ace-line old-record-id-NLbOd0y0ioInOlx87DEcGnpinpb\"><em>SUCCESS：配置成功</em></div> <div class=\"ace-line ace-line old-record-id-PWM2dzRZhoETJexz4gFcIQuwnFh\"><em>FAIL：配置失败</em></div> <div class=\"ace-line ace-line old-record-id-WW5qdTk8UoS6dpxt2vGcHIOknhb\"><em>RELIEVE：已解除</em></div> <div class=\"ace-line ace-line old-record-id-JYCKdzAKpo9mp5xdGJjcCWDancf\"><em>PENDING：配置处理中</em></div> </div>
+   */
+  @JsonProperty("configStatus")
+  private String configStatus = null;
+
+  /**
+   * <p>页码</p>
+   */
+  @JsonProperty("pageNo")
+  private Integer pageNo = null;
+
+  /**
+   * <div data-page-id=\"BhrgdNMNuoFInbxCPVAcTbqcn5b\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-LPJgdB6cMofJJWxsgk7cEF4rnYe\">每页数量</div> </div>
+   */
+  @JsonProperty("pageSize")
+  private Integer pageSize = null;
+
+  public AttachRecordQueryRequestDTO mainMerchantNo(String mainMerchantNo) {
+    this.mainMerchantNo = mainMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>主商户号</p> <p>主商户号和从属商户号二选一必填</p>
+   * @return mainMerchantNo
+  **/
+
+  public String getMainMerchantNo() {
+    return mainMerchantNo;
+  }
+
+  public void setMainMerchantNo(String mainMerchantNo) {
+    this.mainMerchantNo = mainMerchantNo;
+  }
+
+  public AttachRecordQueryRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * <p>从属商户号</p> <p>主商户号和从属商户号二选一必填</p>
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public AttachRecordQueryRequestDTO channel(String channel) {
+    this.channel = channel;
+    return this;
+  }
+
+   /**
+   *  <p>不传则全部查询</p> <p>WECHAT:微信</p> <p>ALIPAY:支付宝</p>
+   * @return channel
+  **/
+
+  public String getChannel() {
+    return channel;
+  }
+
+  public void setChannel(String channel) {
+    this.channel = channel;
+  }
+
+  public AttachRecordQueryRequestDTO configStatus(String configStatus) {
+    this.configStatus = configStatus;
+    return this;
+  }
+
+   /**
+   * <p>配置状态</p> <div data-page-id=\"BhrgdNMNuoFInbxCPVAcTbqcn5b\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Qqk6d8Chzo4eepxaztRcI25Kn4c\">不传则全返</div> <div class=\"ace-line ace-line old-record-id-PbDddP80So76yUxn4vdclFMqnWd\">枚举：</div> <div class=\"ace-line ace-line old-record-id-NLbOd0y0ioInOlx87DEcGnpinpb\"><em>SUCCESS：配置成功</em></div> <div class=\"ace-line ace-line old-record-id-PWM2dzRZhoETJexz4gFcIQuwnFh\"><em>FAIL：配置失败</em></div> <div class=\"ace-line ace-line old-record-id-WW5qdTk8UoS6dpxt2vGcHIOknhb\"><em>RELIEVE：已解除</em></div> <div class=\"ace-line ace-line old-record-id-JYCKdzAKpo9mp5xdGJjcCWDancf\"><em>PENDING：配置处理中</em></div> </div>
+   * @return configStatus
+  **/
+
+  public String getConfigStatus() {
+    return configStatus;
+  }
+
+  public void setConfigStatus(String configStatus) {
+    this.configStatus = configStatus;
+  }
+
+  public AttachRecordQueryRequestDTO pageNo(Integer pageNo) {
+    this.pageNo = pageNo;
+    return this;
+  }
+
+   /**
+   * <p>页码</p>
+   * @return pageNo
+  **/
+
+  public Integer getPageNo() {
+    return pageNo;
+  }
+
+  public void setPageNo(Integer pageNo) {
+    this.pageNo = pageNo;
+  }
+
+  public AttachRecordQueryRequestDTO pageSize(Integer pageSize) {
+    this.pageSize = pageSize;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"BhrgdNMNuoFInbxCPVAcTbqcn5b\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-LPJgdB6cMofJJWxsgk7cEF4rnYe\">每页数量</div> </div>
+   * @return pageSize
+  **/
+
+  public Integer getPageSize() {
+    return pageSize;
+  }
+
+  public void setPageSize(Integer pageSize) {
+    this.pageSize = pageSize;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AttachRecordQueryRequestDTO attachRecordQueryRequestDTO = (AttachRecordQueryRequestDTO) o;
+    return ObjectUtils.equals(this.mainMerchantNo, attachRecordQueryRequestDTO.mainMerchantNo) &&
+    ObjectUtils.equals(this.merchantNo, attachRecordQueryRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.channel, attachRecordQueryRequestDTO.channel) &&
+    ObjectUtils.equals(this.configStatus, attachRecordQueryRequestDTO.configStatus) &&
+    ObjectUtils.equals(this.pageNo, attachRecordQueryRequestDTO.pageNo) &&
+    ObjectUtils.equals(this.pageSize, attachRecordQueryRequestDTO.pageSize);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(mainMerchantNo, merchantNo, channel, configStatus, pageNo, pageSize);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AttachRecordQueryRequestDTO {\n");
+    
+    sb.append("    mainMerchantNo: ").append(toIndentedString(mainMerchantNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
+    sb.append("    configStatus: ").append(toIndentedString(configStatus)).append("\n");
+    sb.append("    pageNo: ").append(toIndentedString(pageNo)).append("\n");
+    sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AttachRecordQueryResponseDTO.java

@@ -0,0 +1,196 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class AttachRecordQueryResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <div data-page-id=\"BhrgdNMNuoFInbxCPVAcTbqcn5b\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-I2w4dJn8goA40Ix9guBczyPUnRg\">主从关系列表</div> <div class=\"ace-line ace-line old-record-id-I2w4dJn8goA40Ix9guBczyPUnRg\"> </div> </div>
+   */
+  @JsonProperty("attachReportRecordDTOList")
+  private String attachReportRecordDTOList = null;
+
+  /**
+   * <p>总数</p>
+   */
+  @JsonProperty("count")
+  private Integer count = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  public AttachRecordQueryResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public AttachRecordQueryResponseDTO attachReportRecordDTOList(String attachReportRecordDTOList) {
+    this.attachReportRecordDTOList = attachReportRecordDTOList;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"BhrgdNMNuoFInbxCPVAcTbqcn5b\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-I2w4dJn8goA40Ix9guBczyPUnRg\">主从关系列表</div> <div class=\"ace-line ace-line old-record-id-I2w4dJn8goA40Ix9guBczyPUnRg\"> </div> </div>
+   * @return attachReportRecordDTOList
+  **/
+
+  public String getAttachReportRecordDTOList() {
+    return attachReportRecordDTOList;
+  }
+
+  public void setAttachReportRecordDTOList(String attachReportRecordDTOList) {
+    this.attachReportRecordDTOList = attachReportRecordDTOList;
+  }
+
+  public AttachRecordQueryResponseDTO count(Integer count) {
+    this.count = count;
+    return this;
+  }
+
+   /**
+   * <p>总数</p>
+   * @return count
+  **/
+
+  public Integer getCount() {
+    return count;
+  }
+
+  public void setCount(Integer count) {
+    this.count = count;
+  }
+
+  public AttachRecordQueryResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AttachRecordQueryResponseDTO attachRecordQueryResponseDTO = (AttachRecordQueryResponseDTO) o;
+    return ObjectUtils.equals(this.code, attachRecordQueryResponseDTO.code) &&
+    ObjectUtils.equals(this.attachReportRecordDTOList, attachRecordQueryResponseDTO.attachReportRecordDTOList) &&
+    ObjectUtils.equals(this.count, attachRecordQueryResponseDTO.count) &&
+    ObjectUtils.equals(this.message, attachRecordQueryResponseDTO.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, attachReportRecordDTOList, count, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AttachRecordQueryResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    attachReportRecordDTOList: ").append(toIndentedString(attachReportRecordDTOList)).append("\n");
+    sb.append("    count: ").append(toIndentedString(count)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AttachReportRecordQueryResponseDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 新聚合挂靠报备信息查询
+ */
+public class AttachReportRecordQueryResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * <p>报备信息列表</p>
+   */
+  @JsonProperty("reportRecordList")
+  private String reportRecordList = null;
+
+  public AttachReportRecordQueryResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public AttachReportRecordQueryResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public AttachReportRecordQueryResponseDTO reportRecordList(String reportRecordList) {
+    this.reportRecordList = reportRecordList;
+    return this;
+  }
+
+   /**
+   * <p>报备信息列表</p>
+   * @return reportRecordList
+  **/
+
+  public String getReportRecordList() {
+    return reportRecordList;
+  }
+
+  public void setReportRecordList(String reportRecordList) {
+    this.reportRecordList = reportRecordList;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AttachReportRecordQueryResponseDTO attachReportRecordQueryResponseDTO = (AttachReportRecordQueryResponseDTO) o;
+    return ObjectUtils.equals(this.code, attachReportRecordQueryResponseDTO.code) &&
+    ObjectUtils.equals(this.message, attachReportRecordQueryResponseDTO.message) &&
+    ObjectUtils.equals(this.reportRecordList, attachReportRecordQueryResponseDTO.reportRecordList);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, reportRecordList);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AttachReportRecordQueryResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    reportRecordList: ").append(toIndentedString(reportRecordList)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AttachReportRequestDTO.java

@@ -0,0 +1,352 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class AttachReportRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>主商户号</p>
+   */
+  @JsonProperty("mainMerchantNo")
+  private String mainMerchantNo = null;
+
+  /**
+   * <p>从属商户列表</p> <p>以英文逗号分隔</p>
+   */
+  @JsonProperty("merchantNoList")
+  private String merchantNoList = null;
+
+  /**
+   * <p>授权函文件名</p>
+   */
+  @JsonProperty("authFileName")
+  private String authFileName = null;
+
+  /**
+   * <p>授权函文件地址</p>
+   */
+  @JsonProperty("authFileUrl")
+  private String authFileUrl = null;
+
+  /**
+   *  <p>WECHAT:微信</p> <p>ALIPAY:支付宝</p>
+   */
+  @JsonProperty("channel")
+  private String channel = null;
+
+  /**
+   * <div data-page-id=\"BRNmd6WIMoSTABx99W3ccVAwnZf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KxKedSMLAonADhxgZLIca4Bdn1f\">申请支付方式列表</div> <div class=\"ace-line ace-line old-record-id-ImY3du6YwoClofx6ihQcBx9SnZb\">USER_SCAN:主扫支付</div> <div class=\"ace-line ace-line old-record-id-CUBXdmXAKogmzyxja65cLh3qngd\">MERCHANT_SCAN:被扫支付</div> <div class=\"ace-line ace-line old-record-id-EvQPds8jBoTI9kxHMGkclpkInJf\">MINI_PROGRAM:小程序支付</div> <div class=\"ace-line ace-line old-record-id-XJbrd5GUAoZ6hZx5CF4cap1DnLO\">WECHAT_OFFIACCOUNT:公众号支付</div> <div class=\"ace-line ace-line old-record-id-NEu8dgE8Wo5AeEx5UlEcVLyUnyd\">ALIPAY_LIFE:支付宝生活号</div> <div class=\"ace-line ace-line old-record-id-OxcPdhtswoNrgWxcjC4ciTNcnve\">支付方式以,分隔</div> </div>
+   */
+  @JsonProperty("payWayList")
+  private String payWayList = null;
+
+  /**
+   * <div data-page-id=\"BRNmd6WIMoSTABx99W3ccVAwnZf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VlUIdG6M5oyNQtxEfMmcip5Qnse\">申请原因类型</div> <div class=\"ace-line ace-line old-record-id-VlUIdG6M5oyNQtxEfMmcip5Qnse\"> <div data-page-id=\"BRNmd6WIMoSTABx99W3ccVAwnZf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-TLJCdvI1Por5cHxolDZcOPlrnZb\">FRANCHISE_RELATIONSHIP:与主商户/总店为连续/加盟/直营店，共用相同小程序/公众号</div> <div class=\"ace-line ace-line old-record-id-OGKCdCjJGo8SIMxlt2gcc8GHnWh\">BUSINESS_DISTRICT:商圈形式（商家联盟）型商户，主商户/总店为软件商/商城管理方等，为使用小程序/公众号交易</div> <div class=\"ace-line ace-line old-record-id-JjhRdy5rMonNOtxJ7Dtc16sBnPd\">COLLEGE_CANTEEN:高校食堂档口，因需要使用校方/食堂管理方小程序，并参加高校食堂活动</div> <div class=\"ace-line ace-line old-record-id-BOqMdYkkpoCx1pxPLD5cLRzbnSg\">OTHER:其他</div> </div> </div> </div>
+   */
+  @JsonProperty("requestReasonType")
+  private String requestReasonType = null;
+
+  /**
+   * <p>申请原因</p> <p>申请原因类型为OTHER时此字段必传</p>
+   */
+  @JsonProperty("requestReason")
+  private String requestReason = null;
+
+  /**
+   * <p>集团名称</p>
+   */
+  @JsonProperty("groupName")
+  private String groupName = null;
+
+  /**
+   * <p>通知地址</p> <p>不传则无通知</p>
+   */
+  @JsonProperty("notifyUrl")
+  private String notifyUrl = null;
+
+  public AttachReportRequestDTO mainMerchantNo(String mainMerchantNo) {
+    this.mainMerchantNo = mainMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>主商户号</p>
+   * @return mainMerchantNo
+  **/
+
+  public String getMainMerchantNo() {
+    return mainMerchantNo;
+  }
+
+  public void setMainMerchantNo(String mainMerchantNo) {
+    this.mainMerchantNo = mainMerchantNo;
+  }
+
+  public AttachReportRequestDTO merchantNoList(String merchantNoList) {
+    this.merchantNoList = merchantNoList;
+    return this;
+  }
+
+   /**
+   * <p>从属商户列表</p> <p>以英文逗号分隔</p>
+   * @return merchantNoList
+  **/
+
+  public String getMerchantNoList() {
+    return merchantNoList;
+  }
+
+  public void setMerchantNoList(String merchantNoList) {
+    this.merchantNoList = merchantNoList;
+  }
+
+  public AttachReportRequestDTO authFileName(String authFileName) {
+    this.authFileName = authFileName;
+    return this;
+  }
+
+   /**
+   * <p>授权函文件名</p>
+   * @return authFileName
+  **/
+
+  public String getAuthFileName() {
+    return authFileName;
+  }
+
+  public void setAuthFileName(String authFileName) {
+    this.authFileName = authFileName;
+  }
+
+  public AttachReportRequestDTO authFileUrl(String authFileUrl) {
+    this.authFileUrl = authFileUrl;
+    return this;
+  }
+
+   /**
+   * <p>授权函文件地址</p>
+   * @return authFileUrl
+  **/
+
+  public String getAuthFileUrl() {
+    return authFileUrl;
+  }
+
+  public void setAuthFileUrl(String authFileUrl) {
+    this.authFileUrl = authFileUrl;
+  }
+
+  public AttachReportRequestDTO channel(String channel) {
+    this.channel = channel;
+    return this;
+  }
+
+   /**
+   *  <p>WECHAT:微信</p> <p>ALIPAY:支付宝</p>
+   * @return channel
+  **/
+
+  public String getChannel() {
+    return channel;
+  }
+
+  public void setChannel(String channel) {
+    this.channel = channel;
+  }
+
+  public AttachReportRequestDTO payWayList(String payWayList) {
+    this.payWayList = payWayList;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"BRNmd6WIMoSTABx99W3ccVAwnZf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KxKedSMLAonADhxgZLIca4Bdn1f\">申请支付方式列表</div> <div class=\"ace-line ace-line old-record-id-ImY3du6YwoClofx6ihQcBx9SnZb\">USER_SCAN:主扫支付</div> <div class=\"ace-line ace-line old-record-id-CUBXdmXAKogmzyxja65cLh3qngd\">MERCHANT_SCAN:被扫支付</div> <div class=\"ace-line ace-line old-record-id-EvQPds8jBoTI9kxHMGkclpkInJf\">MINI_PROGRAM:小程序支付</div> <div class=\"ace-line ace-line old-record-id-XJbrd5GUAoZ6hZx5CF4cap1DnLO\">WECHAT_OFFIACCOUNT:公众号支付</div> <div class=\"ace-line ace-line old-record-id-NEu8dgE8Wo5AeEx5UlEcVLyUnyd\">ALIPAY_LIFE:支付宝生活号</div> <div class=\"ace-line ace-line old-record-id-OxcPdhtswoNrgWxcjC4ciTNcnve\">支付方式以,分隔</div> </div>
+   * @return payWayList
+  **/
+
+  public String getPayWayList() {
+    return payWayList;
+  }
+
+  public void setPayWayList(String payWayList) {
+    this.payWayList = payWayList;
+  }
+
+  public AttachReportRequestDTO requestReasonType(String requestReasonType) {
+    this.requestReasonType = requestReasonType;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"BRNmd6WIMoSTABx99W3ccVAwnZf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VlUIdG6M5oyNQtxEfMmcip5Qnse\">申请原因类型</div> <div class=\"ace-line ace-line old-record-id-VlUIdG6M5oyNQtxEfMmcip5Qnse\"> <div data-page-id=\"BRNmd6WIMoSTABx99W3ccVAwnZf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-TLJCdvI1Por5cHxolDZcOPlrnZb\">FRANCHISE_RELATIONSHIP:与主商户/总店为连续/加盟/直营店，共用相同小程序/公众号</div> <div class=\"ace-line ace-line old-record-id-OGKCdCjJGo8SIMxlt2gcc8GHnWh\">BUSINESS_DISTRICT:商圈形式（商家联盟）型商户，主商户/总店为软件商/商城管理方等，为使用小程序/公众号交易</div> <div class=\"ace-line ace-line old-record-id-JjhRdy5rMonNOtxJ7Dtc16sBnPd\">COLLEGE_CANTEEN:高校食堂档口，因需要使用校方/食堂管理方小程序，并参加高校食堂活动</div> <div class=\"ace-line ace-line old-record-id-BOqMdYkkpoCx1pxPLD5cLRzbnSg\">OTHER:其他</div> </div> </div> </div>
+   * @return requestReasonType
+  **/
+
+  public String getRequestReasonType() {
+    return requestReasonType;
+  }
+
+  public void setRequestReasonType(String requestReasonType) {
+    this.requestReasonType = requestReasonType;
+  }
+
+  public AttachReportRequestDTO requestReason(String requestReason) {
+    this.requestReason = requestReason;
+    return this;
+  }
+
+   /**
+   * <p>申请原因</p> <p>申请原因类型为OTHER时此字段必传</p>
+   * @return requestReason
+  **/
+
+  public String getRequestReason() {
+    return requestReason;
+  }
+
+  public void setRequestReason(String requestReason) {
+    this.requestReason = requestReason;
+  }
+
+  public AttachReportRequestDTO groupName(String groupName) {
+    this.groupName = groupName;
+    return this;
+  }
+
+   /**
+   * <p>集团名称</p>
+   * @return groupName
+  **/
+
+  public String getGroupName() {
+    return groupName;
+  }
+
+  public void setGroupName(String groupName) {
+    this.groupName = groupName;
+  }
+
+  public AttachReportRequestDTO notifyUrl(String notifyUrl) {
+    this.notifyUrl = notifyUrl;
+    return this;
+  }
+
+   /**
+   * <p>通知地址</p> <p>不传则无通知</p>
+   * @return notifyUrl
+  **/
+
+  public String getNotifyUrl() {
+    return notifyUrl;
+  }
+
+  public void setNotifyUrl(String notifyUrl) {
+    this.notifyUrl = notifyUrl;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AttachReportRequestDTO attachReportRequestDTO = (AttachReportRequestDTO) o;
+    return ObjectUtils.equals(this.mainMerchantNo, attachReportRequestDTO.mainMerchantNo) &&
+    ObjectUtils.equals(this.merchantNoList, attachReportRequestDTO.merchantNoList) &&
+    ObjectUtils.equals(this.authFileName, attachReportRequestDTO.authFileName) &&
+    ObjectUtils.equals(this.authFileUrl, attachReportRequestDTO.authFileUrl) &&
+    ObjectUtils.equals(this.channel, attachReportRequestDTO.channel) &&
+    ObjectUtils.equals(this.payWayList, attachReportRequestDTO.payWayList) &&
+    ObjectUtils.equals(this.requestReasonType, attachReportRequestDTO.requestReasonType) &&
+    ObjectUtils.equals(this.requestReason, attachReportRequestDTO.requestReason) &&
+    ObjectUtils.equals(this.groupName, attachReportRequestDTO.groupName) &&
+    ObjectUtils.equals(this.notifyUrl, attachReportRequestDTO.notifyUrl);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(mainMerchantNo, merchantNoList, authFileName, authFileUrl, channel, payWayList, requestReasonType, requestReason, groupName, notifyUrl);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AttachReportRequestDTO {\n");
+    
+    sb.append("    mainMerchantNo: ").append(toIndentedString(mainMerchantNo)).append("\n");
+    sb.append("    merchantNoList: ").append(toIndentedString(merchantNoList)).append("\n");
+    sb.append("    authFileName: ").append(toIndentedString(authFileName)).append("\n");
+    sb.append("    authFileUrl: ").append(toIndentedString(authFileUrl)).append("\n");
+    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
+    sb.append("    payWayList: ").append(toIndentedString(payWayList)).append("\n");
+    sb.append("    requestReasonType: ").append(toIndentedString(requestReasonType)).append("\n");
+    sb.append("    requestReason: ").append(toIndentedString(requestReason)).append("\n");
+    sb.append("    groupName: ").append(toIndentedString(groupName)).append("\n");
+    sb.append("    notifyUrl: ").append(toIndentedString(notifyUrl)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AttachReportResponseDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 资质提交返回参数
+ */
+public class AttachReportResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * <p>工单号</p>
+   */
+  @JsonProperty("processNo")
+  private String processNo = null;
+
+  public AttachReportResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public AttachReportResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public AttachReportResponseDTO processNo(String processNo) {
+    this.processNo = processNo;
+    return this;
+  }
+
+   /**
+   * <p>工单号</p>
+   * @return processNo
+  **/
+
+  public String getProcessNo() {
+    return processNo;
+  }
+
+  public void setProcessNo(String processNo) {
+    this.processNo = processNo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AttachReportResponseDTO attachReportResponseDTO = (AttachReportResponseDTO) o;
+    return ObjectUtils.equals(this.code, attachReportResponseDTO.code) &&
+    ObjectUtils.equals(this.message, attachReportResponseDTO.message) &&
+    ObjectUtils.equals(this.processNo, attachReportResponseDTO.processNo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, processNo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AttachReportResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    processNo: ").append(toIndentedString(processNo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AwardReceiveRequestDTO.java

@@ -0,0 +1,196 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class AwardReceiveRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("userId")
+  private String userId = null;
+
+  /**
+   * <p>可选项如下：</p> <p>online：线上</p> <p>offline：线下</p>
+   */
+  @JsonProperty("sceneType")
+  private String sceneType = null;
+
+  /**
+   * <p>可选项如下：</p> <p>ONLINE_PAYMENT:线上支付</p> <p>USER_SCAN:主扫</p> <p>MERCHANT_SCAN:被扫</p> <p>ALIPAY_TOUCH:碰一碰</p> <p>FACE_PAY:扫脸</p>
+   */
+  @JsonProperty("trading")
+  private String trading = null;
+
+  public AwardReceiveRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * Get merchantNo
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public AwardReceiveRequestDTO userId(String userId) {
+    this.userId = userId;
+    return this;
+  }
+
+   /**
+   * Get userId
+   * @return userId
+  **/
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  public AwardReceiveRequestDTO sceneType(String sceneType) {
+    this.sceneType = sceneType;
+    return this;
+  }
+
+   /**
+   * <p>可选项如下：</p> <p>online：线上</p> <p>offline：线下</p>
+   * @return sceneType
+  **/
+
+  public String getSceneType() {
+    return sceneType;
+  }
+
+  public void setSceneType(String sceneType) {
+    this.sceneType = sceneType;
+  }
+
+  public AwardReceiveRequestDTO trading(String trading) {
+    this.trading = trading;
+    return this;
+  }
+
+   /**
+   * <p>可选项如下：</p> <p>ONLINE_PAYMENT:线上支付</p> <p>USER_SCAN:主扫</p> <p>MERCHANT_SCAN:被扫</p> <p>ALIPAY_TOUCH:碰一碰</p> <p>FACE_PAY:扫脸</p>
+   * @return trading
+  **/
+
+  public String getTrading() {
+    return trading;
+  }
+
+  public void setTrading(String trading) {
+    this.trading = trading;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AwardReceiveRequestDTO awardReceiveRequestDTO = (AwardReceiveRequestDTO) o;
+    return ObjectUtils.equals(this.merchantNo, awardReceiveRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.userId, awardReceiveRequestDTO.userId) &&
+    ObjectUtils.equals(this.sceneType, awardReceiveRequestDTO.sceneType) &&
+    ObjectUtils.equals(this.trading, awardReceiveRequestDTO.trading);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(merchantNo, userId, sceneType, trading);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AwardReceiveRequestDTO {\n");
+    
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    userId: ").append(toIndentedString(userId)).append("\n");
+    sb.append("    sceneType: ").append(toIndentedString(sceneType)).append("\n");
+    sb.append("    trading: ").append(toIndentedString(trading)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/AwardReceiveResponseDTO.java

@@ -0,0 +1,144 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class AwardReceiveResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  public AwardReceiveResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public AwardReceiveResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    AwardReceiveResponseDTO awardReceiveResponseDTO = (AwardReceiveResponseDTO) o;
+    return ObjectUtils.equals(this.code, awardReceiveResponseDTO.code) &&
+    ObjectUtils.equals(this.message, awardReceiveResponseDTO.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AwardReceiveResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/BaseResponseDTO.java

@@ -0,0 +1,144 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 响应结果
+ */
+public class BaseResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 返回码
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 返回信息
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  public BaseResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * 返回码
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public BaseResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * 返回信息
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    BaseResponseDTO baseResponseDTO = (BaseResponseDTO) o;
+    return ObjectUtils.equals(this.code, baseResponseDTO.code) &&
+    ObjectUtils.equals(this.message, baseResponseDTO.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BaseResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/BatchCreateRetailRequestDTO.java

@@ -0,0 +1,151 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 请求参数
+ */
+public class BatchCreateRetailRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>收单商编，调用接口为该商编录入门店信息（商户需开通微信B2B及B2C产品）</p>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <p>门店信息，每次调用最多可导入100个门店</p>
+   */
+  @JsonProperty("infoList")
+  private List<RetailInfoDTO> infoList = new ArrayList<>();
+
+  public BatchCreateRetailRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;收单商编，调用接口为该商编录入门店信息（商户需开通微信B2B及B2C产品）&lt;/p&gt;
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public BatchCreateRetailRequestDTO infoList(List<RetailInfoDTO> infoList) {
+    this.infoList = infoList;
+    return this;
+  }
+
+  public BatchCreateRetailRequestDTO addInfoListItem(RetailInfoDTO infoListItem) {
+    this.infoList.add(infoListItem);
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;门店信息，每次调用最多可导入100个门店&lt;/p&gt;
+   * @return infoList
+  **/
+
+  public List<RetailInfoDTO> getInfoList() {
+    return infoList;
+  }
+
+  public void setInfoList(List<RetailInfoDTO> infoList) {
+    this.infoList = infoList;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    BatchCreateRetailRequestDTO batchCreateRetailRequestDTO = (BatchCreateRetailRequestDTO) o;
+    return ObjectUtils.equals(this.merchantNo, batchCreateRetailRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.infoList, batchCreateRetailRequestDTO.infoList);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(merchantNo, infoList);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BatchCreateRetailRequestDTO {\n");
+    
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    infoList: ").append(toIndentedString(infoList)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/BatchCreateRetailResponseDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 响应结果
+ */
+public class BatchCreateRetailResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("resultInfo")
+  private BatchCreateRetailResultInfoDTO resultInfo = null;
+
+  public BatchCreateRetailResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public BatchCreateRetailResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public BatchCreateRetailResponseDTO resultInfo(BatchCreateRetailResultInfoDTO resultInfo) {
+    this.resultInfo = resultInfo;
+    return this;
+  }
+
+   /**
+   * Get resultInfo
+   * @return resultInfo
+  **/
+
+  public BatchCreateRetailResultInfoDTO getResultInfo() {
+    return resultInfo;
+  }
+
+  public void setResultInfo(BatchCreateRetailResultInfoDTO resultInfo) {
+    this.resultInfo = resultInfo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    BatchCreateRetailResponseDTO batchCreateRetailResponseDTO = (BatchCreateRetailResponseDTO) o;
+    return ObjectUtils.equals(this.code, batchCreateRetailResponseDTO.code) &&
+    ObjectUtils.equals(this.message, batchCreateRetailResponseDTO.message) &&
+    ObjectUtils.equals(this.resultInfo, batchCreateRetailResponseDTO.resultInfo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, resultInfo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BatchCreateRetailResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    resultInfo: ").append(toIndentedString(resultInfo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/BatchCreateRetailResultInfoDTO.java

@@ -0,0 +1,180 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 批量创建结果
+ */
+public class BatchCreateRetailResultInfoDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>录入成功条数</p>
+   */
+  @JsonProperty("successNum")
+  private Long successNum = null;
+
+  /**
+   * <p>录入失败条数</p>
+   */
+  @JsonProperty("failNum")
+  private Long failNum = null;
+
+  /**
+   * <p>失败列表</p>
+   */
+  @JsonProperty("failRecordList")
+  private List<RetailCreateFailInfoDTO> failRecordList = null;
+
+  public BatchCreateRetailResultInfoDTO successNum(Long successNum) {
+    this.successNum = successNum;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;录入成功条数&lt;/p&gt;
+   * @return successNum
+  **/
+
+  public Long getSuccessNum() {
+    return successNum;
+  }
+
+  public void setSuccessNum(Long successNum) {
+    this.successNum = successNum;
+  }
+
+  public BatchCreateRetailResultInfoDTO failNum(Long failNum) {
+    this.failNum = failNum;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;录入失败条数&lt;/p&gt;
+   * @return failNum
+  **/
+
+  public Long getFailNum() {
+    return failNum;
+  }
+
+  public void setFailNum(Long failNum) {
+    this.failNum = failNum;
+  }
+
+  public BatchCreateRetailResultInfoDTO failRecordList(List<RetailCreateFailInfoDTO> failRecordList) {
+    this.failRecordList = failRecordList;
+    return this;
+  }
+
+  public BatchCreateRetailResultInfoDTO addFailRecordListItem(RetailCreateFailInfoDTO failRecordListItem) {
+    if (this.failRecordList == null) {
+      this.failRecordList = new ArrayList<>();
+    }
+    this.failRecordList.add(failRecordListItem);
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;失败列表&lt;/p&gt;
+   * @return failRecordList
+  **/
+
+  public List<RetailCreateFailInfoDTO> getFailRecordList() {
+    return failRecordList;
+  }
+
+  public void setFailRecordList(List<RetailCreateFailInfoDTO> failRecordList) {
+    this.failRecordList = failRecordList;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    BatchCreateRetailResultInfoDTO batchCreateRetailResultInfoDTO = (BatchCreateRetailResultInfoDTO) o;
+    return ObjectUtils.equals(this.successNum, batchCreateRetailResultInfoDTO.successNum) &&
+    ObjectUtils.equals(this.failNum, batchCreateRetailResultInfoDTO.failNum) &&
+    ObjectUtils.equals(this.failRecordList, batchCreateRetailResultInfoDTO.failRecordList);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(successNum, failNum, failRecordList);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BatchCreateRetailResultInfoDTO {\n");
+    
+    sb.append("    successNum: ").append(toIndentedString(successNum)).append("\n");
+    sb.append("    failNum: ").append(toIndentedString(failNum)).append("\n");
+    sb.append("    failRecordList: ").append(toIndentedString(failRecordList)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/CloseOrderResponseDTO.java

@@ -0,0 +1,222 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class CloseOrderResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>成功：00000</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>商户收款请求号</p>
+   */
+  @JsonProperty("orderId")
+  private String orderId = null;
+
+  /**
+   * <p>发起方商编</p>
+   */
+  @JsonProperty("parentMerchantNo")
+  private String parentMerchantNo = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * <p>商户编号</p>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  public CloseOrderResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>成功：00000</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public CloseOrderResponseDTO orderId(String orderId) {
+    this.orderId = orderId;
+    return this;
+  }
+
+   /**
+   * <p>商户收款请求号</p>
+   * @return orderId
+  **/
+
+  public String getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(String orderId) {
+    this.orderId = orderId;
+  }
+
+  public CloseOrderResponseDTO parentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>发起方商编</p>
+   * @return parentMerchantNo
+  **/
+
+  public String getParentMerchantNo() {
+    return parentMerchantNo;
+  }
+
+  public void setParentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+  }
+
+  public CloseOrderResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public CloseOrderResponseDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * <p>商户编号</p>
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    CloseOrderResponseDTO closeOrderResponseDTO = (CloseOrderResponseDTO) o;
+    return ObjectUtils.equals(this.code, closeOrderResponseDTO.code) &&
+    ObjectUtils.equals(this.orderId, closeOrderResponseDTO.orderId) &&
+    ObjectUtils.equals(this.parentMerchantNo, closeOrderResponseDTO.parentMerchantNo) &&
+    ObjectUtils.equals(this.message, closeOrderResponseDTO.message) &&
+    ObjectUtils.equals(this.merchantNo, closeOrderResponseDTO.merchantNo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, orderId, parentMerchantNo, message, merchantNo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CloseOrderResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
+    sb.append("    parentMerchantNo: ").append(toIndentedString(parentMerchantNo)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/ClosedOrderResult.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 关单返回模型
+ */
+public class ClosedOrderResult implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("data")
+  private OrderCloseResponseDTO data = null;
+
+  public ClosedOrderResult code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public ClosedOrderResult message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public ClosedOrderResult data(OrderCloseResponseDTO data) {
+    this.data = data;
+    return this;
+  }
+
+   /**
+   * Get data
+   * @return data
+  **/
+
+  public OrderCloseResponseDTO getData() {
+    return data;
+  }
+
+  public void setData(OrderCloseResponseDTO data) {
+    this.data = data;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    ClosedOrderResult closedOrderResult = (ClosedOrderResult) o;
+    return ObjectUtils.equals(this.code, closedOrderResult.code) &&
+    ObjectUtils.equals(this.message, closedOrderResult.message) &&
+    ObjectUtils.equals(this.data, closedOrderResult.data);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, data);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ClosedOrderResult {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/ConfigMerchantDTO.java

@@ -0,0 +1,188 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 未命名
+ */
+public class ConfigMerchantDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 报备商户号
+   */
+  @JsonProperty("reportMerchantNo")
+  private String reportMerchantNo = null;
+
+  /**
+   * 支付授权目录列表
+   */
+  @JsonProperty("tradeAuthDirList")
+  private List<TradeAuthDirDTO> tradeAuthDirList = null;
+
+  /**
+   * 支付appId配置列表
+   */
+  @JsonProperty("appIdList")
+  private List<AppIdConfigDetail> appIdList = null;
+
+  public ConfigMerchantDTO reportMerchantNo(String reportMerchantNo) {
+    this.reportMerchantNo = reportMerchantNo;
+    return this;
+  }
+
+   /**
+   * 报备商户号
+   * @return reportMerchantNo
+  **/
+
+  public String getReportMerchantNo() {
+    return reportMerchantNo;
+  }
+
+  public void setReportMerchantNo(String reportMerchantNo) {
+    this.reportMerchantNo = reportMerchantNo;
+  }
+
+  public ConfigMerchantDTO tradeAuthDirList(List<TradeAuthDirDTO> tradeAuthDirList) {
+    this.tradeAuthDirList = tradeAuthDirList;
+    return this;
+  }
+
+  public ConfigMerchantDTO addTradeAuthDirListItem(TradeAuthDirDTO tradeAuthDirListItem) {
+    if (this.tradeAuthDirList == null) {
+      this.tradeAuthDirList = new ArrayList<>();
+    }
+    this.tradeAuthDirList.add(tradeAuthDirListItem);
+    return this;
+  }
+
+   /**
+   * 支付授权目录列表
+   * @return tradeAuthDirList
+  **/
+
+  public List<TradeAuthDirDTO> getTradeAuthDirList() {
+    return tradeAuthDirList;
+  }
+
+  public void setTradeAuthDirList(List<TradeAuthDirDTO> tradeAuthDirList) {
+    this.tradeAuthDirList = tradeAuthDirList;
+  }
+
+  public ConfigMerchantDTO appIdList(List<AppIdConfigDetail> appIdList) {
+    this.appIdList = appIdList;
+    return this;
+  }
+
+  public ConfigMerchantDTO addAppIdListItem(AppIdConfigDetail appIdListItem) {
+    if (this.appIdList == null) {
+      this.appIdList = new ArrayList<>();
+    }
+    this.appIdList.add(appIdListItem);
+    return this;
+  }
+
+   /**
+   * 支付appId配置列表
+   * @return appIdList
+  **/
+
+  public List<AppIdConfigDetail> getAppIdList() {
+    return appIdList;
+  }
+
+  public void setAppIdList(List<AppIdConfigDetail> appIdList) {
+    this.appIdList = appIdList;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    ConfigMerchantDTO configMerchantDTO = (ConfigMerchantDTO) o;
+    return ObjectUtils.equals(this.reportMerchantNo, configMerchantDTO.reportMerchantNo) &&
+    ObjectUtils.equals(this.tradeAuthDirList, configMerchantDTO.tradeAuthDirList) &&
+    ObjectUtils.equals(this.appIdList, configMerchantDTO.appIdList);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(reportMerchantNo, tradeAuthDirList, appIdList);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ConfigMerchantDTO {\n");
+    
+    sb.append("    reportMerchantNo: ").append(toIndentedString(reportMerchantNo)).append("\n");
+    sb.append("    tradeAuthDirList: ").append(toIndentedString(tradeAuthDirList)).append("\n");
+    sb.append("    appIdList: ").append(toIndentedString(appIdList)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/CreditScoreAuthorizationQueryRequestDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class CreditScoreAuthorizationQueryRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>*标准商户收付款方案中此参数与收款商户编号一致；<br />*平台商户收付款方案中此参数为平台商商户编号；<br />*服务商解决方案中，①标准商户收款时，该参数为标准商户商编 ②平台商收款或平台商入驻商户收款时，该参数为平台商商编。<br />如果商户使用先下单再支付模式，已传入token，则本字段可以不传值，否则必须传值</p>
+   */
+  @JsonProperty("parentMerchantNo")
+  private String parentMerchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("authorizationId")
+  private String authorizationId = null;
+
+  public CreditScoreAuthorizationQueryRequestDTO parentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>*标准商户收付款方案中此参数与收款商户编号一致；<br />*平台商户收付款方案中此参数为平台商商户编号；<br />*服务商解决方案中，①标准商户收款时，该参数为标准商户商编 ②平台商收款或平台商入驻商户收款时，该参数为平台商商编。<br />如果商户使用先下单再支付模式，已传入token，则本字段可以不传值，否则必须传值</p>
+   * @return parentMerchantNo
+  **/
+
+  public String getParentMerchantNo() {
+    return parentMerchantNo;
+  }
+
+  public void setParentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+  }
+
+  public CreditScoreAuthorizationQueryRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * Get merchantNo
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public CreditScoreAuthorizationQueryRequestDTO authorizationId(String authorizationId) {
+    this.authorizationId = authorizationId;
+    return this;
+  }
+
+   /**
+   * Get authorizationId
+   * @return authorizationId
+  **/
+
+  public String getAuthorizationId() {
+    return authorizationId;
+  }
+
+  public void setAuthorizationId(String authorizationId) {
+    this.authorizationId = authorizationId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    CreditScoreAuthorizationQueryRequestDTO creditScoreAuthorizationQueryRequestDTO = (CreditScoreAuthorizationQueryRequestDTO) o;
+    return ObjectUtils.equals(this.parentMerchantNo, creditScoreAuthorizationQueryRequestDTO.parentMerchantNo) &&
+    ObjectUtils.equals(this.merchantNo, creditScoreAuthorizationQueryRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.authorizationId, creditScoreAuthorizationQueryRequestDTO.authorizationId);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(parentMerchantNo, merchantNo, authorizationId);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CreditScoreAuthorizationQueryRequestDTO {\n");
+    
+    sb.append("    parentMerchantNo: ").append(toIndentedString(parentMerchantNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    authorizationId: ").append(toIndentedString(authorizationId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/CreditScoreAuthorizationQueryResponseDTO.java

@@ -0,0 +1,452 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class CreditScoreAuthorizationQueryResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("authorizationId")
+  private String authorizationId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("uniqueAuthorizationNo")
+  private String uniqueAuthorizationNo = null;
+
+  /**
+   *  可选项如下: WECHAT:微信 
+   */
+  public enum ChannelEnum {
+    WECHAT("WECHAT");
+
+    private String value;
+
+    ChannelEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static ChannelEnum fromValue(String text) {
+      for (ChannelEnum b : ChannelEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: WECHAT:微信 
+   */
+  @JsonProperty("channel")
+  private ChannelEnum channel = null;
+
+  /**
+   *  可选项如下: CREDIT_PAY:信用分 
+   */
+  public enum PayWayEnum {
+    PAY("CREDIT_PAY");
+
+    private String value;
+
+    PayWayEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PayWayEnum fromValue(String text) {
+      for (PayWayEnum b : PayWayEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: CREDIT_PAY:信用分 
+   */
+  @JsonProperty("payWay")
+  private PayWayEnum payWay = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("serviceId")
+  private String serviceId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("appId")
+  private String appId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("userId")
+  private String userId = null;
+
+  /**
+   *  可选项如下: UNBINDUSER:未绑定用户 AVAILABLE:已授权 UNAVAILABLE:已解除授权 
+   */
+  public enum AuthorizationStatusEnum {
+    UNBINDUSER("UNBINDUSER"),
+    
+    AVAILABLE("AVAILABLE"),
+    
+    UNAVAILABLE("UNAVAILABLE");
+
+    private String value;
+
+    AuthorizationStatusEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static AuthorizationStatusEnum fromValue(String text) {
+      for (AuthorizationStatusEnum b : AuthorizationStatusEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: UNBINDUSER:未绑定用户 AVAILABLE:已授权 UNAVAILABLE:已解除授权 
+   */
+  @JsonProperty("authorizationStatus")
+  private AuthorizationStatusEnum authorizationStatus = null;
+
+  public CreditScoreAuthorizationQueryResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public CreditScoreAuthorizationQueryResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public CreditScoreAuthorizationQueryResponseDTO authorizationId(String authorizationId) {
+    this.authorizationId = authorizationId;
+    return this;
+  }
+
+   /**
+   * Get authorizationId
+   * @return authorizationId
+  **/
+
+  public String getAuthorizationId() {
+    return authorizationId;
+  }
+
+  public void setAuthorizationId(String authorizationId) {
+    this.authorizationId = authorizationId;
+  }
+
+  public CreditScoreAuthorizationQueryResponseDTO uniqueAuthorizationNo(String uniqueAuthorizationNo) {
+    this.uniqueAuthorizationNo = uniqueAuthorizationNo;
+    return this;
+  }
+
+   /**
+   * Get uniqueAuthorizationNo
+   * @return uniqueAuthorizationNo
+  **/
+
+  public String getUniqueAuthorizationNo() {
+    return uniqueAuthorizationNo;
+  }
+
+  public void setUniqueAuthorizationNo(String uniqueAuthorizationNo) {
+    this.uniqueAuthorizationNo = uniqueAuthorizationNo;
+  }
+
+  public CreditScoreAuthorizationQueryResponseDTO channel(ChannelEnum channel) {
+    this.channel = channel;
+    return this;
+  }
+
+   /**
+   *  可选项如下: WECHAT:微信 
+   * @return channel
+  **/
+
+  public ChannelEnum getChannel() {
+    return channel;
+  }
+
+  public void setChannel(ChannelEnum channel) {
+    this.channel = channel;
+  }
+
+  public CreditScoreAuthorizationQueryResponseDTO payWay(PayWayEnum payWay) {
+    this.payWay = payWay;
+    return this;
+  }
+
+   /**
+   *  可选项如下: CREDIT_PAY:信用分 
+   * @return payWay
+  **/
+
+  public PayWayEnum getPayWay() {
+    return payWay;
+  }
+
+  public void setPayWay(PayWayEnum payWay) {
+    this.payWay = payWay;
+  }
+
+  public CreditScoreAuthorizationQueryResponseDTO serviceId(String serviceId) {
+    this.serviceId = serviceId;
+    return this;
+  }
+
+   /**
+   * Get serviceId
+   * @return serviceId
+  **/
+
+  public String getServiceId() {
+    return serviceId;
+  }
+
+  public void setServiceId(String serviceId) {
+    this.serviceId = serviceId;
+  }
+
+  public CreditScoreAuthorizationQueryResponseDTO appId(String appId) {
+    this.appId = appId;
+    return this;
+  }
+
+   /**
+   * Get appId
+   * @return appId
+  **/
+
+  public String getAppId() {
+    return appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public CreditScoreAuthorizationQueryResponseDTO userId(String userId) {
+    this.userId = userId;
+    return this;
+  }
+
+   /**
+   * Get userId
+   * @return userId
+  **/
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  public CreditScoreAuthorizationQueryResponseDTO authorizationStatus(AuthorizationStatusEnum authorizationStatus) {
+    this.authorizationStatus = authorizationStatus;
+    return this;
+  }
+
+   /**
+   *  可选项如下: UNBINDUSER:未绑定用户 AVAILABLE:已授权 UNAVAILABLE:已解除授权 
+   * @return authorizationStatus
+  **/
+
+  public AuthorizationStatusEnum getAuthorizationStatus() {
+    return authorizationStatus;
+  }
+
+  public void setAuthorizationStatus(AuthorizationStatusEnum authorizationStatus) {
+    this.authorizationStatus = authorizationStatus;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    CreditScoreAuthorizationQueryResponseDTO creditScoreAuthorizationQueryResponseDTO = (CreditScoreAuthorizationQueryResponseDTO) o;
+    return ObjectUtils.equals(this.code, creditScoreAuthorizationQueryResponseDTO.code) &&
+    ObjectUtils.equals(this.message, creditScoreAuthorizationQueryResponseDTO.message) &&
+    ObjectUtils.equals(this.authorizationId, creditScoreAuthorizationQueryResponseDTO.authorizationId) &&
+    ObjectUtils.equals(this.uniqueAuthorizationNo, creditScoreAuthorizationQueryResponseDTO.uniqueAuthorizationNo) &&
+    ObjectUtils.equals(this.channel, creditScoreAuthorizationQueryResponseDTO.channel) &&
+    ObjectUtils.equals(this.payWay, creditScoreAuthorizationQueryResponseDTO.payWay) &&
+    ObjectUtils.equals(this.serviceId, creditScoreAuthorizationQueryResponseDTO.serviceId) &&
+    ObjectUtils.equals(this.appId, creditScoreAuthorizationQueryResponseDTO.appId) &&
+    ObjectUtils.equals(this.userId, creditScoreAuthorizationQueryResponseDTO.userId) &&
+    ObjectUtils.equals(this.authorizationStatus, creditScoreAuthorizationQueryResponseDTO.authorizationStatus);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, authorizationId, uniqueAuthorizationNo, channel, payWay, serviceId, appId, userId, authorizationStatus);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CreditScoreAuthorizationQueryResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    authorizationId: ").append(toIndentedString(authorizationId)).append("\n");
+    sb.append("    uniqueAuthorizationNo: ").append(toIndentedString(uniqueAuthorizationNo)).append("\n");
+    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
+    sb.append("    payWay: ").append(toIndentedString(payWay)).append("\n");
+    sb.append("    serviceId: ").append(toIndentedString(serviceId)).append("\n");
+    sb.append("    appId: ").append(toIndentedString(appId)).append("\n");
+    sb.append("    userId: ").append(toIndentedString(userId)).append("\n");
+    sb.append("    authorizationStatus: ").append(toIndentedString(authorizationStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/CreditScoreAuthorizationRequestDTO.java

@@ -0,0 +1,488 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fs.ybPay.request.serializer.YopCustomSerializer;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class CreditScoreAuthorizationRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>*标准商户收付款方案中此参数与收款商户编号一致；<br />*平台商户收付款方案中此参数为平台商商户编号；<br />*服务商解决方案中，①标准商户收款时，该参数为标准商户商编 ②平台商收款或平台商入驻商户收款时，该参数为平台商商编。<br />如果商户使用先下单再支付模式，已传入token，则本字段可以不传值，否则必须传值</p>
+   */
+  @JsonProperty("parentMerchantNo")
+  private String parentMerchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("authorizationId")
+  private String authorizationId = null;
+
+  /**
+   *  可选项如下: WECHAT:微信 
+   */
+  public enum ChannelEnum {
+    WECHAT("WECHAT");
+
+    private String value;
+
+    ChannelEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static ChannelEnum fromValue(String text) {
+      for (ChannelEnum b : ChannelEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: WECHAT:微信 
+   */
+  @JsonProperty("channel")
+  private ChannelEnum channel = null;
+
+  /**
+   *  可选项如下: CREDIT_PAY:信用分 
+   */
+  public enum PayWayEnum {
+    PAY("CREDIT_PAY");
+
+    private String value;
+
+    PayWayEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PayWayEnum fromValue(String text) {
+      for (PayWayEnum b : PayWayEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: CREDIT_PAY:信用分 
+   */
+  @JsonProperty("payWay")
+  private PayWayEnum payWay = null;
+
+  /**
+   *  可选项如下: ONLINE:线上 
+   */
+  public enum SceneEnum {
+    ONLINE("ONLINE");
+
+    private String value;
+
+    SceneEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static SceneEnum fromValue(String text) {
+      for (SceneEnum b : SceneEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: ONLINE:线上 
+   */
+  @JsonProperty("scene")
+  private SceneEnum scene = null;
+
+  /**
+   *  可选项如下: WECHAT_OFFIACCOUNT:微信公众号 WECHAT_MINI_PROGRAM:微信小程序 SDK:SDK 
+   */
+  public enum InvokeSceneEnum {
+    WECHAT_OFFIACCOUNT("WECHAT_OFFIACCOUNT"),
+    
+    WECHAT_MINI_PROGRAM("WECHAT_MINI_PROGRAM"),
+    
+    SDK("SDK");
+
+    private String value;
+
+    InvokeSceneEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static InvokeSceneEnum fromValue(String text) {
+      for (InvokeSceneEnum b : InvokeSceneEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: WECHAT_OFFIACCOUNT:微信公众号 WECHAT_MINI_PROGRAM:微信小程序 SDK:SDK 
+   */
+  @JsonProperty("invokeScene")
+  private InvokeSceneEnum invokeScene = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("appId")
+  private String appId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("serviceId")
+  private String serviceId = null;
+
+  /**
+   * <p>接收授权结果通知</p>
+   */
+  @JsonProperty("notifyUrl")
+  private String notifyUrl = null;
+
+  public CreditScoreAuthorizationRequestDTO parentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>*标准商户收付款方案中此参数与收款商户编号一致；<br />*平台商户收付款方案中此参数为平台商商户编号；<br />*服务商解决方案中，①标准商户收款时，该参数为标准商户商编 ②平台商收款或平台商入驻商户收款时，该参数为平台商商编。<br />如果商户使用先下单再支付模式，已传入token，则本字段可以不传值，否则必须传值</p>
+   * @return parentMerchantNo
+  **/
+
+  public String getParentMerchantNo() {
+    return parentMerchantNo;
+  }
+
+  public void setParentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+  }
+
+  public CreditScoreAuthorizationRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * Get merchantNo
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public CreditScoreAuthorizationRequestDTO authorizationId(String authorizationId) {
+    this.authorizationId = authorizationId;
+    return this;
+  }
+
+   /**
+   * Get authorizationId
+   * @return authorizationId
+  **/
+
+  public String getAuthorizationId() {
+    return authorizationId;
+  }
+
+  public void setAuthorizationId(String authorizationId) {
+    this.authorizationId = authorizationId;
+  }
+
+  public CreditScoreAuthorizationRequestDTO channel(ChannelEnum channel) {
+    this.channel = channel;
+    return this;
+  }
+
+   /**
+   *  可选项如下: WECHAT:微信 
+   * @return channel
+  **/
+
+  public ChannelEnum getChannel() {
+    return channel;
+  }
+
+  public void setChannel(ChannelEnum channel) {
+    this.channel = channel;
+  }
+
+  public CreditScoreAuthorizationRequestDTO payWay(PayWayEnum payWay) {
+    this.payWay = payWay;
+    return this;
+  }
+
+   /**
+   *  可选项如下: CREDIT_PAY:信用分 
+   * @return payWay
+  **/
+
+  public PayWayEnum getPayWay() {
+    return payWay;
+  }
+
+  public void setPayWay(PayWayEnum payWay) {
+    this.payWay = payWay;
+  }
+
+  public CreditScoreAuthorizationRequestDTO scene(SceneEnum scene) {
+    this.scene = scene;
+    return this;
+  }
+
+   /**
+   *  可选项如下: ONLINE:线上 
+   * @return scene
+  **/
+
+  public SceneEnum getScene() {
+    return scene;
+  }
+
+  public void setScene(SceneEnum scene) {
+    this.scene = scene;
+  }
+
+  public CreditScoreAuthorizationRequestDTO invokeScene(InvokeSceneEnum invokeScene) {
+    this.invokeScene = invokeScene;
+    return this;
+  }
+
+   /**
+   *  可选项如下: WECHAT_OFFIACCOUNT:微信公众号 WECHAT_MINI_PROGRAM:微信小程序 SDK:SDK 
+   * @return invokeScene
+  **/
+
+  public InvokeSceneEnum getInvokeScene() {
+    return invokeScene;
+  }
+
+  public void setInvokeScene(InvokeSceneEnum invokeScene) {
+    this.invokeScene = invokeScene;
+  }
+
+  public CreditScoreAuthorizationRequestDTO appId(String appId) {
+    this.appId = appId;
+    return this;
+  }
+
+   /**
+   * Get appId
+   * @return appId
+  **/
+
+  public String getAppId() {
+    return appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public CreditScoreAuthorizationRequestDTO serviceId(String serviceId) {
+    this.serviceId = serviceId;
+    return this;
+  }
+
+   /**
+   * Get serviceId
+   * @return serviceId
+  **/
+
+  public String getServiceId() {
+    return serviceId;
+  }
+
+  public void setServiceId(String serviceId) {
+    this.serviceId = serviceId;
+  }
+
+  public CreditScoreAuthorizationRequestDTO notifyUrl(String notifyUrl) {
+    this.notifyUrl = notifyUrl;
+    return this;
+  }
+
+   /**
+   * <p>接收授权结果通知</p>
+   * @return notifyUrl
+  **/
+
+  @JsonSerialize(using = YopCustomSerializer.class)
+  public String getNotifyUrl() {
+    return notifyUrl;
+  }
+
+  public void setNotifyUrl(String notifyUrl) {
+    this.notifyUrl = notifyUrl;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    CreditScoreAuthorizationRequestDTO creditScoreAuthorizationRequestDTO = (CreditScoreAuthorizationRequestDTO) o;
+    return ObjectUtils.equals(this.parentMerchantNo, creditScoreAuthorizationRequestDTO.parentMerchantNo) &&
+    ObjectUtils.equals(this.merchantNo, creditScoreAuthorizationRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.authorizationId, creditScoreAuthorizationRequestDTO.authorizationId) &&
+    ObjectUtils.equals(this.channel, creditScoreAuthorizationRequestDTO.channel) &&
+    ObjectUtils.equals(this.payWay, creditScoreAuthorizationRequestDTO.payWay) &&
+    ObjectUtils.equals(this.scene, creditScoreAuthorizationRequestDTO.scene) &&
+    ObjectUtils.equals(this.invokeScene, creditScoreAuthorizationRequestDTO.invokeScene) &&
+    ObjectUtils.equals(this.appId, creditScoreAuthorizationRequestDTO.appId) &&
+    ObjectUtils.equals(this.serviceId, creditScoreAuthorizationRequestDTO.serviceId) &&
+    ObjectUtils.equals(this.notifyUrl, creditScoreAuthorizationRequestDTO.notifyUrl);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(parentMerchantNo, merchantNo, authorizationId, channel, payWay, scene, invokeScene, appId, serviceId, notifyUrl);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CreditScoreAuthorizationRequestDTO {\n");
+    
+    sb.append("    parentMerchantNo: ").append(toIndentedString(parentMerchantNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    authorizationId: ").append(toIndentedString(authorizationId)).append("\n");
+    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
+    sb.append("    payWay: ").append(toIndentedString(payWay)).append("\n");
+    sb.append("    scene: ").append(toIndentedString(scene)).append("\n");
+    sb.append("    invokeScene: ").append(toIndentedString(invokeScene)).append("\n");
+    sb.append("    appId: ").append(toIndentedString(appId)).append("\n");
+    sb.append("    serviceId: ").append(toIndentedString(serviceId)).append("\n");
+    sb.append("    notifyUrl: ").append(toIndentedString(notifyUrl)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/CreditScoreAuthorizationResponseDTO.java

@@ -0,0 +1,196 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class CreditScoreAuthorizationResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("uniqueAuthorizationNo")
+  private String uniqueAuthorizationNo = null;
+
+  /**
+   * <p>微信唤起授权页面 token</p>
+   */
+  @JsonProperty("applyPermissionsToken")
+  private String applyPermissionsToken = null;
+
+  public CreditScoreAuthorizationResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public CreditScoreAuthorizationResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public CreditScoreAuthorizationResponseDTO uniqueAuthorizationNo(String uniqueAuthorizationNo) {
+    this.uniqueAuthorizationNo = uniqueAuthorizationNo;
+    return this;
+  }
+
+   /**
+   * Get uniqueAuthorizationNo
+   * @return uniqueAuthorizationNo
+  **/
+
+  public String getUniqueAuthorizationNo() {
+    return uniqueAuthorizationNo;
+  }
+
+  public void setUniqueAuthorizationNo(String uniqueAuthorizationNo) {
+    this.uniqueAuthorizationNo = uniqueAuthorizationNo;
+  }
+
+  public CreditScoreAuthorizationResponseDTO applyPermissionsToken(String applyPermissionsToken) {
+    this.applyPermissionsToken = applyPermissionsToken;
+    return this;
+  }
+
+   /**
+   * <p>微信唤起授权页面 token</p>
+   * @return applyPermissionsToken
+  **/
+
+  public String getApplyPermissionsToken() {
+    return applyPermissionsToken;
+  }
+
+  public void setApplyPermissionsToken(String applyPermissionsToken) {
+    this.applyPermissionsToken = applyPermissionsToken;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    CreditScoreAuthorizationResponseDTO creditScoreAuthorizationResponseDTO = (CreditScoreAuthorizationResponseDTO) o;
+    return ObjectUtils.equals(this.code, creditScoreAuthorizationResponseDTO.code) &&
+    ObjectUtils.equals(this.message, creditScoreAuthorizationResponseDTO.message) &&
+    ObjectUtils.equals(this.uniqueAuthorizationNo, creditScoreAuthorizationResponseDTO.uniqueAuthorizationNo) &&
+    ObjectUtils.equals(this.applyPermissionsToken, creditScoreAuthorizationResponseDTO.applyPermissionsToken);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, uniqueAuthorizationNo, applyPermissionsToken);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CreditScoreAuthorizationResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    uniqueAuthorizationNo: ").append(toIndentedString(uniqueAuthorizationNo)).append("\n");
+    sb.append("    applyPermissionsToken: ").append(toIndentedString(applyPermissionsToken)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/CreditScoreCreateResponseDTO.java

@@ -0,0 +1,352 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class CreditScoreCreateResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-AAgRdS3pkopQ5axKz32cc4dcnjf\">易宝支付分流水号</div> </div>
+   */
+  @JsonProperty("uniqueCreditNo")
+  private String uniqueCreditNo = null;
+
+  /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-CBerdFzbroI2ggxmOVTcS2G7nOh\">商户支付分订单请求号</div> </div>
+   */
+  @JsonProperty("creditOrderId")
+  private String creditOrderId = null;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KagkdXBAcoMw88xJcHecgu2anBd\">银行流水号</div> </div>
+   */
+  @JsonProperty("bankSerialNo")
+  private String bankSerialNo = null;
+
+  /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-WHdfd6gZGopOy5xDdO4cV0QdnQb\">支付分银行服务订单号</div> <div class=\"ace-line ace-line old-record-id-WHdfd6gZGopOy5xDdO4cV0QdnQb\">对应微信的商户服务订单号</div> </div>
+   */
+  @JsonProperty("bankOrderNo")
+  private String bankOrderNo = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-W7atdTTALoHVL2xUXBkcneSunMc\">跳转渠道侧数据包</div> </div>
+   */
+  @JsonProperty("packageInfo")
+  private String packageInfo = null;
+
+  /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-QguJdC7DxocIbtxtun8c0wtNngg\">商户商编</div> </div>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-A2F3dppBeoEd45xdeHwcRp2Yneb\">报备商户号</div> </div>
+   */
+  @JsonProperty("reportMerchantNo")
+  private String reportMerchantNo = null;
+
+  /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KMvvd8i9Xo1XXBxgInIcfpLrnL9\">服务订单状态</div> <div class=\"ace-line ace-line old-record-id-ImXVdfufqou01HxWnp1cEumnn4f\">当前单据状态</div> <div class=\"ace-line ace-line old-record-id-GwO6dV7oLo0dLFxdt2KcJg9jn9b\">CREATED: 服务订单已创建</div> <div class=\"ace-line ace-line old-record-id-B0Oadvbo5oc6yVx6OiDc7rLKnhe\">USER_CONFIRM: 用户确认</div> <div class=\"ace-line ace-line old-record-id-GXmedGxW6o6kuMxSbMEcFGmPnRb\">MCH_COMPLETE：商户完结</div> <div class=\"ace-line ace-line old-record-id-E2NOdy4b7ojiLGxu8xqc8JEjnpf\">DONE: 服务订单已完成</div> <div class=\"ace-line ace-line old-record-id-QVHRd3548olTXIxUKaCcBEMxnRg\">REVOKED: 商户取消服务订单</div> <div class=\"ace-line ace-line old-record-id-B6wDdGArQoTQujxZTpOc53LNnXf\">EXPIRED: 服务订单已失效（\"CREATED\"状态超过1小时用户未确认，则订单失效）</div> </div>
+   */
+  @JsonProperty("status")
+  private String status = null;
+
+  public CreditScoreCreateResponseDTO uniqueCreditNo(String uniqueCreditNo) {
+    this.uniqueCreditNo = uniqueCreditNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-AAgRdS3pkopQ5axKz32cc4dcnjf\">易宝支付分流水号</div> </div>
+   * @return uniqueCreditNo
+  **/
+
+  public String getUniqueCreditNo() {
+    return uniqueCreditNo;
+  }
+
+  public void setUniqueCreditNo(String uniqueCreditNo) {
+    this.uniqueCreditNo = uniqueCreditNo;
+  }
+
+  public CreditScoreCreateResponseDTO creditOrderId(String creditOrderId) {
+    this.creditOrderId = creditOrderId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-CBerdFzbroI2ggxmOVTcS2G7nOh\">商户支付分订单请求号</div> </div>
+   * @return creditOrderId
+  **/
+
+  public String getCreditOrderId() {
+    return creditOrderId;
+  }
+
+  public void setCreditOrderId(String creditOrderId) {
+    this.creditOrderId = creditOrderId;
+  }
+
+  public CreditScoreCreateResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public CreditScoreCreateResponseDTO bankSerialNo(String bankSerialNo) {
+    this.bankSerialNo = bankSerialNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KagkdXBAcoMw88xJcHecgu2anBd\">银行流水号</div> </div>
+   * @return bankSerialNo
+  **/
+
+  public String getBankSerialNo() {
+    return bankSerialNo;
+  }
+
+  public void setBankSerialNo(String bankSerialNo) {
+    this.bankSerialNo = bankSerialNo;
+  }
+
+  public CreditScoreCreateResponseDTO bankOrderNo(String bankOrderNo) {
+    this.bankOrderNo = bankOrderNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-WHdfd6gZGopOy5xDdO4cV0QdnQb\">支付分银行服务订单号</div> <div class=\"ace-line ace-line old-record-id-WHdfd6gZGopOy5xDdO4cV0QdnQb\">对应微信的商户服务订单号</div> </div>
+   * @return bankOrderNo
+  **/
+
+  public String getBankOrderNo() {
+    return bankOrderNo;
+  }
+
+  public void setBankOrderNo(String bankOrderNo) {
+    this.bankOrderNo = bankOrderNo;
+  }
+
+  public CreditScoreCreateResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public CreditScoreCreateResponseDTO packageInfo(String packageInfo) {
+    this.packageInfo = packageInfo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-W7atdTTALoHVL2xUXBkcneSunMc\">跳转渠道侧数据包</div> </div>
+   * @return packageInfo
+  **/
+
+  public String getPackageInfo() {
+    return packageInfo;
+  }
+
+  public void setPackageInfo(String packageInfo) {
+    this.packageInfo = packageInfo;
+  }
+
+  public CreditScoreCreateResponseDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-QguJdC7DxocIbtxtun8c0wtNngg\">商户商编</div> </div>
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public CreditScoreCreateResponseDTO reportMerchantNo(String reportMerchantNo) {
+    this.reportMerchantNo = reportMerchantNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-A2F3dppBeoEd45xdeHwcRp2Yneb\">报备商户号</div> </div>
+   * @return reportMerchantNo
+  **/
+
+  public String getReportMerchantNo() {
+    return reportMerchantNo;
+  }
+
+  public void setReportMerchantNo(String reportMerchantNo) {
+    this.reportMerchantNo = reportMerchantNo;
+  }
+
+  public CreditScoreCreateResponseDTO status(String status) {
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"RUY7dRhGCoGnvox2XTIc0xetnxd\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KMvvd8i9Xo1XXBxgInIcfpLrnL9\">服务订单状态</div> <div class=\"ace-line ace-line old-record-id-ImXVdfufqou01HxWnp1cEumnn4f\">当前单据状态</div> <div class=\"ace-line ace-line old-record-id-GwO6dV7oLo0dLFxdt2KcJg9jn9b\">CREATED: 服务订单已创建</div> <div class=\"ace-line ace-line old-record-id-B0Oadvbo5oc6yVx6OiDc7rLKnhe\">USER_CONFIRM: 用户确认</div> <div class=\"ace-line ace-line old-record-id-GXmedGxW6o6kuMxSbMEcFGmPnRb\">MCH_COMPLETE：商户完结</div> <div class=\"ace-line ace-line old-record-id-E2NOdy4b7ojiLGxu8xqc8JEjnpf\">DONE: 服务订单已完成</div> <div class=\"ace-line ace-line old-record-id-QVHRd3548olTXIxUKaCcBEMxnRg\">REVOKED: 商户取消服务订单</div> <div class=\"ace-line ace-line old-record-id-B6wDdGArQoTQujxZTpOc53LNnXf\">EXPIRED: 服务订单已失效（\"CREATED\"状态超过1小时用户未确认，则订单失效）</div> </div>
+   * @return status
+  **/
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    CreditScoreCreateResponseDTO creditScoreCreateResponseDTO = (CreditScoreCreateResponseDTO) o;
+    return ObjectUtils.equals(this.uniqueCreditNo, creditScoreCreateResponseDTO.uniqueCreditNo) &&
+    ObjectUtils.equals(this.creditOrderId, creditScoreCreateResponseDTO.creditOrderId) &&
+    ObjectUtils.equals(this.code, creditScoreCreateResponseDTO.code) &&
+    ObjectUtils.equals(this.bankSerialNo, creditScoreCreateResponseDTO.bankSerialNo) &&
+    ObjectUtils.equals(this.bankOrderNo, creditScoreCreateResponseDTO.bankOrderNo) &&
+    ObjectUtils.equals(this.message, creditScoreCreateResponseDTO.message) &&
+    ObjectUtils.equals(this.packageInfo, creditScoreCreateResponseDTO.packageInfo) &&
+    ObjectUtils.equals(this.merchantNo, creditScoreCreateResponseDTO.merchantNo) &&
+    ObjectUtils.equals(this.reportMerchantNo, creditScoreCreateResponseDTO.reportMerchantNo) &&
+    ObjectUtils.equals(this.status, creditScoreCreateResponseDTO.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(uniqueCreditNo, creditOrderId, code, bankSerialNo, bankOrderNo, message, packageInfo, merchantNo, reportMerchantNo, status);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CreditScoreCreateResponseDTO {\n");
+    
+    sb.append("    uniqueCreditNo: ").append(toIndentedString(uniqueCreditNo)).append("\n");
+    sb.append("    creditOrderId: ").append(toIndentedString(creditOrderId)).append("\n");
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    bankSerialNo: ").append(toIndentedString(bankSerialNo)).append("\n");
+    sb.append("    bankOrderNo: ").append(toIndentedString(bankOrderNo)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    packageInfo: ").append(toIndentedString(packageInfo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    reportMerchantNo: ").append(toIndentedString(reportMerchantNo)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/CreditScorePayResponseDTO.java

@@ -0,0 +1,248 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class CreditScorePayResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ArEjdqRfHoZVNSxCOo9cGl0vnXd\">返回码</div> </div>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-O0dkd9eFloMs2gxa3uacZt0FnVb\">商户收款请求号</div> </div>
+   */
+  @JsonProperty("orderId")
+  private String orderId = null;
+
+  /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-NgRWdgTKmoHzU9xtro4cCTkEnXf\">渠道侧商户请求号</div> </div>
+   */
+  @JsonProperty("bankOrderId")
+  private String bankOrderId = null;
+
+  /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-SRG8d7pa2o855TxJl91cKBhynSb\">返回信息</div> </div>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XK5Mdj7H0odzmZxmkBFc64UWn3g\">易宝收款订单号</div> </div>
+   */
+  @JsonProperty("uniqueOrderNo")
+  private String uniqueOrderNo = null;
+
+  /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KjRbdUw6EoI0i2xqlBxc7WHCnGb\">状态</div> <div class=\"ace-line ace-line old-record-id-YCwXdLLIOozZegxWVrPcFMBln5c\">PROCESSING:处理中</div> <div class=\"ace-line ace-line old-record-id-DDspdcwYzo8omrxdSTvcSw8XnGg\">SUCCESS:支付成功</div> <div class=\"ace-line ace-line old-record-id-PkJjdPPDqoYaw0xkYiec6YYpnld\">FAIL:支付失败</div> </div>
+   */
+  @JsonProperty("status")
+  private String status = null;
+
+  public CreditScorePayResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ArEjdqRfHoZVNSxCOo9cGl0vnXd\">返回码</div> </div>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public CreditScorePayResponseDTO orderId(String orderId) {
+    this.orderId = orderId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-O0dkd9eFloMs2gxa3uacZt0FnVb\">商户收款请求号</div> </div>
+   * @return orderId
+  **/
+
+  public String getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(String orderId) {
+    this.orderId = orderId;
+  }
+
+  public CreditScorePayResponseDTO bankOrderId(String bankOrderId) {
+    this.bankOrderId = bankOrderId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-NgRWdgTKmoHzU9xtro4cCTkEnXf\">渠道侧商户请求号</div> </div>
+   * @return bankOrderId
+  **/
+
+  public String getBankOrderId() {
+    return bankOrderId;
+  }
+
+  public void setBankOrderId(String bankOrderId) {
+    this.bankOrderId = bankOrderId;
+  }
+
+  public CreditScorePayResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-SRG8d7pa2o855TxJl91cKBhynSb\">返回信息</div> </div>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public CreditScorePayResponseDTO uniqueOrderNo(String uniqueOrderNo) {
+    this.uniqueOrderNo = uniqueOrderNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XK5Mdj7H0odzmZxmkBFc64UWn3g\">易宝收款订单号</div> </div>
+   * @return uniqueOrderNo
+  **/
+
+  public String getUniqueOrderNo() {
+    return uniqueOrderNo;
+  }
+
+  public void setUniqueOrderNo(String uniqueOrderNo) {
+    this.uniqueOrderNo = uniqueOrderNo;
+  }
+
+  public CreditScorePayResponseDTO status(String status) {
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"PZsqd3BEgowIKwxigB5clP3tn9e\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KjRbdUw6EoI0i2xqlBxc7WHCnGb\">状态</div> <div class=\"ace-line ace-line old-record-id-YCwXdLLIOozZegxWVrPcFMBln5c\">PROCESSING:处理中</div> <div class=\"ace-line ace-line old-record-id-DDspdcwYzo8omrxdSTvcSw8XnGg\">SUCCESS:支付成功</div> <div class=\"ace-line ace-line old-record-id-PkJjdPPDqoYaw0xkYiec6YYpnld\">FAIL:支付失败</div> </div>
+   * @return status
+  **/
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    CreditScorePayResponseDTO creditScorePayResponseDTO = (CreditScorePayResponseDTO) o;
+    return ObjectUtils.equals(this.code, creditScorePayResponseDTO.code) &&
+    ObjectUtils.equals(this.orderId, creditScorePayResponseDTO.orderId) &&
+    ObjectUtils.equals(this.bankOrderId, creditScorePayResponseDTO.bankOrderId) &&
+    ObjectUtils.equals(this.message, creditScorePayResponseDTO.message) &&
+    ObjectUtils.equals(this.uniqueOrderNo, creditScorePayResponseDTO.uniqueOrderNo) &&
+    ObjectUtils.equals(this.status, creditScorePayResponseDTO.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, orderId, bankOrderId, message, uniqueOrderNo, status);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CreditScorePayResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
+    sb.append("    bankOrderId: ").append(toIndentedString(bankOrderId)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    uniqueOrderNo: ").append(toIndentedString(uniqueOrderNo)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/CreditScoreQueryResponseDTO.java

@@ -0,0 +1,638 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class CreditScoreQueryResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>易宝支付分流水号</p>
+   */
+  @JsonProperty("uniqueCreditNo")
+  private String uniqueCreditNo = null;
+
+  /**
+   * <p>商户信用分请求号</p>
+   */
+  @JsonProperty("creditOrderId")
+  private String creditOrderId = null;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>银行流水号</p>
+   */
+  @JsonProperty("bankSerialNo")
+  private String bankSerialNo = null;
+
+  /**
+   * <div class=\"ace-line ace-line old-record-id-WHdfd6gZGopOy5xDdO4cV0QdnQb\">支付分银行服务订单号</div> <div class=\"ace-line ace-line old-record-id-WHdfd6gZGopOy5xDdO4cV0QdnQb\">对应微信的商户服务订单号</div>
+   */
+  @JsonProperty("bankOrderNo")
+  private String bankOrderNo = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * <p>商户商编</p>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <p>报备商户号</p>
+   */
+  @JsonProperty("reportMerchantNo")
+  private String reportMerchantNo = null;
+
+  /**
+   * <div class=\"ace-line ace-line old-record-id-KMvvd8i9Xo1XXBxgInIcfpLrnL9\">服务订单状态</div> <div class=\"ace-line ace-line old-record-id-ImXVdfufqou01HxWnp1cEumnn4f\">当前单据状态</div> <div class=\"ace-line ace-line old-record-id-GwO6dV7oLo0dLFxdt2KcJg9jn9b\">CREATED: 服务订单已创建</div> <div class=\"ace-line ace-line old-record-id-B0Oadvbo5oc6yVx6OiDc7rLKnhe\">USER_CONFIRM: 用户确认</div> <div class=\"ace-line ace-line old-record-id-GXmedGxW6o6kuMxSbMEcFGmPnRb\">MCH_COMPLETE：商户完结</div> <div class=\"ace-line ace-line old-record-id-E2NOdy4b7ojiLGxu8xqc8JEjnpf\">DONE: 服务订单已完成</div> <div class=\"ace-line ace-line old-record-id-QVHRd3548olTXIxUKaCcBEMxnRg\">REVOKED: 商户取消服务订单</div> <div class=\"ace-line ace-line old-record-id-B6wDdGArQoTQujxZTpOc53LNnXf\">EXPIRED: 服务订单已失效（\"CREATED\"状态超过1小时用户未确认，则订单失效）</div>
+   */
+  @JsonProperty("status")
+  private String status = null;
+
+  /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-DVd9dNplVo49HBxg30ycvnTmnxc\">扣款方式：便于商户区分此信用分订单的扣款方式，做出判断（例如：商户可能仅在主动支付时关注此单号）</div> <div class=\"ace-line ace-line old-record-id-DVd9dNplVo49HBxg30ycvnTmnxc\"><em>ENTRUSTED_DEDUCT：委托扣款，代表商户调信用分扣款接口发起扣款</em></div> <div class=\"ace-line ace-line old-record-id-IodYdrYGKoU6DPxKu3pcbi2an7f\"><em>NO_NEED_PAY：无需扣款，仅微信会出现，代表商户在扣款前已将金额修改为0</em></div> <div class=\"ace-line ace-line old-record-id-KmidduDHGo3pakxlPgvcNncKn1Y\"><em>ACTIVE_PAY：主动付款，仅微信会出现，代表用户通过微信页面主动完成支付</em> <em>SYNC_ORDER：同步订单，代表用户与商户协商一致，线下支付或无需支付，未通过易宝发起扣款</em></div> </div>
+   */
+  @JsonProperty("creditPayType")
+  private String creditPayType = null;
+
+  /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Jp0gdVkhsokMjExwK5PcGbEInkd\">商户订单号，代表此笔信用分订单对应的扣款成功订单的商户订单号</div> </div>
+   */
+  @JsonProperty("orderId")
+  private String orderId = null;
+
+  /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KCu0dc6Wmo8g7kxm8v3cx2xGn3f\">实际扣款金额，单位：元</div> </div>
+   */
+  @JsonProperty("orderAmount")
+  private String orderAmount = null;
+
+  /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-EVrwdcvuJoZ7ukxBesacAE1tncg\">支付成功时间；仅扣款方式为委托扣款或主动支付时，此字段有值</div> </div>
+   */
+  @JsonProperty("paySuccessDate")
+  private String paySuccessDate = null;
+
+  /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"true\"> <div> <table class=\"ace-table\" data-ace-table-col-widths=\"603\"><colgroup><col width=\"603\" /></colgroup> <tbody> <tr> <td colspan=\"1\" rowspan=\"1\"> <div class=\"ace-line ace-line old-record-id-Wi5OdNWqioKClHxpyn8c7FcAnbd\">用户ID</div> <div class=\"ace-line ace-line old-record-id-CSEUdd2ONorh0Ex4roBcSkCXn4e\">微信支付返回openID</div> <div class=\"ace-line ace-line old-record-id-PhkDdoD1joCxzpxIEfIcvxVrnbd\">支付宝支付返回userID</div> </td> </tr> </tbody> </table> </div> </div>
+   */
+  @JsonProperty("userId")
+  private String userId = null;
+
+  /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-P7xQdxeASoBMm9xRvVKc7qMDn9R\">渠道，枚举如下：</div> <div class=\"ace-line ace-line old-record-id-OJEOdaGugouzGGxn9ofcuFHmnvg\">WECHAT：微信</div> <div class=\"ace-line ace-line old-record-id-TQUZdmBhRotms7xK6rBchabOnqc\">ALIPAY：支付宝</div> </div>
+   */
+  @JsonProperty("channel")
+  private String channel = null;
+
+  /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KWxod76vTo6jwVxzksXclUoPncg\">该笔订单在微信、支付宝生成的单号（经过银网联处理的微信/支付宝单号）</div> </div>
+   */
+  @JsonProperty("channelOrderId")
+  private String channelOrderId = null;
+
+  /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Fqdsd9akEocnZuxcVudcq0LanDE\">该笔订单在微信、支付宝生成的单号（微信/支付宝的真实单号）</div> </div>
+   */
+  @JsonProperty("channelTrxId")
+  private String channelTrxId = null;
+
+  /**
+   * <div data-page-id=\"HUqNdXV6Sow437xTcsecn0rAnDe\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-RU22dtLu2oinEuxUC5scOLXjnpc\">授权协议号 - 仅支付宝有</div> </div>
+   */
+  @JsonProperty("creditAgreementId")
+  private String creditAgreementId = null;
+
+  /**
+   * <div data-page-id=\"HUqNdXV6Sow437xTcsecn0rAnDe\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VgfYdUU5VoQI5bxEgrCc48p3nwh\">授权状态 - 仅支付宝有</div> </div>
+   */
+  @JsonProperty("agreementStatus")
+  private String agreementStatus = null;
+
+  /**
+   * <div data-page-id=\"HUqNdXV6Sow437xTcsecn0rAnDe\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-HYrodMlCHoqZzFx9g5ic5iCrnjm\">商户外部协议号 - 仅支付宝有</div> </div>
+   */
+  @JsonProperty("outAgreementNo")
+  private String outAgreementNo = null;
+
+  /**
+   * <div data-page-id=\"HUqNdXV6Sow437xTcsecn0rAnDe\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-PZ06dIsWnocj16x1CWbcVbTpn5d\">开通/授权状态变更的时间 - 仅支付宝有</div> </div>
+   */
+  @JsonProperty("bizTime")
+  private String bizTime = null;
+
+  public CreditScoreQueryResponseDTO uniqueCreditNo(String uniqueCreditNo) {
+    this.uniqueCreditNo = uniqueCreditNo;
+    return this;
+  }
+
+   /**
+   * <p>易宝支付分流水号</p>
+   * @return uniqueCreditNo
+  **/
+
+  public String getUniqueCreditNo() {
+    return uniqueCreditNo;
+  }
+
+  public void setUniqueCreditNo(String uniqueCreditNo) {
+    this.uniqueCreditNo = uniqueCreditNo;
+  }
+
+  public CreditScoreQueryResponseDTO creditOrderId(String creditOrderId) {
+    this.creditOrderId = creditOrderId;
+    return this;
+  }
+
+   /**
+   * <p>商户信用分请求号</p>
+   * @return creditOrderId
+  **/
+
+  public String getCreditOrderId() {
+    return creditOrderId;
+  }
+
+  public void setCreditOrderId(String creditOrderId) {
+    this.creditOrderId = creditOrderId;
+  }
+
+  public CreditScoreQueryResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public CreditScoreQueryResponseDTO bankSerialNo(String bankSerialNo) {
+    this.bankSerialNo = bankSerialNo;
+    return this;
+  }
+
+   /**
+   * <p>银行流水号</p>
+   * @return bankSerialNo
+  **/
+
+  public String getBankSerialNo() {
+    return bankSerialNo;
+  }
+
+  public void setBankSerialNo(String bankSerialNo) {
+    this.bankSerialNo = bankSerialNo;
+  }
+
+  public CreditScoreQueryResponseDTO bankOrderNo(String bankOrderNo) {
+    this.bankOrderNo = bankOrderNo;
+    return this;
+  }
+
+   /**
+   * <div class=\"ace-line ace-line old-record-id-WHdfd6gZGopOy5xDdO4cV0QdnQb\">支付分银行服务订单号</div> <div class=\"ace-line ace-line old-record-id-WHdfd6gZGopOy5xDdO4cV0QdnQb\">对应微信的商户服务订单号</div>
+   * @return bankOrderNo
+  **/
+
+  public String getBankOrderNo() {
+    return bankOrderNo;
+  }
+
+  public void setBankOrderNo(String bankOrderNo) {
+    this.bankOrderNo = bankOrderNo;
+  }
+
+  public CreditScoreQueryResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public CreditScoreQueryResponseDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * <p>商户商编</p>
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public CreditScoreQueryResponseDTO reportMerchantNo(String reportMerchantNo) {
+    this.reportMerchantNo = reportMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>报备商户号</p>
+   * @return reportMerchantNo
+  **/
+
+  public String getReportMerchantNo() {
+    return reportMerchantNo;
+  }
+
+  public void setReportMerchantNo(String reportMerchantNo) {
+    this.reportMerchantNo = reportMerchantNo;
+  }
+
+  public CreditScoreQueryResponseDTO status(String status) {
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * <div class=\"ace-line ace-line old-record-id-KMvvd8i9Xo1XXBxgInIcfpLrnL9\">服务订单状态</div> <div class=\"ace-line ace-line old-record-id-ImXVdfufqou01HxWnp1cEumnn4f\">当前单据状态</div> <div class=\"ace-line ace-line old-record-id-GwO6dV7oLo0dLFxdt2KcJg9jn9b\">CREATED: 服务订单已创建</div> <div class=\"ace-line ace-line old-record-id-B0Oadvbo5oc6yVx6OiDc7rLKnhe\">USER_CONFIRM: 用户确认</div> <div class=\"ace-line ace-line old-record-id-GXmedGxW6o6kuMxSbMEcFGmPnRb\">MCH_COMPLETE：商户完结</div> <div class=\"ace-line ace-line old-record-id-E2NOdy4b7ojiLGxu8xqc8JEjnpf\">DONE: 服务订单已完成</div> <div class=\"ace-line ace-line old-record-id-QVHRd3548olTXIxUKaCcBEMxnRg\">REVOKED: 商户取消服务订单</div> <div class=\"ace-line ace-line old-record-id-B6wDdGArQoTQujxZTpOc53LNnXf\">EXPIRED: 服务订单已失效（\"CREATED\"状态超过1小时用户未确认，则订单失效）</div>
+   * @return status
+  **/
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  public CreditScoreQueryResponseDTO creditPayType(String creditPayType) {
+    this.creditPayType = creditPayType;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-DVd9dNplVo49HBxg30ycvnTmnxc\">扣款方式：便于商户区分此信用分订单的扣款方式，做出判断（例如：商户可能仅在主动支付时关注此单号）</div> <div class=\"ace-line ace-line old-record-id-DVd9dNplVo49HBxg30ycvnTmnxc\"><em>ENTRUSTED_DEDUCT：委托扣款，代表商户调信用分扣款接口发起扣款</em></div> <div class=\"ace-line ace-line old-record-id-IodYdrYGKoU6DPxKu3pcbi2an7f\"><em>NO_NEED_PAY：无需扣款，仅微信会出现，代表商户在扣款前已将金额修改为0</em></div> <div class=\"ace-line ace-line old-record-id-KmidduDHGo3pakxlPgvcNncKn1Y\"><em>ACTIVE_PAY：主动付款，仅微信会出现，代表用户通过微信页面主动完成支付</em> <em>SYNC_ORDER：同步订单，代表用户与商户协商一致，线下支付或无需支付，未通过易宝发起扣款</em></div> </div>
+   * @return creditPayType
+  **/
+
+  public String getCreditPayType() {
+    return creditPayType;
+  }
+
+  public void setCreditPayType(String creditPayType) {
+    this.creditPayType = creditPayType;
+  }
+
+  public CreditScoreQueryResponseDTO orderId(String orderId) {
+    this.orderId = orderId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Jp0gdVkhsokMjExwK5PcGbEInkd\">商户订单号，代表此笔信用分订单对应的扣款成功订单的商户订单号</div> </div>
+   * @return orderId
+  **/
+
+  public String getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(String orderId) {
+    this.orderId = orderId;
+  }
+
+  public CreditScoreQueryResponseDTO orderAmount(String orderAmount) {
+    this.orderAmount = orderAmount;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KCu0dc6Wmo8g7kxm8v3cx2xGn3f\">实际扣款金额，单位：元</div> </div>
+   * @return orderAmount
+  **/
+
+  public String getOrderAmount() {
+    return orderAmount;
+  }
+
+  public void setOrderAmount(String orderAmount) {
+    this.orderAmount = orderAmount;
+  }
+
+  public CreditScoreQueryResponseDTO paySuccessDate(String paySuccessDate) {
+    this.paySuccessDate = paySuccessDate;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-EVrwdcvuJoZ7ukxBesacAE1tncg\">支付成功时间；仅扣款方式为委托扣款或主动支付时，此字段有值</div> </div>
+   * @return paySuccessDate
+  **/
+
+  public String getPaySuccessDate() {
+    return paySuccessDate;
+  }
+
+  public void setPaySuccessDate(String paySuccessDate) {
+    this.paySuccessDate = paySuccessDate;
+  }
+
+  public CreditScoreQueryResponseDTO userId(String userId) {
+    this.userId = userId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"true\"> <div> <table class=\"ace-table\" data-ace-table-col-widths=\"603\"><colgroup><col width=\"603\" /></colgroup> <tbody> <tr> <td colspan=\"1\" rowspan=\"1\"> <div class=\"ace-line ace-line old-record-id-Wi5OdNWqioKClHxpyn8c7FcAnbd\">用户ID</div> <div class=\"ace-line ace-line old-record-id-CSEUdd2ONorh0Ex4roBcSkCXn4e\">微信支付返回openID</div> <div class=\"ace-line ace-line old-record-id-PhkDdoD1joCxzpxIEfIcvxVrnbd\">支付宝支付返回userID</div> </td> </tr> </tbody> </table> </div> </div>
+   * @return userId
+  **/
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  public CreditScoreQueryResponseDTO channel(String channel) {
+    this.channel = channel;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-P7xQdxeASoBMm9xRvVKc7qMDn9R\">渠道，枚举如下：</div> <div class=\"ace-line ace-line old-record-id-OJEOdaGugouzGGxn9ofcuFHmnvg\">WECHAT：微信</div> <div class=\"ace-line ace-line old-record-id-TQUZdmBhRotms7xK6rBchabOnqc\">ALIPAY：支付宝</div> </div>
+   * @return channel
+  **/
+
+  public String getChannel() {
+    return channel;
+  }
+
+  public void setChannel(String channel) {
+    this.channel = channel;
+  }
+
+  public CreditScoreQueryResponseDTO channelOrderId(String channelOrderId) {
+    this.channelOrderId = channelOrderId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-KWxod76vTo6jwVxzksXclUoPncg\">该笔订单在微信、支付宝生成的单号（经过银网联处理的微信/支付宝单号）</div> </div>
+   * @return channelOrderId
+  **/
+
+  public String getChannelOrderId() {
+    return channelOrderId;
+  }
+
+  public void setChannelOrderId(String channelOrderId) {
+    this.channelOrderId = channelOrderId;
+  }
+
+  public CreditScoreQueryResponseDTO channelTrxId(String channelTrxId) {
+    this.channelTrxId = channelTrxId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"UZB5dvTm0oZxZAxB9N4c2ztAnsf\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Fqdsd9akEocnZuxcVudcq0LanDE\">该笔订单在微信、支付宝生成的单号（微信/支付宝的真实单号）</div> </div>
+   * @return channelTrxId
+  **/
+
+  public String getChannelTrxId() {
+    return channelTrxId;
+  }
+
+  public void setChannelTrxId(String channelTrxId) {
+    this.channelTrxId = channelTrxId;
+  }
+
+  public CreditScoreQueryResponseDTO creditAgreementId(String creditAgreementId) {
+    this.creditAgreementId = creditAgreementId;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"HUqNdXV6Sow437xTcsecn0rAnDe\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-RU22dtLu2oinEuxUC5scOLXjnpc\">授权协议号 - 仅支付宝有</div> </div>
+   * @return creditAgreementId
+  **/
+
+  public String getCreditAgreementId() {
+    return creditAgreementId;
+  }
+
+  public void setCreditAgreementId(String creditAgreementId) {
+    this.creditAgreementId = creditAgreementId;
+  }
+
+  public CreditScoreQueryResponseDTO agreementStatus(String agreementStatus) {
+    this.agreementStatus = agreementStatus;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"HUqNdXV6Sow437xTcsecn0rAnDe\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VgfYdUU5VoQI5bxEgrCc48p3nwh\">授权状态 - 仅支付宝有</div> </div>
+   * @return agreementStatus
+  **/
+
+  public String getAgreementStatus() {
+    return agreementStatus;
+  }
+
+  public void setAgreementStatus(String agreementStatus) {
+    this.agreementStatus = agreementStatus;
+  }
+
+  public CreditScoreQueryResponseDTO outAgreementNo(String outAgreementNo) {
+    this.outAgreementNo = outAgreementNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"HUqNdXV6Sow437xTcsecn0rAnDe\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-HYrodMlCHoqZzFx9g5ic5iCrnjm\">商户外部协议号 - 仅支付宝有</div> </div>
+   * @return outAgreementNo
+  **/
+
+  public String getOutAgreementNo() {
+    return outAgreementNo;
+  }
+
+  public void setOutAgreementNo(String outAgreementNo) {
+    this.outAgreementNo = outAgreementNo;
+  }
+
+  public CreditScoreQueryResponseDTO bizTime(String bizTime) {
+    this.bizTime = bizTime;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"HUqNdXV6Sow437xTcsecn0rAnDe\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-PZ06dIsWnocj16x1CWbcVbTpn5d\">开通/授权状态变更的时间 - 仅支付宝有</div> </div>
+   * @return bizTime
+  **/
+
+  public String getBizTime() {
+    return bizTime;
+  }
+
+  public void setBizTime(String bizTime) {
+    this.bizTime = bizTime;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    CreditScoreQueryResponseDTO creditScoreQueryResponseDTO = (CreditScoreQueryResponseDTO) o;
+    return ObjectUtils.equals(this.uniqueCreditNo, creditScoreQueryResponseDTO.uniqueCreditNo) &&
+    ObjectUtils.equals(this.creditOrderId, creditScoreQueryResponseDTO.creditOrderId) &&
+    ObjectUtils.equals(this.code, creditScoreQueryResponseDTO.code) &&
+    ObjectUtils.equals(this.bankSerialNo, creditScoreQueryResponseDTO.bankSerialNo) &&
+    ObjectUtils.equals(this.bankOrderNo, creditScoreQueryResponseDTO.bankOrderNo) &&
+    ObjectUtils.equals(this.message, creditScoreQueryResponseDTO.message) &&
+    ObjectUtils.equals(this.merchantNo, creditScoreQueryResponseDTO.merchantNo) &&
+    ObjectUtils.equals(this.reportMerchantNo, creditScoreQueryResponseDTO.reportMerchantNo) &&
+    ObjectUtils.equals(this.status, creditScoreQueryResponseDTO.status) &&
+    ObjectUtils.equals(this.creditPayType, creditScoreQueryResponseDTO.creditPayType) &&
+    ObjectUtils.equals(this.orderId, creditScoreQueryResponseDTO.orderId) &&
+    ObjectUtils.equals(this.orderAmount, creditScoreQueryResponseDTO.orderAmount) &&
+    ObjectUtils.equals(this.paySuccessDate, creditScoreQueryResponseDTO.paySuccessDate) &&
+    ObjectUtils.equals(this.userId, creditScoreQueryResponseDTO.userId) &&
+    ObjectUtils.equals(this.channel, creditScoreQueryResponseDTO.channel) &&
+    ObjectUtils.equals(this.channelOrderId, creditScoreQueryResponseDTO.channelOrderId) &&
+    ObjectUtils.equals(this.channelTrxId, creditScoreQueryResponseDTO.channelTrxId) &&
+    ObjectUtils.equals(this.creditAgreementId, creditScoreQueryResponseDTO.creditAgreementId) &&
+    ObjectUtils.equals(this.agreementStatus, creditScoreQueryResponseDTO.agreementStatus) &&
+    ObjectUtils.equals(this.outAgreementNo, creditScoreQueryResponseDTO.outAgreementNo) &&
+    ObjectUtils.equals(this.bizTime, creditScoreQueryResponseDTO.bizTime);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(uniqueCreditNo, creditOrderId, code, bankSerialNo, bankOrderNo, message, merchantNo, reportMerchantNo, status, creditPayType, orderId, orderAmount, paySuccessDate, userId, channel, channelOrderId, channelTrxId, creditAgreementId, agreementStatus, outAgreementNo, bizTime);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CreditScoreQueryResponseDTO {\n");
+    
+    sb.append("    uniqueCreditNo: ").append(toIndentedString(uniqueCreditNo)).append("\n");
+    sb.append("    creditOrderId: ").append(toIndentedString(creditOrderId)).append("\n");
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    bankSerialNo: ").append(toIndentedString(bankSerialNo)).append("\n");
+    sb.append("    bankOrderNo: ").append(toIndentedString(bankOrderNo)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    reportMerchantNo: ").append(toIndentedString(reportMerchantNo)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    creditPayType: ").append(toIndentedString(creditPayType)).append("\n");
+    sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
+    sb.append("    orderAmount: ").append(toIndentedString(orderAmount)).append("\n");
+    sb.append("    paySuccessDate: ").append(toIndentedString(paySuccessDate)).append("\n");
+    sb.append("    userId: ").append(toIndentedString(userId)).append("\n");
+    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
+    sb.append("    channelOrderId: ").append(toIndentedString(channelOrderId)).append("\n");
+    sb.append("    channelTrxId: ").append(toIndentedString(channelTrxId)).append("\n");
+    sb.append("    creditAgreementId: ").append(toIndentedString(creditAgreementId)).append("\n");
+    sb.append("    agreementStatus: ").append(toIndentedString(agreementStatus)).append("\n");
+    sb.append("    outAgreementNo: ").append(toIndentedString(outAgreementNo)).append("\n");
+    sb.append("    bizTime: ").append(toIndentedString(bizTime)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/CreditScoreUnAuthorizationRequestDTO.java

@@ -0,0 +1,196 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class CreditScoreUnAuthorizationRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>*标准商户收付款方案中此参数与收款商户编号一致；<br />*平台商户收付款方案中此参数为平台商商户编号；<br />*服务商解决方案中，①标准商户收款时，该参数为标准商户商编 ②平台商收款或平台商入驻商户收款时，该参数为平台商商编。</p>
+   */
+  @JsonProperty("parentMerchantNo")
+  private String parentMerchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("reason")
+  private String reason = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("authorizationId")
+  private String authorizationId = null;
+
+  public CreditScoreUnAuthorizationRequestDTO parentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>*标准商户收付款方案中此参数与收款商户编号一致；<br />*平台商户收付款方案中此参数为平台商商户编号；<br />*服务商解决方案中，①标准商户收款时，该参数为标准商户商编 ②平台商收款或平台商入驻商户收款时，该参数为平台商商编。</p>
+   * @return parentMerchantNo
+  **/
+
+  public String getParentMerchantNo() {
+    return parentMerchantNo;
+  }
+
+  public void setParentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+  }
+
+  public CreditScoreUnAuthorizationRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * Get merchantNo
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public CreditScoreUnAuthorizationRequestDTO reason(String reason) {
+    this.reason = reason;
+    return this;
+  }
+
+   /**
+   * Get reason
+   * @return reason
+  **/
+
+  public String getReason() {
+    return reason;
+  }
+
+  public void setReason(String reason) {
+    this.reason = reason;
+  }
+
+  public CreditScoreUnAuthorizationRequestDTO authorizationId(String authorizationId) {
+    this.authorizationId = authorizationId;
+    return this;
+  }
+
+   /**
+   * Get authorizationId
+   * @return authorizationId
+  **/
+
+  public String getAuthorizationId() {
+    return authorizationId;
+  }
+
+  public void setAuthorizationId(String authorizationId) {
+    this.authorizationId = authorizationId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    CreditScoreUnAuthorizationRequestDTO creditScoreUnAuthorizationRequestDTO = (CreditScoreUnAuthorizationRequestDTO) o;
+    return ObjectUtils.equals(this.parentMerchantNo, creditScoreUnAuthorizationRequestDTO.parentMerchantNo) &&
+    ObjectUtils.equals(this.merchantNo, creditScoreUnAuthorizationRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.reason, creditScoreUnAuthorizationRequestDTO.reason) &&
+    ObjectUtils.equals(this.authorizationId, creditScoreUnAuthorizationRequestDTO.authorizationId);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(parentMerchantNo, merchantNo, reason, authorizationId);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CreditScoreUnAuthorizationRequestDTO {\n");
+    
+    sb.append("    parentMerchantNo: ").append(toIndentedString(parentMerchantNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
+    sb.append("    authorizationId: ").append(toIndentedString(authorizationId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/DivideAccountInfoDTO.java

@@ -0,0 +1,154 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 分账信息
+ */
+public class DivideAccountInfoDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <pre>分帐明细</pre>
+   */
+  @JsonProperty("divideAccountDetail")
+  private List<DivideAccountInfoDTODivideAccountDetail> divideAccountDetail = null;
+
+  /**
+   * &lt;div&gt; &lt;pre&gt;分账通知地址&lt;/pre&gt; &lt;/div&gt;
+   */
+  @JsonProperty("divideNotifyUrl")
+  private String divideNotifyUrl = null;
+
+  public DivideAccountInfoDTO divideAccountDetail(List<DivideAccountInfoDTODivideAccountDetail> divideAccountDetail) {
+    this.divideAccountDetail = divideAccountDetail;
+    return this;
+  }
+
+  public DivideAccountInfoDTO addDivideAccountDetailItem(DivideAccountInfoDTODivideAccountDetail divideAccountDetailItem) {
+    if (this.divideAccountDetail == null) {
+      this.divideAccountDetail = new ArrayList<>();
+    }
+    this.divideAccountDetail.add(divideAccountDetailItem);
+    return this;
+  }
+
+   /**
+   * &lt;pre&gt;分帐明细&lt;/pre&gt;
+   * @return divideAccountDetail
+  **/
+
+  public List<DivideAccountInfoDTODivideAccountDetail> getDivideAccountDetail() {
+    return divideAccountDetail;
+  }
+
+  public void setDivideAccountDetail(List<DivideAccountInfoDTODivideAccountDetail> divideAccountDetail) {
+    this.divideAccountDetail = divideAccountDetail;
+  }
+
+  public DivideAccountInfoDTO divideNotifyUrl(String divideNotifyUrl) {
+    this.divideNotifyUrl = divideNotifyUrl;
+    return this;
+  }
+
+   /**
+   * &lt;div&gt; &lt;pre&gt;分账通知地址&lt;/pre&gt; &lt;/div&gt;
+   * @return divideNotifyUrl
+  **/
+
+  public String getDivideNotifyUrl() {
+    return divideNotifyUrl;
+  }
+
+  public void setDivideNotifyUrl(String divideNotifyUrl) {
+    this.divideNotifyUrl = divideNotifyUrl;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    DivideAccountInfoDTO divideAccountInfoDTO = (DivideAccountInfoDTO) o;
+    return ObjectUtils.equals(this.divideAccountDetail, divideAccountInfoDTO.divideAccountDetail) &&
+    ObjectUtils.equals(this.divideNotifyUrl, divideAccountInfoDTO.divideNotifyUrl);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(divideAccountDetail, divideNotifyUrl);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DivideAccountInfoDTO {\n");
+    
+    sb.append("    divideAccountDetail: ").append(toIndentedString(divideAccountDetail)).append("\n");
+    sb.append("    divideNotifyUrl: ").append(toIndentedString(divideNotifyUrl)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/DivideAccountInfoDTODivideAccountDetail.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 分账明细
+ */
+public class DivideAccountInfoDTODivideAccountDetail implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div> <pre>分账金额：单位元，需保留小数点后两位，最低传入0.01</pre> </div>
+   */
+  @JsonProperty("amount")
+  private String amount = null;
+
+  /**
+   * <p>分账商编</p>
+   */
+  @JsonProperty("ledgerMerchantNo")
+  private String ledgerMerchantNo = null;
+
+  /**
+   * <p>分账描述</p>
+   */
+  @JsonProperty("divideDetailDesc")
+  private String divideDetailDesc = null;
+
+  public DivideAccountInfoDTODivideAccountDetail amount(String amount) {
+    this.amount = amount;
+    return this;
+  }
+
+   /**
+   * <div> <pre>分账金额：单位元，需保留小数点后两位，最低传入0.01</pre> </div>
+   * @return amount
+  **/
+
+  public String getAmount() {
+    return amount;
+  }
+
+  public void setAmount(String amount) {
+    this.amount = amount;
+  }
+
+  public DivideAccountInfoDTODivideAccountDetail ledgerMerchantNo(String ledgerMerchantNo) {
+    this.ledgerMerchantNo = ledgerMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>分账商编</p>
+   * @return ledgerMerchantNo
+  **/
+
+  public String getLedgerMerchantNo() {
+    return ledgerMerchantNo;
+  }
+
+  public void setLedgerMerchantNo(String ledgerMerchantNo) {
+    this.ledgerMerchantNo = ledgerMerchantNo;
+  }
+
+  public DivideAccountInfoDTODivideAccountDetail divideDetailDesc(String divideDetailDesc) {
+    this.divideDetailDesc = divideDetailDesc;
+    return this;
+  }
+
+   /**
+   * <p>分账描述</p>
+   * @return divideDetailDesc
+  **/
+
+  public String getDivideDetailDesc() {
+    return divideDetailDesc;
+  }
+
+  public void setDivideDetailDesc(String divideDetailDesc) {
+    this.divideDetailDesc = divideDetailDesc;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    DivideAccountInfoDTODivideAccountDetail divideAccountInfoDTO$DivideAccountDetail = (DivideAccountInfoDTODivideAccountDetail) o;
+    return ObjectUtils.equals(this.amount, divideAccountInfoDTO$DivideAccountDetail.amount) &&
+    ObjectUtils.equals(this.ledgerMerchantNo, divideAccountInfoDTO$DivideAccountDetail.ledgerMerchantNo) &&
+    ObjectUtils.equals(this.divideDetailDesc, divideAccountInfoDTO$DivideAccountDetail.divideDetailDesc);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(amount, ledgerMerchantNo, divideDetailDesc);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DivideAccountInfoDTODivideAccountDetail {\n");
+    
+    sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
+    sb.append("    ledgerMerchantNo: ").append(toIndentedString(ledgerMerchantNo)).append("\n");
+    sb.append("    divideDetailDesc: ").append(toIndentedString(divideDetailDesc)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/ElectronicReceiptRequestDTO.java

@@ -0,0 +1,248 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class ElectronicReceiptRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>易宝分配的商户编号，为11位数字，如：10012345678</p>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <p>微信支付单号（银行流水号），与商户订单号二选一必填</p>
+   */
+  @JsonProperty("channelOrderId")
+  private String channelOrderId = null;
+
+  /**
+   * <p>商户订单号，与微信支付单号(银行流水号)二选一必填</p>
+   */
+  @JsonProperty("orderId")
+  private String orderId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("appId")
+  private String appId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantPath")
+  private String merchantPath = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("openId")
+  private String openId = null;
+
+  public ElectronicReceiptRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * <p>易宝分配的商户编号，为11位数字，如：10012345678</p>
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public ElectronicReceiptRequestDTO channelOrderId(String channelOrderId) {
+    this.channelOrderId = channelOrderId;
+    return this;
+  }
+
+   /**
+   * <p>微信支付单号（银行流水号），与商户订单号二选一必填</p>
+   * @return channelOrderId
+  **/
+
+  public String getChannelOrderId() {
+    return channelOrderId;
+  }
+
+  public void setChannelOrderId(String channelOrderId) {
+    this.channelOrderId = channelOrderId;
+  }
+
+  public ElectronicReceiptRequestDTO orderId(String orderId) {
+    this.orderId = orderId;
+    return this;
+  }
+
+   /**
+   * <p>商户订单号，与微信支付单号(银行流水号)二选一必填</p>
+   * @return orderId
+  **/
+
+  public String getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(String orderId) {
+    this.orderId = orderId;
+  }
+
+  public ElectronicReceiptRequestDTO appId(String appId) {
+    this.appId = appId;
+    return this;
+  }
+
+   /**
+   * Get appId
+   * @return appId
+  **/
+
+  public String getAppId() {
+    return appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public ElectronicReceiptRequestDTO merchantPath(String merchantPath) {
+    this.merchantPath = merchantPath;
+    return this;
+  }
+
+   /**
+   * Get merchantPath
+   * @return merchantPath
+  **/
+
+  public String getMerchantPath() {
+    return merchantPath;
+  }
+
+  public void setMerchantPath(String merchantPath) {
+    this.merchantPath = merchantPath;
+  }
+
+  public ElectronicReceiptRequestDTO openId(String openId) {
+    this.openId = openId;
+    return this;
+  }
+
+   /**
+   * Get openId
+   * @return openId
+  **/
+
+  public String getOpenId() {
+    return openId;
+  }
+
+  public void setOpenId(String openId) {
+    this.openId = openId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    ElectronicReceiptRequestDTO electronicReceiptRequestDTO = (ElectronicReceiptRequestDTO) o;
+    return ObjectUtils.equals(this.merchantNo, electronicReceiptRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.channelOrderId, electronicReceiptRequestDTO.channelOrderId) &&
+    ObjectUtils.equals(this.orderId, electronicReceiptRequestDTO.orderId) &&
+    ObjectUtils.equals(this.appId, electronicReceiptRequestDTO.appId) &&
+    ObjectUtils.equals(this.merchantPath, electronicReceiptRequestDTO.merchantPath) &&
+    ObjectUtils.equals(this.openId, electronicReceiptRequestDTO.openId);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(merchantNo, channelOrderId, orderId, appId, merchantPath, openId);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ElectronicReceiptRequestDTO {\n");
+    
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    channelOrderId: ").append(toIndentedString(channelOrderId)).append("\n");
+    sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
+    sb.append("    appId: ").append(toIndentedString(appId)).append("\n");
+    sb.append("    merchantPath: ").append(toIndentedString(merchantPath)).append("\n");
+    sb.append("    openId: ").append(toIndentedString(openId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/ElectronicReceiptResponseDTO.java

@@ -0,0 +1,431 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+import org.joda.time.DateTime;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class ElectronicReceiptResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("channelOrderId")
+  private String channelOrderId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("orderId")
+  private String orderId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("createTime")
+  private DateTime createTime = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("modifyTime")
+  private DateTime modifyTime = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("uploadTime")
+  private DateTime uploadTime = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("brandId")
+  private String brandId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantPath")
+  private String merchantPath = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("appId")
+  private String appId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("openId")
+  private String openId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("reportMerchantNo")
+  private String reportMerchantNo = null;
+
+  public ElectronicReceiptResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public ElectronicReceiptResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public ElectronicReceiptResponseDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * Get merchantNo
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public ElectronicReceiptResponseDTO channelOrderId(String channelOrderId) {
+    this.channelOrderId = channelOrderId;
+    return this;
+  }
+
+   /**
+   * Get channelOrderId
+   * @return channelOrderId
+  **/
+
+  public String getChannelOrderId() {
+    return channelOrderId;
+  }
+
+  public void setChannelOrderId(String channelOrderId) {
+    this.channelOrderId = channelOrderId;
+  }
+
+  public ElectronicReceiptResponseDTO orderId(String orderId) {
+    this.orderId = orderId;
+    return this;
+  }
+
+   /**
+   * Get orderId
+   * @return orderId
+  **/
+
+  public String getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(String orderId) {
+    this.orderId = orderId;
+  }
+
+  public ElectronicReceiptResponseDTO createTime(DateTime createTime) {
+    this.createTime = createTime;
+    return this;
+  }
+
+   /**
+   * Get createTime
+   * @return createTime
+  **/
+
+  public DateTime getCreateTime() {
+    return createTime;
+  }
+
+  public void setCreateTime(DateTime createTime) {
+    this.createTime = createTime;
+  }
+
+  public ElectronicReceiptResponseDTO modifyTime(DateTime modifyTime) {
+    this.modifyTime = modifyTime;
+    return this;
+  }
+
+   /**
+   * Get modifyTime
+   * @return modifyTime
+  **/
+
+  public DateTime getModifyTime() {
+    return modifyTime;
+  }
+
+  public void setModifyTime(DateTime modifyTime) {
+    this.modifyTime = modifyTime;
+  }
+
+  public ElectronicReceiptResponseDTO uploadTime(DateTime uploadTime) {
+    this.uploadTime = uploadTime;
+    return this;
+  }
+
+   /**
+   * Get uploadTime
+   * @return uploadTime
+  **/
+
+  public DateTime getUploadTime() {
+    return uploadTime;
+  }
+
+  public void setUploadTime(DateTime uploadTime) {
+    this.uploadTime = uploadTime;
+  }
+
+  public ElectronicReceiptResponseDTO brandId(String brandId) {
+    this.brandId = brandId;
+    return this;
+  }
+
+   /**
+   * Get brandId
+   * @return brandId
+  **/
+
+  public String getBrandId() {
+    return brandId;
+  }
+
+  public void setBrandId(String brandId) {
+    this.brandId = brandId;
+  }
+
+  public ElectronicReceiptResponseDTO merchantPath(String merchantPath) {
+    this.merchantPath = merchantPath;
+    return this;
+  }
+
+   /**
+   * Get merchantPath
+   * @return merchantPath
+  **/
+
+  public String getMerchantPath() {
+    return merchantPath;
+  }
+
+  public void setMerchantPath(String merchantPath) {
+    this.merchantPath = merchantPath;
+  }
+
+  public ElectronicReceiptResponseDTO appId(String appId) {
+    this.appId = appId;
+    return this;
+  }
+
+   /**
+   * Get appId
+   * @return appId
+  **/
+
+  public String getAppId() {
+    return appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public ElectronicReceiptResponseDTO openId(String openId) {
+    this.openId = openId;
+    return this;
+  }
+
+   /**
+   * Get openId
+   * @return openId
+  **/
+
+  public String getOpenId() {
+    return openId;
+  }
+
+  public void setOpenId(String openId) {
+    this.openId = openId;
+  }
+
+  public ElectronicReceiptResponseDTO reportMerchantNo(String reportMerchantNo) {
+    this.reportMerchantNo = reportMerchantNo;
+    return this;
+  }
+
+   /**
+   * Get reportMerchantNo
+   * @return reportMerchantNo
+  **/
+
+  public String getReportMerchantNo() {
+    return reportMerchantNo;
+  }
+
+  public void setReportMerchantNo(String reportMerchantNo) {
+    this.reportMerchantNo = reportMerchantNo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    ElectronicReceiptResponseDTO electronicReceiptResponseDTO = (ElectronicReceiptResponseDTO) o;
+    return ObjectUtils.equals(this.code, electronicReceiptResponseDTO.code) &&
+    ObjectUtils.equals(this.message, electronicReceiptResponseDTO.message) &&
+    ObjectUtils.equals(this.merchantNo, electronicReceiptResponseDTO.merchantNo) &&
+    ObjectUtils.equals(this.channelOrderId, electronicReceiptResponseDTO.channelOrderId) &&
+    ObjectUtils.equals(this.orderId, electronicReceiptResponseDTO.orderId) &&
+    ObjectUtils.equals(this.createTime, electronicReceiptResponseDTO.createTime) &&
+    ObjectUtils.equals(this.modifyTime, electronicReceiptResponseDTO.modifyTime) &&
+    ObjectUtils.equals(this.uploadTime, electronicReceiptResponseDTO.uploadTime) &&
+    ObjectUtils.equals(this.brandId, electronicReceiptResponseDTO.brandId) &&
+    ObjectUtils.equals(this.merchantPath, electronicReceiptResponseDTO.merchantPath) &&
+    ObjectUtils.equals(this.appId, electronicReceiptResponseDTO.appId) &&
+    ObjectUtils.equals(this.openId, electronicReceiptResponseDTO.openId) &&
+    ObjectUtils.equals(this.reportMerchantNo, electronicReceiptResponseDTO.reportMerchantNo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, merchantNo, channelOrderId, orderId, createTime, modifyTime, uploadTime, brandId, merchantPath, appId, openId, reportMerchantNo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ElectronicReceiptResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    channelOrderId: ").append(toIndentedString(channelOrderId)).append("\n");
+    sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
+    sb.append("    createTime: ").append(toIndentedString(createTime)).append("\n");
+    sb.append("    modifyTime: ").append(toIndentedString(modifyTime)).append("\n");
+    sb.append("    uploadTime: ").append(toIndentedString(uploadTime)).append("\n");
+    sb.append("    brandId: ").append(toIndentedString(brandId)).append("\n");
+    sb.append("    merchantPath: ").append(toIndentedString(merchantPath)).append("\n");
+    sb.append("    appId: ").append(toIndentedString(appId)).append("\n");
+    sb.append("    openId: ").append(toIndentedString(openId)).append("\n");
+    sb.append("    reportMerchantNo: ").append(toIndentedString(reportMerchantNo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/EntrustWithholdSignQueryResponseDTO.java

@@ -0,0 +1,352 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 响应结果
+ */
+public class EntrustWithholdSignQueryResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 返回码
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 返回信息
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 支付方式
+   */
+  @JsonProperty("payWay")
+  private String payWay = null;
+
+  /**
+   * 渠道类型
+   */
+  @JsonProperty("channel")
+  private String channel = null;
+
+  /**
+   * 签约来源
+   */
+  @JsonProperty("signSource")
+  private String signSource = null;
+
+  /**
+   * 微信公众号ID/微信小程序ID
+   */
+  @JsonProperty("appId")
+  private String appId = null;
+
+  /**
+   * 协议模版ID
+   */
+  @JsonProperty("plainId")
+  private String plainId = null;
+
+  /**
+   * 协议ID
+   */
+  @JsonProperty("agreementId")
+  private String agreementId = null;
+
+  /**
+   * 可选项如下:<br>INIT:初始化<br>SIGNED:已签约<br>UNSIGNED:已解约
+   */
+  @JsonProperty("signStatus")
+  private String signStatus = null;
+
+  /**
+   * 易宝唯一签约协议号
+   */
+  @JsonProperty("uniqueAgreementNo")
+  private String uniqueAgreementNo = null;
+
+  public EntrustWithholdSignQueryResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * 返回码
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public EntrustWithholdSignQueryResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * 返回信息
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public EntrustWithholdSignQueryResponseDTO payWay(String payWay) {
+    this.payWay = payWay;
+    return this;
+  }
+
+   /**
+   * 支付方式
+   * @return payWay
+  **/
+
+  public String getPayWay() {
+    return payWay;
+  }
+
+  public void setPayWay(String payWay) {
+    this.payWay = payWay;
+  }
+
+  public EntrustWithholdSignQueryResponseDTO channel(String channel) {
+    this.channel = channel;
+    return this;
+  }
+
+   /**
+   * 渠道类型
+   * @return channel
+  **/
+
+  public String getChannel() {
+    return channel;
+  }
+
+  public void setChannel(String channel) {
+    this.channel = channel;
+  }
+
+  public EntrustWithholdSignQueryResponseDTO signSource(String signSource) {
+    this.signSource = signSource;
+    return this;
+  }
+
+   /**
+   * 签约来源
+   * @return signSource
+  **/
+
+  public String getSignSource() {
+    return signSource;
+  }
+
+  public void setSignSource(String signSource) {
+    this.signSource = signSource;
+  }
+
+  public EntrustWithholdSignQueryResponseDTO appId(String appId) {
+    this.appId = appId;
+    return this;
+  }
+
+   /**
+   * 微信公众号ID/微信小程序ID
+   * @return appId
+  **/
+
+  public String getAppId() {
+    return appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public EntrustWithholdSignQueryResponseDTO plainId(String plainId) {
+    this.plainId = plainId;
+    return this;
+  }
+
+   /**
+   * 协议模版ID
+   * @return plainId
+  **/
+
+  public String getPlainId() {
+    return plainId;
+  }
+
+  public void setPlainId(String plainId) {
+    this.plainId = plainId;
+  }
+
+  public EntrustWithholdSignQueryResponseDTO agreementId(String agreementId) {
+    this.agreementId = agreementId;
+    return this;
+  }
+
+   /**
+   * 协议ID
+   * @return agreementId
+  **/
+
+  public String getAgreementId() {
+    return agreementId;
+  }
+
+  public void setAgreementId(String agreementId) {
+    this.agreementId = agreementId;
+  }
+
+  public EntrustWithholdSignQueryResponseDTO signStatus(String signStatus) {
+    this.signStatus = signStatus;
+    return this;
+  }
+
+   /**
+   * 可选项如下:<br>INIT:初始化<br>SIGNED:已签约<br>UNSIGNED:已解约
+   * @return signStatus
+  **/
+
+  public String getSignStatus() {
+    return signStatus;
+  }
+
+  public void setSignStatus(String signStatus) {
+    this.signStatus = signStatus;
+  }
+
+  public EntrustWithholdSignQueryResponseDTO uniqueAgreementNo(String uniqueAgreementNo) {
+    this.uniqueAgreementNo = uniqueAgreementNo;
+    return this;
+  }
+
+   /**
+   * 易宝唯一签约协议号
+   * @return uniqueAgreementNo
+  **/
+
+  public String getUniqueAgreementNo() {
+    return uniqueAgreementNo;
+  }
+
+  public void setUniqueAgreementNo(String uniqueAgreementNo) {
+    this.uniqueAgreementNo = uniqueAgreementNo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    EntrustWithholdSignQueryResponseDTO entrustWithholdSignQueryResponseDTO = (EntrustWithholdSignQueryResponseDTO) o;
+    return ObjectUtils.equals(this.code, entrustWithholdSignQueryResponseDTO.code) &&
+    ObjectUtils.equals(this.message, entrustWithholdSignQueryResponseDTO.message) &&
+    ObjectUtils.equals(this.payWay, entrustWithholdSignQueryResponseDTO.payWay) &&
+    ObjectUtils.equals(this.channel, entrustWithholdSignQueryResponseDTO.channel) &&
+    ObjectUtils.equals(this.signSource, entrustWithholdSignQueryResponseDTO.signSource) &&
+    ObjectUtils.equals(this.appId, entrustWithholdSignQueryResponseDTO.appId) &&
+    ObjectUtils.equals(this.plainId, entrustWithholdSignQueryResponseDTO.plainId) &&
+    ObjectUtils.equals(this.agreementId, entrustWithholdSignQueryResponseDTO.agreementId) &&
+    ObjectUtils.equals(this.signStatus, entrustWithholdSignQueryResponseDTO.signStatus) &&
+    ObjectUtils.equals(this.uniqueAgreementNo, entrustWithholdSignQueryResponseDTO.uniqueAgreementNo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, payWay, channel, signSource, appId, plainId, agreementId, signStatus, uniqueAgreementNo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EntrustWithholdSignQueryResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    payWay: ").append(toIndentedString(payWay)).append("\n");
+    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
+    sb.append("    signSource: ").append(toIndentedString(signSource)).append("\n");
+    sb.append("    appId: ").append(toIndentedString(appId)).append("\n");
+    sb.append("    plainId: ").append(toIndentedString(plainId)).append("\n");
+    sb.append("    agreementId: ").append(toIndentedString(agreementId)).append("\n");
+    sb.append("    signStatus: ").append(toIndentedString(signStatus)).append("\n");
+    sb.append("    uniqueAgreementNo: ").append(toIndentedString(uniqueAgreementNo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/EntrustWithholdSignResponseDTO.java

@@ -0,0 +1,196 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 响应结果
+ */
+public class EntrustWithholdSignResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 返回码
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 返回信息
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 易宝唯一协议号
+   */
+  @JsonProperty("uniqueAgreementNo")
+  private String uniqueAgreementNo = null;
+
+  /**
+   * 跳转签约信息
+   */
+  @JsonProperty("redirectParam")
+  private String redirectParam = null;
+
+  public EntrustWithholdSignResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * 返回码
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public EntrustWithholdSignResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * 返回信息
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public EntrustWithholdSignResponseDTO uniqueAgreementNo(String uniqueAgreementNo) {
+    this.uniqueAgreementNo = uniqueAgreementNo;
+    return this;
+  }
+
+   /**
+   * 易宝唯一协议号
+   * @return uniqueAgreementNo
+  **/
+
+  public String getUniqueAgreementNo() {
+    return uniqueAgreementNo;
+  }
+
+  public void setUniqueAgreementNo(String uniqueAgreementNo) {
+    this.uniqueAgreementNo = uniqueAgreementNo;
+  }
+
+  public EntrustWithholdSignResponseDTO redirectParam(String redirectParam) {
+    this.redirectParam = redirectParam;
+    return this;
+  }
+
+   /**
+   * 跳转签约信息
+   * @return redirectParam
+  **/
+
+  public String getRedirectParam() {
+    return redirectParam;
+  }
+
+  public void setRedirectParam(String redirectParam) {
+    this.redirectParam = redirectParam;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    EntrustWithholdSignResponseDTO entrustWithholdSignResponseDTO = (EntrustWithholdSignResponseDTO) o;
+    return ObjectUtils.equals(this.code, entrustWithholdSignResponseDTO.code) &&
+    ObjectUtils.equals(this.message, entrustWithholdSignResponseDTO.message) &&
+    ObjectUtils.equals(this.uniqueAgreementNo, entrustWithholdSignResponseDTO.uniqueAgreementNo) &&
+    ObjectUtils.equals(this.redirectParam, entrustWithholdSignResponseDTO.redirectParam);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, uniqueAgreementNo, redirectParam);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EntrustWithholdSignResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    uniqueAgreementNo: ").append(toIndentedString(uniqueAgreementNo)).append("\n");
+    sb.append("    redirectParam: ").append(toIndentedString(redirectParam)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/EntrustWithholdUnSignResponseDTO.java

@@ -0,0 +1,144 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 响应结果
+ */
+public class EntrustWithholdUnSignResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 返回码
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 返回信息
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  public EntrustWithholdUnSignResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * 返回码
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public EntrustWithholdUnSignResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * 返回信息
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    EntrustWithholdUnSignResponseDTO entrustWithholdUnSignResponseDTO = (EntrustWithholdUnSignResponseDTO) o;
+    return ObjectUtils.equals(this.code, entrustWithholdUnSignResponseDTO.code) &&
+    ObjectUtils.equals(this.message, entrustWithholdUnSignResponseDTO.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EntrustWithholdUnSignResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/EntryApplyDTO.java

@@ -0,0 +1,196 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class EntryApplyDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * <p>商户提交单号</p>
+   */
+  @JsonProperty("bizApplyNo")
+  private String bizApplyNo = null;
+
+  /**
+   * <p>易宝生成单号</p>
+   */
+  @JsonProperty("applyNo")
+  private String applyNo = null;
+
+  public EntryApplyDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public EntryApplyDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public EntryApplyDTO bizApplyNo(String bizApplyNo) {
+    this.bizApplyNo = bizApplyNo;
+    return this;
+  }
+
+   /**
+   * <p>商户提交单号</p>
+   * @return bizApplyNo
+  **/
+
+  public String getBizApplyNo() {
+    return bizApplyNo;
+  }
+
+  public void setBizApplyNo(String bizApplyNo) {
+    this.bizApplyNo = bizApplyNo;
+  }
+
+  public EntryApplyDTO applyNo(String applyNo) {
+    this.applyNo = applyNo;
+    return this;
+  }
+
+   /**
+   * <p>易宝生成单号</p>
+   * @return applyNo
+  **/
+
+  public String getApplyNo() {
+    return applyNo;
+  }
+
+  public void setApplyNo(String applyNo) {
+    this.applyNo = applyNo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    EntryApplyDTO entryApplyDTO = (EntryApplyDTO) o;
+    return ObjectUtils.equals(this.code, entryApplyDTO.code) &&
+    ObjectUtils.equals(this.message, entryApplyDTO.message) &&
+    ObjectUtils.equals(this.bizApplyNo, entryApplyDTO.bizApplyNo) &&
+    ObjectUtils.equals(this.applyNo, entryApplyDTO.applyNo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, bizApplyNo, applyNo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EntryApplyDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    bizApplyNo: ").append(toIndentedString(bizApplyNo)).append("\n");
+    sb.append("    applyNo: ").append(toIndentedString(applyNo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/EntryReapplyDTO.java

@@ -0,0 +1,404 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * xx
+ */
+public class EntryReapplyDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <p>只允许英文字母或数字不允许汉字和特殊字符</p>
+   */
+  @JsonProperty("bizApplyNo")
+  private String bizApplyNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("payChannel")
+  private String payChannel = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("payScene")
+  private String payScene = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("activityType")
+  private String activityType = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("channelNo")
+  private String channelNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("shortName")
+  private String shortName = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("serviceTel")
+  private String serviceTel = null;
+
+  /**
+   * <p>易宝地区码</p>
+   */
+  @JsonProperty("merchantProvinceCode")
+  private String merchantProvinceCode = null;
+
+  /**
+   * <p>易宝地区码</p>
+   */
+  @JsonProperty("merchantCityCode")
+  private String merchantCityCode = null;
+
+  /**
+   * <p>易宝地区码</p>
+   */
+  @JsonProperty("merchantDistrictCode")
+  private String merchantDistrictCode = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantAddress")
+  private String merchantAddress = null;
+
+  public EntryReapplyDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * Get merchantNo
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public EntryReapplyDTO bizApplyNo(String bizApplyNo) {
+    this.bizApplyNo = bizApplyNo;
+    return this;
+  }
+
+   /**
+   * <p>只允许英文字母或数字不允许汉字和特殊字符</p>
+   * @return bizApplyNo
+  **/
+
+  public String getBizApplyNo() {
+    return bizApplyNo;
+  }
+
+  public void setBizApplyNo(String bizApplyNo) {
+    this.bizApplyNo = bizApplyNo;
+  }
+
+  public EntryReapplyDTO payChannel(String payChannel) {
+    this.payChannel = payChannel;
+    return this;
+  }
+
+   /**
+   * Get payChannel
+   * @return payChannel
+  **/
+
+  public String getPayChannel() {
+    return payChannel;
+  }
+
+  public void setPayChannel(String payChannel) {
+    this.payChannel = payChannel;
+  }
+
+  public EntryReapplyDTO payScene(String payScene) {
+    this.payScene = payScene;
+    return this;
+  }
+
+   /**
+   * Get payScene
+   * @return payScene
+  **/
+
+  public String getPayScene() {
+    return payScene;
+  }
+
+  public void setPayScene(String payScene) {
+    this.payScene = payScene;
+  }
+
+  public EntryReapplyDTO activityType(String activityType) {
+    this.activityType = activityType;
+    return this;
+  }
+
+   /**
+   * Get activityType
+   * @return activityType
+  **/
+
+  public String getActivityType() {
+    return activityType;
+  }
+
+  public void setActivityType(String activityType) {
+    this.activityType = activityType;
+  }
+
+  public EntryReapplyDTO channelNo(String channelNo) {
+    this.channelNo = channelNo;
+    return this;
+  }
+
+   /**
+   * Get channelNo
+   * @return channelNo
+  **/
+
+  public String getChannelNo() {
+    return channelNo;
+  }
+
+  public void setChannelNo(String channelNo) {
+    this.channelNo = channelNo;
+  }
+
+  public EntryReapplyDTO shortName(String shortName) {
+    this.shortName = shortName;
+    return this;
+  }
+
+   /**
+   * Get shortName
+   * @return shortName
+  **/
+
+  public String getShortName() {
+    return shortName;
+  }
+
+  public void setShortName(String shortName) {
+    this.shortName = shortName;
+  }
+
+  public EntryReapplyDTO serviceTel(String serviceTel) {
+    this.serviceTel = serviceTel;
+    return this;
+  }
+
+   /**
+   * Get serviceTel
+   * @return serviceTel
+  **/
+
+  public String getServiceTel() {
+    return serviceTel;
+  }
+
+  public void setServiceTel(String serviceTel) {
+    this.serviceTel = serviceTel;
+  }
+
+  public EntryReapplyDTO merchantProvinceCode(String merchantProvinceCode) {
+    this.merchantProvinceCode = merchantProvinceCode;
+    return this;
+  }
+
+   /**
+   * <p>易宝地区码</p>
+   * @return merchantProvinceCode
+  **/
+
+  public String getMerchantProvinceCode() {
+    return merchantProvinceCode;
+  }
+
+  public void setMerchantProvinceCode(String merchantProvinceCode) {
+    this.merchantProvinceCode = merchantProvinceCode;
+  }
+
+  public EntryReapplyDTO merchantCityCode(String merchantCityCode) {
+    this.merchantCityCode = merchantCityCode;
+    return this;
+  }
+
+   /**
+   * <p>易宝地区码</p>
+   * @return merchantCityCode
+  **/
+
+  public String getMerchantCityCode() {
+    return merchantCityCode;
+  }
+
+  public void setMerchantCityCode(String merchantCityCode) {
+    this.merchantCityCode = merchantCityCode;
+  }
+
+  public EntryReapplyDTO merchantDistrictCode(String merchantDistrictCode) {
+    this.merchantDistrictCode = merchantDistrictCode;
+    return this;
+  }
+
+   /**
+   * <p>易宝地区码</p>
+   * @return merchantDistrictCode
+  **/
+
+  public String getMerchantDistrictCode() {
+    return merchantDistrictCode;
+  }
+
+  public void setMerchantDistrictCode(String merchantDistrictCode) {
+    this.merchantDistrictCode = merchantDistrictCode;
+  }
+
+  public EntryReapplyDTO merchantAddress(String merchantAddress) {
+    this.merchantAddress = merchantAddress;
+    return this;
+  }
+
+   /**
+   * Get merchantAddress
+   * @return merchantAddress
+  **/
+
+  public String getMerchantAddress() {
+    return merchantAddress;
+  }
+
+  public void setMerchantAddress(String merchantAddress) {
+    this.merchantAddress = merchantAddress;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    EntryReapplyDTO entryReapplyDTO = (EntryReapplyDTO) o;
+    return ObjectUtils.equals(this.merchantNo, entryReapplyDTO.merchantNo) &&
+    ObjectUtils.equals(this.bizApplyNo, entryReapplyDTO.bizApplyNo) &&
+    ObjectUtils.equals(this.payChannel, entryReapplyDTO.payChannel) &&
+    ObjectUtils.equals(this.payScene, entryReapplyDTO.payScene) &&
+    ObjectUtils.equals(this.activityType, entryReapplyDTO.activityType) &&
+    ObjectUtils.equals(this.channelNo, entryReapplyDTO.channelNo) &&
+    ObjectUtils.equals(this.shortName, entryReapplyDTO.shortName) &&
+    ObjectUtils.equals(this.serviceTel, entryReapplyDTO.serviceTel) &&
+    ObjectUtils.equals(this.merchantProvinceCode, entryReapplyDTO.merchantProvinceCode) &&
+    ObjectUtils.equals(this.merchantCityCode, entryReapplyDTO.merchantCityCode) &&
+    ObjectUtils.equals(this.merchantDistrictCode, entryReapplyDTO.merchantDistrictCode) &&
+    ObjectUtils.equals(this.merchantAddress, entryReapplyDTO.merchantAddress);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(merchantNo, bizApplyNo, payChannel, payScene, activityType, channelNo, shortName, serviceTel, merchantProvinceCode, merchantCityCode, merchantDistrictCode, merchantAddress);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EntryReapplyDTO {\n");
+    
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    bizApplyNo: ").append(toIndentedString(bizApplyNo)).append("\n");
+    sb.append("    payChannel: ").append(toIndentedString(payChannel)).append("\n");
+    sb.append("    payScene: ").append(toIndentedString(payScene)).append("\n");
+    sb.append("    activityType: ").append(toIndentedString(activityType)).append("\n");
+    sb.append("    channelNo: ").append(toIndentedString(channelNo)).append("\n");
+    sb.append("    shortName: ").append(toIndentedString(shortName)).append("\n");
+    sb.append("    serviceTel: ").append(toIndentedString(serviceTel)).append("\n");
+    sb.append("    merchantProvinceCode: ").append(toIndentedString(merchantProvinceCode)).append("\n");
+    sb.append("    merchantCityCode: ").append(toIndentedString(merchantCityCode)).append("\n");
+    sb.append("    merchantDistrictCode: ").append(toIndentedString(merchantDistrictCode)).append("\n");
+    sb.append("    merchantAddress: ").append(toIndentedString(merchantAddress)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/FeeContributeInfo.java

@@ -0,0 +1,432 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 手续费出资详情
+ */
+public class FeeContributeInfo implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <div data-page-id=\"RHsgd90gyoat7Jxy0kdcvmE4nPd\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-DPgSdbpnWoiNI6xvTvzcLyKhn7e\">金额，最多 10 位整数、2 位小数(</div> <div class=\"ace-line ace-line old-record-id-XoN1dipKjoNDkaxPa1ncneDDn5c\">单位：元)</div> </div>
+   */
+  @JsonProperty("amount")
+  private String amount = null;
+
+  /**
+   *  可选项如下: TRADE:交易手续费 SUBSIDY:补贴手续费 
+   */
+  public enum ContributionTypeEnum {
+    TRADE("TRADE"),
+    
+    SUBSIDY("SUBSIDY");
+
+    private String value;
+
+    ContributionTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static ContributionTypeEnum fromValue(String text) {
+      for (ContributionTypeEnum b : ContributionTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: TRADE:交易手续费 SUBSIDY:补贴手续费 
+   */
+  @JsonProperty("contributionType")
+  private ContributionTypeEnum contributionType = null;
+
+  /**
+   *  可选项如下: ABSOLUTE:绝对费率 RELATIVE:相对比例 
+   */
+  public enum SubsidyTypeEnum {
+    ABSOLUTE("ABSOLUTE"),
+    
+    RELATIVE("RELATIVE");
+
+    private String value;
+
+    SubsidyTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static SubsidyTypeEnum fromValue(String text) {
+      for (SubsidyTypeEnum b : SubsidyTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: ABSOLUTE:绝对费率 RELATIVE:相对比例 
+   */
+  @JsonProperty("subsidyType")
+  private SubsidyTypeEnum subsidyType = null;
+
+  /**
+   * <p>费率形式补贴时的百分比</p>
+   */
+  @JsonProperty("subsidyProportion")
+  private String subsidyProportion = null;
+
+  /**
+   *  可选项如下: SINGLE_FIXED:单笔固定值 SINGLE_PERCENT:单笔百分比 FIXED_MIX_PERCENT:单笔固定值+百分比 SINGLE_PERCENT_MIX_MAX_FEE:单笔百分比+封顶值 
+   */
+  public enum SubsidyCalculateTypeEnum {
+    SINGLE_FIXED("SINGLE_FIXED"),
+    
+    SINGLE_PERCENT("SINGLE_PERCENT"),
+    
+    FIXED_MIX_PERCENT("FIXED_MIX_PERCENT"),
+    
+    SINGLE_PERCENT_MIX_MAX_FEE("SINGLE_PERCENT_MIX_MAX_FEE");
+
+    private String value;
+
+    SubsidyCalculateTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static SubsidyCalculateTypeEnum fromValue(String text) {
+      for (SubsidyCalculateTypeEnum b : SubsidyCalculateTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: SINGLE_FIXED:单笔固定值 SINGLE_PERCENT:单笔百分比 FIXED_MIX_PERCENT:单笔固定值+百分比 SINGLE_PERCENT_MIX_MAX_FEE:单笔百分比+封顶值 
+   */
+  @JsonProperty("subsidyCalculateType")
+  private SubsidyCalculateTypeEnum subsidyCalculateType = null;
+
+  /**
+   * <p>百分比计算产生的费用</p>
+   */
+  @JsonProperty("subsidyPercentFee")
+  private String subsidyPercentFee = null;
+
+  /**
+   * <p>单笔固定补贴金额</p>
+   */
+  @JsonProperty("subsidyFixedFee")
+  private String subsidyFixedFee = null;
+
+  /**
+   * <p>单笔补贴封顶金额</p>
+   */
+  @JsonProperty("subsidyMaxFee")
+  private String subsidyMaxFee = null;
+
+  public FeeContributeInfo merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * Get merchantNo
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public FeeContributeInfo amount(String amount) {
+    this.amount = amount;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"RHsgd90gyoat7Jxy0kdcvmE4nPd\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-DPgSdbpnWoiNI6xvTvzcLyKhn7e\">金额，最多 10 位整数、2 位小数(</div> <div class=\"ace-line ace-line old-record-id-XoN1dipKjoNDkaxPa1ncneDDn5c\">单位：元)</div> </div>
+   * @return amount
+  **/
+
+  public String getAmount() {
+    return amount;
+  }
+
+  public void setAmount(String amount) {
+    this.amount = amount;
+  }
+
+  public FeeContributeInfo contributionType(ContributionTypeEnum contributionType) {
+    this.contributionType = contributionType;
+    return this;
+  }
+
+   /**
+   *  可选项如下: TRADE:交易手续费 SUBSIDY:补贴手续费 
+   * @return contributionType
+  **/
+
+  public ContributionTypeEnum getContributionType() {
+    return contributionType;
+  }
+
+  public void setContributionType(ContributionTypeEnum contributionType) {
+    this.contributionType = contributionType;
+  }
+
+  public FeeContributeInfo subsidyType(SubsidyTypeEnum subsidyType) {
+    this.subsidyType = subsidyType;
+    return this;
+  }
+
+   /**
+   *  可选项如下: ABSOLUTE:绝对费率 RELATIVE:相对比例 
+   * @return subsidyType
+  **/
+
+  public SubsidyTypeEnum getSubsidyType() {
+    return subsidyType;
+  }
+
+  public void setSubsidyType(SubsidyTypeEnum subsidyType) {
+    this.subsidyType = subsidyType;
+  }
+
+  public FeeContributeInfo subsidyProportion(String subsidyProportion) {
+    this.subsidyProportion = subsidyProportion;
+    return this;
+  }
+
+   /**
+   * <p>费率形式补贴时的百分比</p>
+   * @return subsidyProportion
+  **/
+
+  public String getSubsidyProportion() {
+    return subsidyProportion;
+  }
+
+  public void setSubsidyProportion(String subsidyProportion) {
+    this.subsidyProportion = subsidyProportion;
+  }
+
+  public FeeContributeInfo subsidyCalculateType(SubsidyCalculateTypeEnum subsidyCalculateType) {
+    this.subsidyCalculateType = subsidyCalculateType;
+    return this;
+  }
+
+   /**
+   *  可选项如下: SINGLE_FIXED:单笔固定值 SINGLE_PERCENT:单笔百分比 FIXED_MIX_PERCENT:单笔固定值+百分比 SINGLE_PERCENT_MIX_MAX_FEE:单笔百分比+封顶值 
+   * @return subsidyCalculateType
+  **/
+
+  public SubsidyCalculateTypeEnum getSubsidyCalculateType() {
+    return subsidyCalculateType;
+  }
+
+  public void setSubsidyCalculateType(SubsidyCalculateTypeEnum subsidyCalculateType) {
+    this.subsidyCalculateType = subsidyCalculateType;
+  }
+
+  public FeeContributeInfo subsidyPercentFee(String subsidyPercentFee) {
+    this.subsidyPercentFee = subsidyPercentFee;
+    return this;
+  }
+
+   /**
+   * <p>百分比计算产生的费用</p>
+   * @return subsidyPercentFee
+  **/
+
+  public String getSubsidyPercentFee() {
+    return subsidyPercentFee;
+  }
+
+  public void setSubsidyPercentFee(String subsidyPercentFee) {
+    this.subsidyPercentFee = subsidyPercentFee;
+  }
+
+  public FeeContributeInfo subsidyFixedFee(String subsidyFixedFee) {
+    this.subsidyFixedFee = subsidyFixedFee;
+    return this;
+  }
+
+   /**
+   * <p>单笔固定补贴金额</p>
+   * @return subsidyFixedFee
+  **/
+
+  public String getSubsidyFixedFee() {
+    return subsidyFixedFee;
+  }
+
+  public void setSubsidyFixedFee(String subsidyFixedFee) {
+    this.subsidyFixedFee = subsidyFixedFee;
+  }
+
+  public FeeContributeInfo subsidyMaxFee(String subsidyMaxFee) {
+    this.subsidyMaxFee = subsidyMaxFee;
+    return this;
+  }
+
+   /**
+   * <p>单笔补贴封顶金额</p>
+   * @return subsidyMaxFee
+  **/
+
+  public String getSubsidyMaxFee() {
+    return subsidyMaxFee;
+  }
+
+  public void setSubsidyMaxFee(String subsidyMaxFee) {
+    this.subsidyMaxFee = subsidyMaxFee;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    FeeContributeInfo feeContributeInfo = (FeeContributeInfo) o;
+    return ObjectUtils.equals(this.merchantNo, feeContributeInfo.merchantNo) &&
+    ObjectUtils.equals(this.amount, feeContributeInfo.amount) &&
+    ObjectUtils.equals(this.contributionType, feeContributeInfo.contributionType) &&
+    ObjectUtils.equals(this.subsidyType, feeContributeInfo.subsidyType) &&
+    ObjectUtils.equals(this.subsidyProportion, feeContributeInfo.subsidyProportion) &&
+    ObjectUtils.equals(this.subsidyCalculateType, feeContributeInfo.subsidyCalculateType) &&
+    ObjectUtils.equals(this.subsidyPercentFee, feeContributeInfo.subsidyPercentFee) &&
+    ObjectUtils.equals(this.subsidyFixedFee, feeContributeInfo.subsidyFixedFee) &&
+    ObjectUtils.equals(this.subsidyMaxFee, feeContributeInfo.subsidyMaxFee);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(merchantNo, amount, contributionType, subsidyType, subsidyProportion, subsidyCalculateType, subsidyPercentFee, subsidyFixedFee, subsidyMaxFee);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FeeContributeInfo {\n");
+    
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
+    sb.append("    contributionType: ").append(toIndentedString(contributionType)).append("\n");
+    sb.append("    subsidyType: ").append(toIndentedString(subsidyType)).append("\n");
+    sb.append("    subsidyProportion: ").append(toIndentedString(subsidyProportion)).append("\n");
+    sb.append("    subsidyCalculateType: ").append(toIndentedString(subsidyCalculateType)).append("\n");
+    sb.append("    subsidyPercentFee: ").append(toIndentedString(subsidyPercentFee)).append("\n");
+    sb.append("    subsidyFixedFee: ").append(toIndentedString(subsidyFixedFee)).append("\n");
+    sb.append("    subsidyMaxFee: ").append(toIndentedString(subsidyMaxFee)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/FeeSubsidyDTO.java

@@ -0,0 +1,408 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 手续费补贴
+ */
+public class FeeSubsidyDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">承担手续费补贴的商户编号</div> </div> <p> </p>
+   */
+  @JsonProperty("subsidyMerchantNo")
+  private String subsidyMerchantNo = null;
+
+  /**
+   *  可选项如下: MARKET_ACCOUNT:营销账户 FEE_ACCOUNT:手续费账户 HANDLE_ACCOUNT:后收手续费账户 
+   */
+  public enum SubsidyAccountTypeEnum {
+    MARKET_ACCOUNT("MARKET_ACCOUNT"),
+    
+    FEE_ACCOUNT("FEE_ACCOUNT"),
+    
+    HANDLE_ACCOUNT("HANDLE_ACCOUNT");
+
+    private String value;
+
+    SubsidyAccountTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static SubsidyAccountTypeEnum fromValue(String text) {
+      for (SubsidyAccountTypeEnum b : SubsidyAccountTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: MARKET_ACCOUNT:营销账户 FEE_ACCOUNT:手续费账户 HANDLE_ACCOUNT:后收手续费账户 
+   */
+  @JsonProperty("subsidyAccountType")
+  private SubsidyAccountTypeEnum subsidyAccountType = null;
+
+  /**
+   *  可选项如下: ABSOLUTE:绝对费率 RELATIVE:相对比例 
+   */
+  public enum SubsidyTypeEnum {
+    ABSOLUTE("ABSOLUTE"),
+    
+    RELATIVE("RELATIVE");
+
+    private String value;
+
+    SubsidyTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static SubsidyTypeEnum fromValue(String text) {
+      for (SubsidyTypeEnum b : SubsidyTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: ABSOLUTE:绝对费率 RELATIVE:相对比例 
+   */
+  @JsonProperty("subsidyType")
+  private SubsidyTypeEnum subsidyType = null;
+
+  /**
+   * <p>费率形式补贴时的百分比</p>
+   */
+  @JsonProperty("subsidyProportion")
+  private String subsidyProportion = null;
+
+  /**
+   *  可选项如下: SINGLE_FIXED:单笔固定值 SINGLE_PERCENT:单笔百分比 FIXED_MIX_PERCENT:单笔固定值+百分比 SINGLE_PERCENT_MIX_MAX_FEE:单笔百分比+封顶值 
+   */
+  public enum SubsidyCalculateTypeEnum {
+    SINGLE_FIXED("SINGLE_FIXED"),
+    
+    SINGLE_PERCENT("SINGLE_PERCENT"),
+    
+    FIXED_MIX_PERCENT("FIXED_MIX_PERCENT"),
+    
+    SINGLE_PERCENT_MIX_MAX_FEE("SINGLE_PERCENT_MIX_MAX_FEE");
+
+    private String value;
+
+    SubsidyCalculateTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static SubsidyCalculateTypeEnum fromValue(String text) {
+      for (SubsidyCalculateTypeEnum b : SubsidyCalculateTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: SINGLE_FIXED:单笔固定值 SINGLE_PERCENT:单笔百分比 FIXED_MIX_PERCENT:单笔固定值+百分比 SINGLE_PERCENT_MIX_MAX_FEE:单笔百分比+封顶值 
+   */
+  @JsonProperty("subsidyCalculateType")
+  private SubsidyCalculateTypeEnum subsidyCalculateType = null;
+
+  /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">百分比计算产生的费用</div> </div>
+   */
+  @JsonProperty("subsidyPercentFee")
+  private String subsidyPercentFee = null;
+
+  /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">单笔固定补贴金额</div> </div>
+   */
+  @JsonProperty("subsidyFixedFee")
+  private String subsidyFixedFee = null;
+
+  /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">单笔补贴封顶金额</div> </div>
+   */
+  @JsonProperty("subsidyMaxFee")
+  private String subsidyMaxFee = null;
+
+  public FeeSubsidyDTO subsidyMerchantNo(String subsidyMerchantNo) {
+    this.subsidyMerchantNo = subsidyMerchantNo;
+    return this;
+  }
+
+   /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">承担手续费补贴的商户编号</div> </div> <p> </p>
+   * @return subsidyMerchantNo
+  **/
+
+  public String getSubsidyMerchantNo() {
+    return subsidyMerchantNo;
+  }
+
+  public void setSubsidyMerchantNo(String subsidyMerchantNo) {
+    this.subsidyMerchantNo = subsidyMerchantNo;
+  }
+
+  public FeeSubsidyDTO subsidyAccountType(SubsidyAccountTypeEnum subsidyAccountType) {
+    this.subsidyAccountType = subsidyAccountType;
+    return this;
+  }
+
+   /**
+   *  可选项如下: MARKET_ACCOUNT:营销账户 FEE_ACCOUNT:手续费账户 HANDLE_ACCOUNT:后收手续费账户 
+   * @return subsidyAccountType
+  **/
+
+  public SubsidyAccountTypeEnum getSubsidyAccountType() {
+    return subsidyAccountType;
+  }
+
+  public void setSubsidyAccountType(SubsidyAccountTypeEnum subsidyAccountType) {
+    this.subsidyAccountType = subsidyAccountType;
+  }
+
+  public FeeSubsidyDTO subsidyType(SubsidyTypeEnum subsidyType) {
+    this.subsidyType = subsidyType;
+    return this;
+  }
+
+   /**
+   *  可选项如下: ABSOLUTE:绝对费率 RELATIVE:相对比例 
+   * @return subsidyType
+  **/
+
+  public SubsidyTypeEnum getSubsidyType() {
+    return subsidyType;
+  }
+
+  public void setSubsidyType(SubsidyTypeEnum subsidyType) {
+    this.subsidyType = subsidyType;
+  }
+
+  public FeeSubsidyDTO subsidyProportion(String subsidyProportion) {
+    this.subsidyProportion = subsidyProportion;
+    return this;
+  }
+
+   /**
+   * <p>费率形式补贴时的百分比</p>
+   * @return subsidyProportion
+  **/
+
+  public String getSubsidyProportion() {
+    return subsidyProportion;
+  }
+
+  public void setSubsidyProportion(String subsidyProportion) {
+    this.subsidyProportion = subsidyProportion;
+  }
+
+  public FeeSubsidyDTO subsidyCalculateType(SubsidyCalculateTypeEnum subsidyCalculateType) {
+    this.subsidyCalculateType = subsidyCalculateType;
+    return this;
+  }
+
+   /**
+   *  可选项如下: SINGLE_FIXED:单笔固定值 SINGLE_PERCENT:单笔百分比 FIXED_MIX_PERCENT:单笔固定值+百分比 SINGLE_PERCENT_MIX_MAX_FEE:单笔百分比+封顶值 
+   * @return subsidyCalculateType
+  **/
+
+  public SubsidyCalculateTypeEnum getSubsidyCalculateType() {
+    return subsidyCalculateType;
+  }
+
+  public void setSubsidyCalculateType(SubsidyCalculateTypeEnum subsidyCalculateType) {
+    this.subsidyCalculateType = subsidyCalculateType;
+  }
+
+  public FeeSubsidyDTO subsidyPercentFee(String subsidyPercentFee) {
+    this.subsidyPercentFee = subsidyPercentFee;
+    return this;
+  }
+
+   /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">百分比计算产生的费用</div> </div>
+   * @return subsidyPercentFee
+  **/
+
+  public String getSubsidyPercentFee() {
+    return subsidyPercentFee;
+  }
+
+  public void setSubsidyPercentFee(String subsidyPercentFee) {
+    this.subsidyPercentFee = subsidyPercentFee;
+  }
+
+  public FeeSubsidyDTO subsidyFixedFee(String subsidyFixedFee) {
+    this.subsidyFixedFee = subsidyFixedFee;
+    return this;
+  }
+
+   /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">单笔固定补贴金额</div> </div>
+   * @return subsidyFixedFee
+  **/
+
+  public String getSubsidyFixedFee() {
+    return subsidyFixedFee;
+  }
+
+  public void setSubsidyFixedFee(String subsidyFixedFee) {
+    this.subsidyFixedFee = subsidyFixedFee;
+  }
+
+  public FeeSubsidyDTO subsidyMaxFee(String subsidyMaxFee) {
+    this.subsidyMaxFee = subsidyMaxFee;
+    return this;
+  }
+
+   /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">单笔补贴封顶金额</div> </div>
+   * @return subsidyMaxFee
+  **/
+
+  public String getSubsidyMaxFee() {
+    return subsidyMaxFee;
+  }
+
+  public void setSubsidyMaxFee(String subsidyMaxFee) {
+    this.subsidyMaxFee = subsidyMaxFee;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    FeeSubsidyDTO feeSubsidyDTO = (FeeSubsidyDTO) o;
+    return ObjectUtils.equals(this.subsidyMerchantNo, feeSubsidyDTO.subsidyMerchantNo) &&
+    ObjectUtils.equals(this.subsidyAccountType, feeSubsidyDTO.subsidyAccountType) &&
+    ObjectUtils.equals(this.subsidyType, feeSubsidyDTO.subsidyType) &&
+    ObjectUtils.equals(this.subsidyProportion, feeSubsidyDTO.subsidyProportion) &&
+    ObjectUtils.equals(this.subsidyCalculateType, feeSubsidyDTO.subsidyCalculateType) &&
+    ObjectUtils.equals(this.subsidyPercentFee, feeSubsidyDTO.subsidyPercentFee) &&
+    ObjectUtils.equals(this.subsidyFixedFee, feeSubsidyDTO.subsidyFixedFee) &&
+    ObjectUtils.equals(this.subsidyMaxFee, feeSubsidyDTO.subsidyMaxFee);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(subsidyMerchantNo, subsidyAccountType, subsidyType, subsidyProportion, subsidyCalculateType, subsidyPercentFee, subsidyFixedFee, subsidyMaxFee);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FeeSubsidyDTO {\n");
+    
+    sb.append("    subsidyMerchantNo: ").append(toIndentedString(subsidyMerchantNo)).append("\n");
+    sb.append("    subsidyAccountType: ").append(toIndentedString(subsidyAccountType)).append("\n");
+    sb.append("    subsidyType: ").append(toIndentedString(subsidyType)).append("\n");
+    sb.append("    subsidyProportion: ").append(toIndentedString(subsidyProportion)).append("\n");
+    sb.append("    subsidyCalculateType: ").append(toIndentedString(subsidyCalculateType)).append("\n");
+    sb.append("    subsidyPercentFee: ").append(toIndentedString(subsidyPercentFee)).append("\n");
+    sb.append("    subsidyFixedFee: ").append(toIndentedString(subsidyFixedFee)).append("\n");
+    sb.append("    subsidyMaxFee: ").append(toIndentedString(subsidyMaxFee)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/MarketingConsultRequestDTO.java

@@ -0,0 +1,199 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class MarketingConsultRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("userId")
+  private String userId = null;
+
+  /**
+   * <p>单位为元，精确到小数点后两位</p>
+   */
+  @JsonProperty("totalAmount")
+  private BigDecimal totalAmount = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("consultRequestId")
+  private String consultRequestId = null;
+
+  public MarketingConsultRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * Get merchantNo
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public MarketingConsultRequestDTO userId(String userId) {
+    this.userId = userId;
+    return this;
+  }
+
+   /**
+   * Get userId
+   * @return userId
+  **/
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  public MarketingConsultRequestDTO totalAmount(BigDecimal totalAmount) {
+    this.totalAmount = totalAmount;
+    return this;
+  }
+
+   /**
+   * <p>单位为元，精确到小数点后两位</p>
+   * minimum: 0
+   * maximum: 100000000
+   * @return totalAmount
+  **/
+
+  public BigDecimal getTotalAmount() {
+    return totalAmount;
+  }
+
+  public void setTotalAmount(BigDecimal totalAmount) {
+    this.totalAmount = totalAmount;
+  }
+
+  public MarketingConsultRequestDTO consultRequestId(String consultRequestId) {
+    this.consultRequestId = consultRequestId;
+    return this;
+  }
+
+   /**
+   * Get consultRequestId
+   * @return consultRequestId
+  **/
+
+  public String getConsultRequestId() {
+    return consultRequestId;
+  }
+
+  public void setConsultRequestId(String consultRequestId) {
+    this.consultRequestId = consultRequestId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    MarketingConsultRequestDTO marketingConsultRequestDTO = (MarketingConsultRequestDTO) o;
+    return ObjectUtils.equals(this.merchantNo, marketingConsultRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.userId, marketingConsultRequestDTO.userId) &&
+    ObjectUtils.equals(this.totalAmount, marketingConsultRequestDTO.totalAmount) &&
+    ObjectUtils.equals(this.consultRequestId, marketingConsultRequestDTO.consultRequestId);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(merchantNo, userId, totalAmount, consultRequestId);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MarketingConsultRequestDTO {\n");
+    
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    userId: ").append(toIndentedString(userId)).append("\n");
+    sb.append("    totalAmount: ").append(toIndentedString(totalAmount)).append("\n");
+    sb.append("    consultRequestId: ").append(toIndentedString(consultRequestId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/MerReportAttachResponseDTO.java

@@ -0,0 +1,144 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class MerReportAttachResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  public MerReportAttachResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public MerReportAttachResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    MerReportAttachResponseDTO merReportAttachResponseDTO = (MerReportAttachResponseDTO) o;
+    return ObjectUtils.equals(this.code, merReportAttachResponseDTO.code) &&
+    ObjectUtils.equals(this.message, merReportAttachResponseDTO.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MerReportAttachResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/MerchantDTO.java

@@ -0,0 +1,144 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 商户信息
+ */
+public class MerchantDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>*标准商户收付款方案中此参数与收款商户编号一致；<br />*平台商户收付款方案中此参数为平台商商户编号；<br />*服务商解决方案中，①标准商户收款时，该参数为标准商户商编 ②平台商收款或平台商入驻商户收款时，该参数为平台商商编。</p>
+   */
+  @JsonProperty("parentMerchantNo")
+  private String parentMerchantNo = null;
+
+  /**
+   * <p>收单主体商编，平台商或服务商下的子商户，标准商户</p>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  public MerchantDTO parentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>*标准商户收付款方案中此参数与收款商户编号一致；<br />*平台商户收付款方案中此参数为平台商商户编号；<br />*服务商解决方案中，①标准商户收款时，该参数为标准商户商编 ②平台商收款或平台商入驻商户收款时，该参数为平台商商编。</p>
+   * @return parentMerchantNo
+  **/
+
+  public String getParentMerchantNo() {
+    return parentMerchantNo;
+  }
+
+  public void setParentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+  }
+
+  public MerchantDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * <p>收单主体商编，平台商或服务商下的子商户，标准商户</p>
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    MerchantDTO merchantDTO = (MerchantDTO) o;
+    return ObjectUtils.equals(this.parentMerchantNo, merchantDTO.parentMerchantNo) &&
+    ObjectUtils.equals(this.merchantNo, merchantDTO.merchantNo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(parentMerchantNo, merchantNo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MerchantDTO {\n");
+    
+    sb.append("    parentMerchantNo: ").append(toIndentedString(parentMerchantNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/ModifyAttachReportRequestDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class ModifyAttachReportRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>主商户号</p>
+   */
+  @JsonProperty("mainMerchantNo")
+  private String mainMerchantNo = null;
+
+  /**
+   * <p>从属商户列表</p> <p>以英文逗号分隔</p>
+   */
+  @JsonProperty("merchantNoList")
+  private String merchantNoList = null;
+
+  /**
+   *  <p>WECHAT:微信</p> <p>ALIPAY:支付宝</p>
+   */
+  @JsonProperty("channel")
+  private String channel = null;
+
+  public ModifyAttachReportRequestDTO mainMerchantNo(String mainMerchantNo) {
+    this.mainMerchantNo = mainMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>主商户号</p>
+   * @return mainMerchantNo
+  **/
+
+  public String getMainMerchantNo() {
+    return mainMerchantNo;
+  }
+
+  public void setMainMerchantNo(String mainMerchantNo) {
+    this.mainMerchantNo = mainMerchantNo;
+  }
+
+  public ModifyAttachReportRequestDTO merchantNoList(String merchantNoList) {
+    this.merchantNoList = merchantNoList;
+    return this;
+  }
+
+   /**
+   * <p>从属商户列表</p> <p>以英文逗号分隔</p>
+   * @return merchantNoList
+  **/
+
+  public String getMerchantNoList() {
+    return merchantNoList;
+  }
+
+  public void setMerchantNoList(String merchantNoList) {
+    this.merchantNoList = merchantNoList;
+  }
+
+  public ModifyAttachReportRequestDTO channel(String channel) {
+    this.channel = channel;
+    return this;
+  }
+
+   /**
+   *  <p>WECHAT:微信</p> <p>ALIPAY:支付宝</p>
+   * @return channel
+  **/
+
+  public String getChannel() {
+    return channel;
+  }
+
+  public void setChannel(String channel) {
+    this.channel = channel;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    ModifyAttachReportRequestDTO modifyAttachReportRequestDTO = (ModifyAttachReportRequestDTO) o;
+    return ObjectUtils.equals(this.mainMerchantNo, modifyAttachReportRequestDTO.mainMerchantNo) &&
+    ObjectUtils.equals(this.merchantNoList, modifyAttachReportRequestDTO.merchantNoList) &&
+    ObjectUtils.equals(this.channel, modifyAttachReportRequestDTO.channel);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(mainMerchantNo, merchantNoList, channel);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModifyAttachReportRequestDTO {\n");
+    
+    sb.append("    mainMerchantNo: ").append(toIndentedString(mainMerchantNo)).append("\n");
+    sb.append("    merchantNoList: ").append(toIndentedString(merchantNoList)).append("\n");
+    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/ModifyAttachReportResponseDTO.java

@@ -0,0 +1,196 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class ModifyAttachReportResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-T75wdNK2fok10Tx8LSCcmbkmnrh\"> <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-LqCydeljZoFOvhxHu36ci1gyntb\">成功状态</div> </div> </div> <div class=\"ace-line ace-line old-record-id-T75wdNK2fok10Tx8LSCcmbkmnrh\"><em>SUCCESS：完全成功</em></div> <div class=\"ace-line ace-line old-record-id-B8vSdLhdroGOdhxOa0zcthJTnHz\"><em>COMPLETE_SUCCESS：部分成功</em></div> <div class=\"ace-line ace-line old-record-id-HFFLdbBVaoEN5fx2u1jcm6i6nnd\"><em>FAIL：失败</em></div> </div>
+   */
+  @JsonProperty("completeStatus")
+  private String completeStatus = null;
+
+  /**
+   *  <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-CJnSdEe00o6HIXxFb45covEZnje\">channel:渠道类型</div> <div class=\"ace-line ace-line old-record-id-CJnSdEe00o6HIXxFb45covEZnje\"> <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-W77Yd1Ka2oBgMCx9vGOc0bownHv\">mainMerchantNo:主商户号</div> <div class=\"ace-line ace-line old-record-id-W77Yd1Ka2oBgMCx9vGOc0bownHv\"> <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-IRUDdm2s6ou9gixaN0Rc4K1tnIg\">merchantNo:从属商户号</div> <div class=\"ace-line ace-line old-record-id-IRUDdm2s6ou9gixaN0Rc4K1tnIg\"> <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XTlldZpzLoVAWbxhCQkce4lsngg\">failReason:失败原因</div> </div> </div> </div> </div> </div> </div> </div>
+   */
+  @JsonProperty("failRecordList")
+  private String failRecordList = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  public ModifyAttachReportResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public ModifyAttachReportResponseDTO completeStatus(String completeStatus) {
+    this.completeStatus = completeStatus;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-T75wdNK2fok10Tx8LSCcmbkmnrh\"> <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-LqCydeljZoFOvhxHu36ci1gyntb\">成功状态</div> </div> </div> <div class=\"ace-line ace-line old-record-id-T75wdNK2fok10Tx8LSCcmbkmnrh\"><em>SUCCESS：完全成功</em></div> <div class=\"ace-line ace-line old-record-id-B8vSdLhdroGOdhxOa0zcthJTnHz\"><em>COMPLETE_SUCCESS：部分成功</em></div> <div class=\"ace-line ace-line old-record-id-HFFLdbBVaoEN5fx2u1jcm6i6nnd\"><em>FAIL：失败</em></div> </div>
+   * @return completeStatus
+  **/
+
+  public String getCompleteStatus() {
+    return completeStatus;
+  }
+
+  public void setCompleteStatus(String completeStatus) {
+    this.completeStatus = completeStatus;
+  }
+
+  public ModifyAttachReportResponseDTO failRecordList(String failRecordList) {
+    this.failRecordList = failRecordList;
+    return this;
+  }
+
+   /**
+   *  <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-CJnSdEe00o6HIXxFb45covEZnje\">channel:渠道类型</div> <div class=\"ace-line ace-line old-record-id-CJnSdEe00o6HIXxFb45covEZnje\"> <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-W77Yd1Ka2oBgMCx9vGOc0bownHv\">mainMerchantNo:主商户号</div> <div class=\"ace-line ace-line old-record-id-W77Yd1Ka2oBgMCx9vGOc0bownHv\"> <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-IRUDdm2s6ou9gixaN0Rc4K1tnIg\">merchantNo:从属商户号</div> <div class=\"ace-line ace-line old-record-id-IRUDdm2s6ou9gixaN0Rc4K1tnIg\"> <div data-page-id=\"AbOkdD0QYoNgP5xVtEvcUcgXnGc\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XTlldZpzLoVAWbxhCQkce4lsngg\">failReason:失败原因</div> </div> </div> </div> </div> </div> </div> </div>
+   * @return failRecordList
+  **/
+
+  public String getFailRecordList() {
+    return failRecordList;
+  }
+
+  public void setFailRecordList(String failRecordList) {
+    this.failRecordList = failRecordList;
+  }
+
+  public ModifyAttachReportResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    ModifyAttachReportResponseDTO modifyAttachReportResponseDTO = (ModifyAttachReportResponseDTO) o;
+    return ObjectUtils.equals(this.code, modifyAttachReportResponseDTO.code) &&
+    ObjectUtils.equals(this.completeStatus, modifyAttachReportResponseDTO.completeStatus) &&
+    ObjectUtils.equals(this.failRecordList, modifyAttachReportResponseDTO.failRecordList) &&
+    ObjectUtils.equals(this.message, modifyAttachReportResponseDTO.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, completeStatus, failRecordList, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModifyAttachReportResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    completeStatus: ").append(toIndentedString(completeStatus)).append("\n");
+    sb.append("    failRecordList: ").append(toIndentedString(failRecordList)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/OrderCloseRequestDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 聚合支付关单接口请求参数
+ */
+public class OrderCloseRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantInfo")
+  private MerchantDTO merchantInfo = null;
+
+  /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">商户侧订单号，唯一标识一笔订单，</div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\"> <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">mchOrderNo和orderNo必填一个</div> </div> </div> </div>
+   */
+  @JsonProperty("mchOrderNo")
+  private String mchOrderNo = null;
+
+  /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">易宝侧生成的唯一订单号</div> </div>
+   */
+  @JsonProperty("orderNo")
+  private String orderNo = null;
+
+  public OrderCloseRequestDTO merchantInfo(MerchantDTO merchantInfo) {
+    this.merchantInfo = merchantInfo;
+    return this;
+  }
+
+   /**
+   * Get merchantInfo
+   * @return merchantInfo
+  **/
+
+  public MerchantDTO getMerchantInfo() {
+    return merchantInfo;
+  }
+
+  public void setMerchantInfo(MerchantDTO merchantInfo) {
+    this.merchantInfo = merchantInfo;
+  }
+
+  public OrderCloseRequestDTO mchOrderNo(String mchOrderNo) {
+    this.mchOrderNo = mchOrderNo;
+    return this;
+  }
+
+   /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">商户侧订单号，唯一标识一笔订单，</div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\"> <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">mchOrderNo和orderNo必填一个</div> </div> </div> </div>
+   * @return mchOrderNo
+  **/
+
+  public String getMchOrderNo() {
+    return mchOrderNo;
+  }
+
+  public void setMchOrderNo(String mchOrderNo) {
+    this.mchOrderNo = mchOrderNo;
+  }
+
+  public OrderCloseRequestDTO orderNo(String orderNo) {
+    this.orderNo = orderNo;
+    return this;
+  }
+
+   /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">易宝侧生成的唯一订单号</div> </div>
+   * @return orderNo
+  **/
+
+  public String getOrderNo() {
+    return orderNo;
+  }
+
+  public void setOrderNo(String orderNo) {
+    this.orderNo = orderNo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    OrderCloseRequestDTO orderCloseRequestDTO = (OrderCloseRequestDTO) o;
+    return ObjectUtils.equals(this.merchantInfo, orderCloseRequestDTO.merchantInfo) &&
+    ObjectUtils.equals(this.mchOrderNo, orderCloseRequestDTO.mchOrderNo) &&
+    ObjectUtils.equals(this.orderNo, orderCloseRequestDTO.orderNo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(merchantInfo, mchOrderNo, orderNo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OrderCloseRequestDTO {\n");
+    
+    sb.append("    merchantInfo: ").append(toIndentedString(merchantInfo)).append("\n");
+    sb.append("    mchOrderNo: ").append(toIndentedString(mchOrderNo)).append("\n");
+    sb.append("    orderNo: ").append(toIndentedString(orderNo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/OrderCloseResponseDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 聚合支付关单响应接口
+ */
+public class OrderCloseResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\"> <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">上级商户编号，部分代理/连锁场景使用</div> </div> </div>
+   */
+  @JsonProperty("parentMerchantNo")
+  private String parentMerchantNo = null;
+
+  /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">实际收款商户编号</div> </div>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">商户侧订单号，唯一标识一笔订单</div> </div>
+   */
+  @JsonProperty("mchOrderNo")
+  private String mchOrderNo = null;
+
+  public OrderCloseResponseDTO parentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+    return this;
+  }
+
+   /**
+   * <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\"> <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">上级商户编号，部分代理/连锁场景使用</div> </div> </div>
+   * @return parentMerchantNo
+  **/
+
+  public String getParentMerchantNo() {
+    return parentMerchantNo;
+  }
+
+  public void setParentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+  }
+
+  public OrderCloseResponseDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">实际收款商户编号</div> </div>
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public OrderCloseResponseDTO mchOrderNo(String mchOrderNo) {
+    this.mchOrderNo = mchOrderNo;
+    return this;
+  }
+
+   /**
+   * <div> <div data-zone-id=\"0\" data-line-index=\"0\" data-line=\"true\">商户侧订单号，唯一标识一笔订单</div> </div>
+   * @return mchOrderNo
+  **/
+
+  public String getMchOrderNo() {
+    return mchOrderNo;
+  }
+
+  public void setMchOrderNo(String mchOrderNo) {
+    this.mchOrderNo = mchOrderNo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    OrderCloseResponseDTO orderCloseResponseDTO = (OrderCloseResponseDTO) o;
+    return ObjectUtils.equals(this.parentMerchantNo, orderCloseResponseDTO.parentMerchantNo) &&
+    ObjectUtils.equals(this.merchantNo, orderCloseResponseDTO.merchantNo) &&
+    ObjectUtils.equals(this.mchOrderNo, orderCloseResponseDTO.mchOrderNo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(parentMerchantNo, merchantNo, mchOrderNo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OrderCloseResponseDTO {\n");
+    
+    sb.append("    parentMerchantNo: ").append(toIndentedString(parentMerchantNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    mchOrderNo: ").append(toIndentedString(mchOrderNo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/OrderCodeResponseDTO.java

@@ -0,0 +1,274 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 响应
+ */
+public class OrderCodeResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("parentMerchantNo")
+  private String parentMerchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("orderId")
+  private String orderId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("qrCodeUrl")
+  private String qrCodeUrl = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("uniqueOrderNo")
+  private String uniqueOrderNo = null;
+
+  public OrderCodeResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public OrderCodeResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public OrderCodeResponseDTO parentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+    return this;
+  }
+
+   /**
+   * Get parentMerchantNo
+   * @return parentMerchantNo
+  **/
+
+  public String getParentMerchantNo() {
+    return parentMerchantNo;
+  }
+
+  public void setParentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+  }
+
+  public OrderCodeResponseDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * Get merchantNo
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public OrderCodeResponseDTO orderId(String orderId) {
+    this.orderId = orderId;
+    return this;
+  }
+
+   /**
+   * Get orderId
+   * @return orderId
+  **/
+
+  public String getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(String orderId) {
+    this.orderId = orderId;
+  }
+
+  public OrderCodeResponseDTO qrCodeUrl(String qrCodeUrl) {
+    this.qrCodeUrl = qrCodeUrl;
+    return this;
+  }
+
+   /**
+   * Get qrCodeUrl
+   * @return qrCodeUrl
+  **/
+
+  public String getQrCodeUrl() {
+    return qrCodeUrl;
+  }
+
+  public void setQrCodeUrl(String qrCodeUrl) {
+    this.qrCodeUrl = qrCodeUrl;
+  }
+
+  public OrderCodeResponseDTO uniqueOrderNo(String uniqueOrderNo) {
+    this.uniqueOrderNo = uniqueOrderNo;
+    return this;
+  }
+
+   /**
+   * Get uniqueOrderNo
+   * @return uniqueOrderNo
+  **/
+
+  public String getUniqueOrderNo() {
+    return uniqueOrderNo;
+  }
+
+  public void setUniqueOrderNo(String uniqueOrderNo) {
+    this.uniqueOrderNo = uniqueOrderNo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    OrderCodeResponseDTO orderCodeResponseDTO = (OrderCodeResponseDTO) o;
+    return ObjectUtils.equals(this.code, orderCodeResponseDTO.code) &&
+    ObjectUtils.equals(this.message, orderCodeResponseDTO.message) &&
+    ObjectUtils.equals(this.parentMerchantNo, orderCodeResponseDTO.parentMerchantNo) &&
+    ObjectUtils.equals(this.merchantNo, orderCodeResponseDTO.merchantNo) &&
+    ObjectUtils.equals(this.orderId, orderCodeResponseDTO.orderId) &&
+    ObjectUtils.equals(this.qrCodeUrl, orderCodeResponseDTO.qrCodeUrl) &&
+    ObjectUtils.equals(this.uniqueOrderNo, orderCodeResponseDTO.uniqueOrderNo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, parentMerchantNo, merchantNo, orderId, qrCodeUrl, uniqueOrderNo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OrderCodeResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    parentMerchantNo: ").append(toIndentedString(parentMerchantNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
+    sb.append("    qrCodeUrl: ").append(toIndentedString(qrCodeUrl)).append("\n");
+    sb.append("    uniqueOrderNo: ").append(toIndentedString(uniqueOrderNo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/OrderQueryRequestDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 聚合支付结果查询请求参数
+ */
+public class OrderQueryRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>商户下单时传入的商户系统内部订单号</p>
+   */
+  @JsonProperty("mchOrderNo")
+  private String mchOrderNo = null;
+
+  /**
+   * <p>收款商户编号</p>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <p>订单时间<br /><span class=\"text-only\" data-eleid=\"77382517\">查询3个月以上的订单信息，订单时间必填<br /></span>格式：yyyy-MM-dd HH:mm:ss</p>
+   */
+  @JsonProperty("orderTime")
+  private String orderTime = null;
+
+  public OrderQueryRequestDTO mchOrderNo(String mchOrderNo) {
+    this.mchOrderNo = mchOrderNo;
+    return this;
+  }
+
+   /**
+   * <p>商户下单时传入的商户系统内部订单号</p>
+   * @return mchOrderNo
+  **/
+
+  public String getMchOrderNo() {
+    return mchOrderNo;
+  }
+
+  public void setMchOrderNo(String mchOrderNo) {
+    this.mchOrderNo = mchOrderNo;
+  }
+
+  public OrderQueryRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * <p>收款商户编号</p>
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public OrderQueryRequestDTO orderTime(String orderTime) {
+    this.orderTime = orderTime;
+    return this;
+  }
+
+   /**
+   * <p>订单时间<br /><span class=\"text-only\" data-eleid=\"77382517\">查询3个月以上的订单信息，订单时间必填<br /></span>格式：yyyy-MM-dd HH:mm:ss</p>
+   * @return orderTime
+  **/
+
+  public String getOrderTime() {
+    return orderTime;
+  }
+
+  public void setOrderTime(String orderTime) {
+    this.orderTime = orderTime;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    OrderQueryRequestDTO orderQueryRequestDTO = (OrderQueryRequestDTO) o;
+    return ObjectUtils.equals(this.mchOrderNo, orderQueryRequestDTO.mchOrderNo) &&
+    ObjectUtils.equals(this.merchantNo, orderQueryRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.orderTime, orderQueryRequestDTO.orderTime);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(mchOrderNo, merchantNo, orderTime);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OrderQueryRequestDTO {\n");
+    
+    sb.append("    mchOrderNo: ").append(toIndentedString(mchOrderNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    orderTime: ").append(toIndentedString(orderTime)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/OrderResponseDTO.java

@@ -0,0 +1,248 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请求成功返回00000
+ */
+public class OrderResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("orderId")
+  private String orderId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("uniqueOrderNo")
+  private String uniqueOrderNo = null;
+
+  /**
+   * <p>支付机构在微信侧的外部商户订单号，用于服务商用于点金计划商户小票功能</p>
+   */
+  @JsonProperty("bankOrderId")
+  private String bankOrderId = null;
+
+  /**
+   * <p>预支付标识信息 <a href=\"https://open.yeepay.com/docs/v2/products/ptssfk/others/5feb010d6d313b001b79abf8/index.html\">prePayTn使用方式</a></p>
+   */
+  @JsonProperty("prePayTn")
+  private String prePayTn = null;
+
+  public OrderResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public OrderResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public OrderResponseDTO orderId(String orderId) {
+    this.orderId = orderId;
+    return this;
+  }
+
+   /**
+   * Get orderId
+   * @return orderId
+  **/
+
+  public String getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(String orderId) {
+    this.orderId = orderId;
+  }
+
+  public OrderResponseDTO uniqueOrderNo(String uniqueOrderNo) {
+    this.uniqueOrderNo = uniqueOrderNo;
+    return this;
+  }
+
+   /**
+   * Get uniqueOrderNo
+   * @return uniqueOrderNo
+  **/
+
+  public String getUniqueOrderNo() {
+    return uniqueOrderNo;
+  }
+
+  public void setUniqueOrderNo(String uniqueOrderNo) {
+    this.uniqueOrderNo = uniqueOrderNo;
+  }
+
+  public OrderResponseDTO bankOrderId(String bankOrderId) {
+    this.bankOrderId = bankOrderId;
+    return this;
+  }
+
+   /**
+   * <p>支付机构在微信侧的外部商户订单号，用于服务商用于点金计划商户小票功能</p>
+   * @return bankOrderId
+  **/
+
+  public String getBankOrderId() {
+    return bankOrderId;
+  }
+
+  public void setBankOrderId(String bankOrderId) {
+    this.bankOrderId = bankOrderId;
+  }
+
+  public OrderResponseDTO prePayTn(String prePayTn) {
+    this.prePayTn = prePayTn;
+    return this;
+  }
+
+   /**
+   * <p>预支付标识信息 <a href=\"https://open.yeepay.com/docs/v2/products/ptssfk/others/5feb010d6d313b001b79abf8/index.html\">prePayTn使用方式</a></p>
+   * @return prePayTn
+  **/
+
+  public String getPrePayTn() {
+    return prePayTn;
+  }
+
+  public void setPrePayTn(String prePayTn) {
+    this.prePayTn = prePayTn;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    OrderResponseDTO orderResponseDTO = (OrderResponseDTO) o;
+    return ObjectUtils.equals(this.code, orderResponseDTO.code) &&
+    ObjectUtils.equals(this.message, orderResponseDTO.message) &&
+    ObjectUtils.equals(this.orderId, orderResponseDTO.orderId) &&
+    ObjectUtils.equals(this.uniqueOrderNo, orderResponseDTO.uniqueOrderNo) &&
+    ObjectUtils.equals(this.bankOrderId, orderResponseDTO.bankOrderId) &&
+    ObjectUtils.equals(this.prePayTn, orderResponseDTO.prePayTn);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, orderId, uniqueOrderNo, bankOrderId, prePayTn);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OrderResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
+    sb.append("    uniqueOrderNo: ").append(toIndentedString(uniqueOrderNo)).append("\n");
+    sb.append("    bankOrderId: ").append(toIndentedString(bankOrderId)).append("\n");
+    sb.append("    prePayTn: ").append(toIndentedString(prePayTn)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/PassiveGetAuthInfoResponseDTO.java

@@ -0,0 +1,352 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 响应结果
+ */
+public class PassiveGetAuthInfoResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 返回码
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 返回信息
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 发起方商编
+   */
+  @JsonProperty("parentMerchantNo")
+  private String parentMerchantNo = null;
+
+  /**
+   * 收单商编
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * SDK调用凭证。用于调用SDK的人脸识别接口。
+   */
+  @JsonProperty("authInfo")
+  private String authInfo = null;
+
+  /**
+   * authinfo的有效时间, 单位秒。 例如: 3600 在有效时间内, 对于同一台终端设备，相同的参数的前提下(如：相同的公众号、商户号、 门店编号等），可以用同一个authinfo，多次调用SDK的getWxpayfaceCode接口。
+   */
+  @JsonProperty("expireTime")
+  private Integer expireTime = null;
+
+  /**
+   * 调用SDK的getWxpayfaceCode接口时作为mch_id传入
+   */
+  @JsonProperty("yeepayMchId")
+  private String yeepayMchId = null;
+
+  /**
+   * 调用SDK的getWxpayfaceCode接口时作为appid传入
+   */
+  @JsonProperty("yeepayAppId")
+  private String yeepayAppId = null;
+
+  /**
+   * 商户绑定的公众号/小程序的appId，调用SDK的getWxpayfaceCode接口时可作为sub_appid传入
+   */
+  @JsonProperty("appId")
+  private String appId = null;
+
+  /**
+   * 子商户号，调用SDK的getWxpayfaceCode接口时可作为sub_mch_id传入
+   */
+  @JsonProperty("reportMerchantNo")
+  private String reportMerchantNo = null;
+
+  public PassiveGetAuthInfoResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * 返回码
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public PassiveGetAuthInfoResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * 返回信息
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public PassiveGetAuthInfoResponseDTO parentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+    return this;
+  }
+
+   /**
+   * 发起方商编
+   * @return parentMerchantNo
+  **/
+
+  public String getParentMerchantNo() {
+    return parentMerchantNo;
+  }
+
+  public void setParentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+  }
+
+  public PassiveGetAuthInfoResponseDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * 收单商编
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public PassiveGetAuthInfoResponseDTO authInfo(String authInfo) {
+    this.authInfo = authInfo;
+    return this;
+  }
+
+   /**
+   * SDK调用凭证。用于调用SDK的人脸识别接口。
+   * @return authInfo
+  **/
+
+  public String getAuthInfo() {
+    return authInfo;
+  }
+
+  public void setAuthInfo(String authInfo) {
+    this.authInfo = authInfo;
+  }
+
+  public PassiveGetAuthInfoResponseDTO expireTime(Integer expireTime) {
+    this.expireTime = expireTime;
+    return this;
+  }
+
+   /**
+   * authinfo的有效时间, 单位秒。 例如: 3600 在有效时间内, 对于同一台终端设备，相同的参数的前提下(如：相同的公众号、商户号、 门店编号等），可以用同一个authinfo，多次调用SDK的getWxpayfaceCode接口。
+   * @return expireTime
+  **/
+
+  public Integer getExpireTime() {
+    return expireTime;
+  }
+
+  public void setExpireTime(Integer expireTime) {
+    this.expireTime = expireTime;
+  }
+
+  public PassiveGetAuthInfoResponseDTO yeepayMchId(String yeepayMchId) {
+    this.yeepayMchId = yeepayMchId;
+    return this;
+  }
+
+   /**
+   * 调用SDK的getWxpayfaceCode接口时作为mch_id传入
+   * @return yeepayMchId
+  **/
+
+  public String getYeepayMchId() {
+    return yeepayMchId;
+  }
+
+  public void setYeepayMchId(String yeepayMchId) {
+    this.yeepayMchId = yeepayMchId;
+  }
+
+  public PassiveGetAuthInfoResponseDTO yeepayAppId(String yeepayAppId) {
+    this.yeepayAppId = yeepayAppId;
+    return this;
+  }
+
+   /**
+   * 调用SDK的getWxpayfaceCode接口时作为appid传入
+   * @return yeepayAppId
+  **/
+
+  public String getYeepayAppId() {
+    return yeepayAppId;
+  }
+
+  public void setYeepayAppId(String yeepayAppId) {
+    this.yeepayAppId = yeepayAppId;
+  }
+
+  public PassiveGetAuthInfoResponseDTO appId(String appId) {
+    this.appId = appId;
+    return this;
+  }
+
+   /**
+   * 商户绑定的公众号/小程序的appId，调用SDK的getWxpayfaceCode接口时可作为sub_appid传入
+   * @return appId
+  **/
+
+  public String getAppId() {
+    return appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public PassiveGetAuthInfoResponseDTO reportMerchantNo(String reportMerchantNo) {
+    this.reportMerchantNo = reportMerchantNo;
+    return this;
+  }
+
+   /**
+   * 子商户号，调用SDK的getWxpayfaceCode接口时可作为sub_mch_id传入
+   * @return reportMerchantNo
+  **/
+
+  public String getReportMerchantNo() {
+    return reportMerchantNo;
+  }
+
+  public void setReportMerchantNo(String reportMerchantNo) {
+    this.reportMerchantNo = reportMerchantNo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    PassiveGetAuthInfoResponseDTO passiveGetAuthInfoResponseDTO = (PassiveGetAuthInfoResponseDTO) o;
+    return ObjectUtils.equals(this.code, passiveGetAuthInfoResponseDTO.code) &&
+    ObjectUtils.equals(this.message, passiveGetAuthInfoResponseDTO.message) &&
+    ObjectUtils.equals(this.parentMerchantNo, passiveGetAuthInfoResponseDTO.parentMerchantNo) &&
+    ObjectUtils.equals(this.merchantNo, passiveGetAuthInfoResponseDTO.merchantNo) &&
+    ObjectUtils.equals(this.authInfo, passiveGetAuthInfoResponseDTO.authInfo) &&
+    ObjectUtils.equals(this.expireTime, passiveGetAuthInfoResponseDTO.expireTime) &&
+    ObjectUtils.equals(this.yeepayMchId, passiveGetAuthInfoResponseDTO.yeepayMchId) &&
+    ObjectUtils.equals(this.yeepayAppId, passiveGetAuthInfoResponseDTO.yeepayAppId) &&
+    ObjectUtils.equals(this.appId, passiveGetAuthInfoResponseDTO.appId) &&
+    ObjectUtils.equals(this.reportMerchantNo, passiveGetAuthInfoResponseDTO.reportMerchantNo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, parentMerchantNo, merchantNo, authInfo, expireTime, yeepayMchId, yeepayAppId, appId, reportMerchantNo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class PassiveGetAuthInfoResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    parentMerchantNo: ").append(toIndentedString(parentMerchantNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    authInfo: ").append(toIndentedString(authInfo)).append("\n");
+    sb.append("    expireTime: ").append(toIndentedString(expireTime)).append("\n");
+    sb.append("    yeepayMchId: ").append(toIndentedString(yeepayMchId)).append("\n");
+    sb.append("    yeepayAppId: ").append(toIndentedString(yeepayAppId)).append("\n");
+    sb.append("    appId: ").append(toIndentedString(appId)).append("\n");
+    sb.append("    reportMerchantNo: ").append(toIndentedString(reportMerchantNo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/PassiveGetUserIdResponseDTO.java

@@ -0,0 +1,196 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 响应结果<br>请求成功返回00000
+ */
+public class PassiveGetUserIdResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 返回码
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 返回信息
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 指定公众号的appid
+   */
+  @JsonProperty("appId")
+  private String appId = null;
+
+  /**
+   * 微信被扫场景下，为商户指定公众号下用户的openid
+   */
+  @JsonProperty("userId")
+  private String userId = null;
+
+  public PassiveGetUserIdResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * 返回码
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public PassiveGetUserIdResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * 返回信息
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public PassiveGetUserIdResponseDTO appId(String appId) {
+    this.appId = appId;
+    return this;
+  }
+
+   /**
+   * 指定公众号的appid
+   * @return appId
+  **/
+
+  public String getAppId() {
+    return appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public PassiveGetUserIdResponseDTO userId(String userId) {
+    this.userId = userId;
+    return this;
+  }
+
+   /**
+   * 微信被扫场景下，为商户指定公众号下用户的openid
+   * @return userId
+  **/
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    PassiveGetUserIdResponseDTO passiveGetUserIdResponseDTO = (PassiveGetUserIdResponseDTO) o;
+    return ObjectUtils.equals(this.code, passiveGetUserIdResponseDTO.code) &&
+    ObjectUtils.equals(this.message, passiveGetUserIdResponseDTO.message) &&
+    ObjectUtils.equals(this.appId, passiveGetUserIdResponseDTO.appId) &&
+    ObjectUtils.equals(this.userId, passiveGetUserIdResponseDTO.userId);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, appId, userId);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class PassiveGetUserIdResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    appId: ").append(toIndentedString(appId)).append("\n");
+    sb.append("    userId: ").append(toIndentedString(userId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/PassiveOrderResponseDTO.java

@@ -0,0 +1,876 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+import org.joda.time.DateTime;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请求成功返回00000
+ */
+public class PassiveOrderResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"3\">请求成功：00000 ；请求成功时请关注status（状态）<span class=\"text-only text-with-abbreviation text-with-abbreviation-bottomline\">字段</span></span></div> <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5\"><span class=\"text-only\" data-eleid=\"5\">请求处理中：00105；请调用订单查询接口查询支付结果<br /></span></span> <div data-page-id=\"ZuHGdaChkosIONxuW1wcXRI5nwb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-K6XTdnnZnorn4lxdal6c9phUnYb\">其他为请求失败</div> </div> </div>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("orderId")
+  private String orderId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("uniqueOrderNo")
+  private String uniqueOrderNo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("bankOrderId")
+  private String bankOrderId = null;
+
+  /**
+   * <p>PROCESSING:处理中（内部系统处理超时会出现）<br />WAITPAY:等待用户输入密码<br />SUCCESS:支付成功<br />FAIL:支付失败</p>
+   */
+  @JsonProperty("status")
+  private String status = null;
+
+  /**
+   * <p>MICROPAY：付款码支付<br />FACEPAY：刷脸支付</p>
+   */
+  @JsonProperty("payType")
+  private String payType = null;
+
+  /**
+   * <p>渠道的支付完成时间，同用户的支付账单显示完成时间一致</p>
+   */
+  @JsonProperty("paySuccessTime")
+  private DateTime paySuccessTime = null;
+
+  /**
+   * <p>微信的openId、支付宝的userId</p>
+   */
+  @JsonProperty("userId")
+  private String userId = null;
+
+  /**
+   * <p>CFT：微信零钱/零钱通<br />ALIPAY：支付宝<br />OPEN_UPOP：银联云闪付<br />WECHAT：微信<br />VISA：VISA卡<br />ICBC:银行卡编码（以工行为例）</p>
+   */
+  @JsonProperty("payBank")
+  private String payBank = null;
+
+  /**
+   * <p>该笔订单在微信、支付宝生成的单号(经过银网联处理的微信/支付宝单号)</p>
+   */
+  @JsonProperty("transactionId")
+  private String transactionId = null;
+
+  /**
+   * <p>详见<a href=\"https://open.yeepay.com/docs/products/fwssfk/others/5f59fc1720289f001ba82528/69295bfb19f36d0001080110\">优惠券信息json说明</a></p>
+   */
+  @JsonProperty("channelPromotionInfo")
+  private String channelPromotionInfo = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("realPayAmount")
+  private BigDecimal realPayAmount = null;
+
+  /**
+   * <p>该笔订单在微信、支付宝生成的单号(微信/支付宝的真实单号)</p>
+   */
+  @JsonProperty("channelTrxId")
+  private String channelTrxId = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("channel")
+  private String channel = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("payWay")
+  private String payWay = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("orderAmount")
+  private BigDecimal orderAmount = null;
+
+  /**
+   * <p>DEBIT:借记卡<br />CREDIT:贷记卡</p>
+   */
+  @JsonProperty("cardType")
+  private String cardType = null;
+
+  /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\">代表聚合（ATU）渠道侧商户号</span></div>
+   */
+  @JsonProperty("channelMerchantNo")
+  private String channelMerchantNo = null;
+
+  /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5\">渠道实际结算给易宝的资金，用于核对渠道券</span></div>
+   */
+  @JsonProperty("channelSettleAmount")
+  private BigDecimal channelSettleAmount = null;
+
+  /**
+   * <p>支付宝支付返回buyerLogonId</p>
+   */
+  @JsonProperty("buyerLogonId")
+  private String buyerLogonId = null;
+
+  /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\">此笔交易下用户在机构下的openid</span></div>
+   */
+  @JsonProperty("yeepayOpenId")
+  private String yeepayOpenId = null;
+
+  /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5\">云闪付支付场景下返回的用户支付卡号（前6后4）</span></div>
+   */
+  @JsonProperty("bankCardNo")
+  private String bankCardNo = null;
+
+  /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5-0\">支付宝交易使用的资金渠道，详见<ahref=\"</span><a class=\"link rich-text-anchor __anchor-intercept-flag__\" contenteditable=\"false\" href=\"https://doc.open.alipay.com/doc2/detail?treeId=26&articleId=103259&docType=1\" target=\"_blank\" rel=\"noopener noreferrer\" data-eleid=\"5-1\" data-lark-is-custom=\"false\" data-lark-link=\"true\">https://doc.open.alipay.com/doc2/detail?treeId=26&articleId=103259&docType=1</a><span class=\"text-only\" data-eleid=\"5-2\">\">支付渠道列表</a></span></div>
+   */
+  @JsonProperty("fundChannel")
+  private String fundChannel = null;
+
+  /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5\">支付宝企业码支付相关<span class=\"text-only text-with-abbreviation text-with-abbreviation-bottomline\">字段</span></span></div>
+   */
+  @JsonProperty("enterprisePayInfo")
+  private String enterprisePayInfo = null;
+
+  /**
+   * <p>收方一级基础产品码</p>
+   */
+  @JsonProperty("basicsProductFirst")
+  private String basicsProductFirst = null;
+
+  /**
+   * <p>收方二级基础产品码</p>
+   */
+  @JsonProperty("basicsProductSecond")
+  private String basicsProductSecond = null;
+
+  /**
+   * <p>收方三级基础产品码</p>
+   */
+  @JsonProperty("basicsProductThird")
+  private String basicsProductThird = null;
+
+  /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5\">商户自定义参数，会展示在交易对账单中,支持85个字符（中文或者英文字母）。</span> <span class=\"text-only\" data-eleid=\"7\">商户使用易缴费支付时，多条对账备注，会以'/'的形式进行<span class=\"text-only text-with-abbreviation text-with-abbreviation-bottomline\">拼接</span>显示。</span> <span class=\"text-only\" data-eleid=\"9\">商户使用台牌和<span class=\"text-only text-with-abbreviation text-with-abbreviation-bottomline\">POS</span>支付时，多条对账备注，会以':'的形式进行拼接显示。</span></div>
+   */
+  @JsonProperty("memo")
+  private String memo = null;
+
+  /**
+   * <p>json格式<br />notifyEquipmentNos:播报设备终端号列表<br />请传入云喇叭SN号，多个SN号之间以逗号分隔；需确保云喇叭与收单商编已绑定，则此笔交易成功后，对应云喇叭将进行语音播报</p>
+   */
+  @JsonProperty("terminalInfo")
+  private String terminalInfo = null;
+
+  public PassiveOrderResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"3\">请求成功：00000 ；请求成功时请关注status（状态）<span class=\"text-only text-with-abbreviation text-with-abbreviation-bottomline\">字段</span></span></div> <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5\"><span class=\"text-only\" data-eleid=\"5\">请求处理中：00105；请调用订单查询接口查询支付结果<br /></span></span> <div data-page-id=\"ZuHGdaChkosIONxuW1wcXRI5nwb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-K6XTdnnZnorn4lxdal6c9phUnYb\">其他为请求失败</div> </div> </div>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public PassiveOrderResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public PassiveOrderResponseDTO orderId(String orderId) {
+    this.orderId = orderId;
+    return this;
+  }
+
+   /**
+   * Get orderId
+   * @return orderId
+  **/
+
+  public String getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(String orderId) {
+    this.orderId = orderId;
+  }
+
+  public PassiveOrderResponseDTO uniqueOrderNo(String uniqueOrderNo) {
+    this.uniqueOrderNo = uniqueOrderNo;
+    return this;
+  }
+
+   /**
+   * Get uniqueOrderNo
+   * @return uniqueOrderNo
+  **/
+
+  public String getUniqueOrderNo() {
+    return uniqueOrderNo;
+  }
+
+  public void setUniqueOrderNo(String uniqueOrderNo) {
+    this.uniqueOrderNo = uniqueOrderNo;
+  }
+
+  public PassiveOrderResponseDTO bankOrderId(String bankOrderId) {
+    this.bankOrderId = bankOrderId;
+    return this;
+  }
+
+   /**
+   * Get bankOrderId
+   * @return bankOrderId
+  **/
+
+  public String getBankOrderId() {
+    return bankOrderId;
+  }
+
+  public void setBankOrderId(String bankOrderId) {
+    this.bankOrderId = bankOrderId;
+  }
+
+  public PassiveOrderResponseDTO status(String status) {
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * <p>PROCESSING:处理中（内部系统处理超时会出现）<br />WAITPAY:等待用户输入密码<br />SUCCESS:支付成功<br />FAIL:支付失败</p>
+   * @return status
+  **/
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  public PassiveOrderResponseDTO payType(String payType) {
+    this.payType = payType;
+    return this;
+  }
+
+   /**
+   * <p>MICROPAY：付款码支付<br />FACEPAY：刷脸支付</p>
+   * @return payType
+  **/
+
+  public String getPayType() {
+    return payType;
+  }
+
+  public void setPayType(String payType) {
+    this.payType = payType;
+  }
+
+  public PassiveOrderResponseDTO paySuccessTime(DateTime paySuccessTime) {
+    this.paySuccessTime = paySuccessTime;
+    return this;
+  }
+
+   /**
+   * <p>渠道的支付完成时间，同用户的支付账单显示完成时间一致</p>
+   * @return paySuccessTime
+  **/
+
+  public DateTime getPaySuccessTime() {
+    return paySuccessTime;
+  }
+
+  public void setPaySuccessTime(DateTime paySuccessTime) {
+    this.paySuccessTime = paySuccessTime;
+  }
+
+  public PassiveOrderResponseDTO userId(String userId) {
+    this.userId = userId;
+    return this;
+  }
+
+   /**
+   * <p>微信的openId、支付宝的userId</p>
+   * @return userId
+  **/
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  public PassiveOrderResponseDTO payBank(String payBank) {
+    this.payBank = payBank;
+    return this;
+  }
+
+   /**
+   * <p>CFT：微信零钱/零钱通<br />ALIPAY：支付宝<br />OPEN_UPOP：银联云闪付<br />WECHAT：微信<br />VISA：VISA卡<br />ICBC:银行卡编码（以工行为例）</p>
+   * @return payBank
+  **/
+
+  public String getPayBank() {
+    return payBank;
+  }
+
+  public void setPayBank(String payBank) {
+    this.payBank = payBank;
+  }
+
+  public PassiveOrderResponseDTO transactionId(String transactionId) {
+    this.transactionId = transactionId;
+    return this;
+  }
+
+   /**
+   * <p>该笔订单在微信、支付宝生成的单号(经过银网联处理的微信/支付宝单号)</p>
+   * @return transactionId
+  **/
+
+  public String getTransactionId() {
+    return transactionId;
+  }
+
+  public void setTransactionId(String transactionId) {
+    this.transactionId = transactionId;
+  }
+
+  public PassiveOrderResponseDTO channelPromotionInfo(String channelPromotionInfo) {
+    this.channelPromotionInfo = channelPromotionInfo;
+    return this;
+  }
+
+   /**
+   * <p>详见<a href=\"https://open.yeepay.com/docs/products/fwssfk/others/5f59fc1720289f001ba82528/69295bfb19f36d0001080110\">优惠券信息json说明</a></p>
+   * @return channelPromotionInfo
+  **/
+
+  public String getChannelPromotionInfo() {
+    return channelPromotionInfo;
+  }
+
+  public void setChannelPromotionInfo(String channelPromotionInfo) {
+    this.channelPromotionInfo = channelPromotionInfo;
+  }
+
+  public PassiveOrderResponseDTO realPayAmount(BigDecimal realPayAmount) {
+    this.realPayAmount = realPayAmount;
+    return this;
+  }
+
+   /**
+   * Get realPayAmount
+   * minimum: 0
+   * @return realPayAmount
+  **/
+
+  public BigDecimal getRealPayAmount() {
+    return realPayAmount;
+  }
+
+  public void setRealPayAmount(BigDecimal realPayAmount) {
+    this.realPayAmount = realPayAmount;
+  }
+
+  public PassiveOrderResponseDTO channelTrxId(String channelTrxId) {
+    this.channelTrxId = channelTrxId;
+    return this;
+  }
+
+   /**
+   * <p>该笔订单在微信、支付宝生成的单号(微信/支付宝的真实单号)</p>
+   * @return channelTrxId
+  **/
+
+  public String getChannelTrxId() {
+    return channelTrxId;
+  }
+
+  public void setChannelTrxId(String channelTrxId) {
+    this.channelTrxId = channelTrxId;
+  }
+
+  public PassiveOrderResponseDTO channel(String channel) {
+    this.channel = channel;
+    return this;
+  }
+
+   /**
+   * Get channel
+   * @return channel
+  **/
+
+  public String getChannel() {
+    return channel;
+  }
+
+  public void setChannel(String channel) {
+    this.channel = channel;
+  }
+
+  public PassiveOrderResponseDTO payWay(String payWay) {
+    this.payWay = payWay;
+    return this;
+  }
+
+   /**
+   * Get payWay
+   * @return payWay
+  **/
+
+  public String getPayWay() {
+    return payWay;
+  }
+
+  public void setPayWay(String payWay) {
+    this.payWay = payWay;
+  }
+
+  public PassiveOrderResponseDTO orderAmount(BigDecimal orderAmount) {
+    this.orderAmount = orderAmount;
+    return this;
+  }
+
+   /**
+   * Get orderAmount
+   * minimum: 0
+   * @return orderAmount
+  **/
+
+  public BigDecimal getOrderAmount() {
+    return orderAmount;
+  }
+
+  public void setOrderAmount(BigDecimal orderAmount) {
+    this.orderAmount = orderAmount;
+  }
+
+  public PassiveOrderResponseDTO cardType(String cardType) {
+    this.cardType = cardType;
+    return this;
+  }
+
+   /**
+   * <p>DEBIT:借记卡<br />CREDIT:贷记卡</p>
+   * @return cardType
+  **/
+
+  public String getCardType() {
+    return cardType;
+  }
+
+  public void setCardType(String cardType) {
+    this.cardType = cardType;
+  }
+
+  public PassiveOrderResponseDTO channelMerchantNo(String channelMerchantNo) {
+    this.channelMerchantNo = channelMerchantNo;
+    return this;
+  }
+
+   /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\">代表聚合（ATU）渠道侧商户号</span></div>
+   * @return channelMerchantNo
+  **/
+
+  public String getChannelMerchantNo() {
+    return channelMerchantNo;
+  }
+
+  public void setChannelMerchantNo(String channelMerchantNo) {
+    this.channelMerchantNo = channelMerchantNo;
+  }
+
+  public PassiveOrderResponseDTO channelSettleAmount(BigDecimal channelSettleAmount) {
+    this.channelSettleAmount = channelSettleAmount;
+    return this;
+  }
+
+   /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5\">渠道实际结算给易宝的资金，用于核对渠道券</span></div>
+   * @return channelSettleAmount
+  **/
+
+  public BigDecimal getChannelSettleAmount() {
+    return channelSettleAmount;
+  }
+
+  public void setChannelSettleAmount(BigDecimal channelSettleAmount) {
+    this.channelSettleAmount = channelSettleAmount;
+  }
+
+  public PassiveOrderResponseDTO buyerLogonId(String buyerLogonId) {
+    this.buyerLogonId = buyerLogonId;
+    return this;
+  }
+
+   /**
+   * <p>支付宝支付返回buyerLogonId</p>
+   * @return buyerLogonId
+  **/
+
+  public String getBuyerLogonId() {
+    return buyerLogonId;
+  }
+
+  public void setBuyerLogonId(String buyerLogonId) {
+    this.buyerLogonId = buyerLogonId;
+  }
+
+  public PassiveOrderResponseDTO yeepayOpenId(String yeepayOpenId) {
+    this.yeepayOpenId = yeepayOpenId;
+    return this;
+  }
+
+   /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\">此笔交易下用户在机构下的openid</span></div>
+   * @return yeepayOpenId
+  **/
+
+  public String getYeepayOpenId() {
+    return yeepayOpenId;
+  }
+
+  public void setYeepayOpenId(String yeepayOpenId) {
+    this.yeepayOpenId = yeepayOpenId;
+  }
+
+  public PassiveOrderResponseDTO bankCardNo(String bankCardNo) {
+    this.bankCardNo = bankCardNo;
+    return this;
+  }
+
+   /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5\">云闪付支付场景下返回的用户支付卡号（前6后4）</span></div>
+   * @return bankCardNo
+  **/
+
+  public String getBankCardNo() {
+    return bankCardNo;
+  }
+
+  public void setBankCardNo(String bankCardNo) {
+    this.bankCardNo = bankCardNo;
+  }
+
+  public PassiveOrderResponseDTO fundChannel(String fundChannel) {
+    this.fundChannel = fundChannel;
+    return this;
+  }
+
+   /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5-0\">支付宝交易使用的资金渠道，详见<ahref=\"</span><a class=\"link rich-text-anchor __anchor-intercept-flag__\" contenteditable=\"false\" href=\"https://doc.open.alipay.com/doc2/detail?treeId=26&articleId=103259&docType=1\" target=\"_blank\" rel=\"noopener noreferrer\" data-eleid=\"5-1\" data-lark-is-custom=\"false\" data-lark-link=\"true\">https://doc.open.alipay.com/doc2/detail?treeId=26&articleId=103259&docType=1</a><span class=\"text-only\" data-eleid=\"5-2\">\">支付渠道列表</a></span></div>
+   * @return fundChannel
+  **/
+
+  public String getFundChannel() {
+    return fundChannel;
+  }
+
+  public void setFundChannel(String fundChannel) {
+    this.fundChannel = fundChannel;
+  }
+
+  public PassiveOrderResponseDTO enterprisePayInfo(String enterprisePayInfo) {
+    this.enterprisePayInfo = enterprisePayInfo;
+    return this;
+  }
+
+   /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5\">支付宝企业码支付相关<span class=\"text-only text-with-abbreviation text-with-abbreviation-bottomline\">字段</span></span></div>
+   * @return enterprisePayInfo
+  **/
+
+  public String getEnterprisePayInfo() {
+    return enterprisePayInfo;
+  }
+
+  public void setEnterprisePayInfo(String enterprisePayInfo) {
+    this.enterprisePayInfo = enterprisePayInfo;
+  }
+
+  public PassiveOrderResponseDTO basicsProductFirst(String basicsProductFirst) {
+    this.basicsProductFirst = basicsProductFirst;
+    return this;
+  }
+
+   /**
+   * <p>收方一级基础产品码</p>
+   * @return basicsProductFirst
+  **/
+
+  public String getBasicsProductFirst() {
+    return basicsProductFirst;
+  }
+
+  public void setBasicsProductFirst(String basicsProductFirst) {
+    this.basicsProductFirst = basicsProductFirst;
+  }
+
+  public PassiveOrderResponseDTO basicsProductSecond(String basicsProductSecond) {
+    this.basicsProductSecond = basicsProductSecond;
+    return this;
+  }
+
+   /**
+   * <p>收方二级基础产品码</p>
+   * @return basicsProductSecond
+  **/
+
+  public String getBasicsProductSecond() {
+    return basicsProductSecond;
+  }
+
+  public void setBasicsProductSecond(String basicsProductSecond) {
+    this.basicsProductSecond = basicsProductSecond;
+  }
+
+  public PassiveOrderResponseDTO basicsProductThird(String basicsProductThird) {
+    this.basicsProductThird = basicsProductThird;
+    return this;
+  }
+
+   /**
+   * <p>收方三级基础产品码</p>
+   * @return basicsProductThird
+  **/
+
+  public String getBasicsProductThird() {
+    return basicsProductThird;
+  }
+
+  public void setBasicsProductThird(String basicsProductThird) {
+    this.basicsProductThird = basicsProductThird;
+  }
+
+  public PassiveOrderResponseDTO memo(String memo) {
+    this.memo = memo;
+    return this;
+  }
+
+   /**
+   * <div data-lark-html-role=\"root\"><span class=\"text-only\" data-eleid=\"5\">商户自定义参数，会展示在交易对账单中,支持85个字符（中文或者英文字母）。</span> <span class=\"text-only\" data-eleid=\"7\">商户使用易缴费支付时，多条对账备注，会以'/'的形式进行<span class=\"text-only text-with-abbreviation text-with-abbreviation-bottomline\">拼接</span>显示。</span> <span class=\"text-only\" data-eleid=\"9\">商户使用台牌和<span class=\"text-only text-with-abbreviation text-with-abbreviation-bottomline\">POS</span>支付时，多条对账备注，会以':'的形式进行拼接显示。</span></div>
+   * @return memo
+  **/
+
+  public String getMemo() {
+    return memo;
+  }
+
+  public void setMemo(String memo) {
+    this.memo = memo;
+  }
+
+  public PassiveOrderResponseDTO terminalInfo(String terminalInfo) {
+    this.terminalInfo = terminalInfo;
+    return this;
+  }
+
+   /**
+   * <p>json格式<br />notifyEquipmentNos:播报设备终端号列表<br />请传入云喇叭SN号，多个SN号之间以逗号分隔；需确保云喇叭与收单商编已绑定，则此笔交易成功后，对应云喇叭将进行语音播报</p>
+   * @return terminalInfo
+  **/
+
+  public String getTerminalInfo() {
+    return terminalInfo;
+  }
+
+  public void setTerminalInfo(String terminalInfo) {
+    this.terminalInfo = terminalInfo;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    PassiveOrderResponseDTO passiveOrderResponseDTO = (PassiveOrderResponseDTO) o;
+    return ObjectUtils.equals(this.code, passiveOrderResponseDTO.code) &&
+    ObjectUtils.equals(this.message, passiveOrderResponseDTO.message) &&
+    ObjectUtils.equals(this.orderId, passiveOrderResponseDTO.orderId) &&
+    ObjectUtils.equals(this.uniqueOrderNo, passiveOrderResponseDTO.uniqueOrderNo) &&
+    ObjectUtils.equals(this.bankOrderId, passiveOrderResponseDTO.bankOrderId) &&
+    ObjectUtils.equals(this.status, passiveOrderResponseDTO.status) &&
+    ObjectUtils.equals(this.payType, passiveOrderResponseDTO.payType) &&
+    ObjectUtils.equals(this.paySuccessTime, passiveOrderResponseDTO.paySuccessTime) &&
+    ObjectUtils.equals(this.userId, passiveOrderResponseDTO.userId) &&
+    ObjectUtils.equals(this.payBank, passiveOrderResponseDTO.payBank) &&
+    ObjectUtils.equals(this.transactionId, passiveOrderResponseDTO.transactionId) &&
+    ObjectUtils.equals(this.channelPromotionInfo, passiveOrderResponseDTO.channelPromotionInfo) &&
+    ObjectUtils.equals(this.realPayAmount, passiveOrderResponseDTO.realPayAmount) &&
+    ObjectUtils.equals(this.channelTrxId, passiveOrderResponseDTO.channelTrxId) &&
+    ObjectUtils.equals(this.channel, passiveOrderResponseDTO.channel) &&
+    ObjectUtils.equals(this.payWay, passiveOrderResponseDTO.payWay) &&
+    ObjectUtils.equals(this.orderAmount, passiveOrderResponseDTO.orderAmount) &&
+    ObjectUtils.equals(this.cardType, passiveOrderResponseDTO.cardType) &&
+    ObjectUtils.equals(this.channelMerchantNo, passiveOrderResponseDTO.channelMerchantNo) &&
+    ObjectUtils.equals(this.channelSettleAmount, passiveOrderResponseDTO.channelSettleAmount) &&
+    ObjectUtils.equals(this.buyerLogonId, passiveOrderResponseDTO.buyerLogonId) &&
+    ObjectUtils.equals(this.yeepayOpenId, passiveOrderResponseDTO.yeepayOpenId) &&
+    ObjectUtils.equals(this.bankCardNo, passiveOrderResponseDTO.bankCardNo) &&
+    ObjectUtils.equals(this.fundChannel, passiveOrderResponseDTO.fundChannel) &&
+    ObjectUtils.equals(this.enterprisePayInfo, passiveOrderResponseDTO.enterprisePayInfo) &&
+    ObjectUtils.equals(this.basicsProductFirst, passiveOrderResponseDTO.basicsProductFirst) &&
+    ObjectUtils.equals(this.basicsProductSecond, passiveOrderResponseDTO.basicsProductSecond) &&
+    ObjectUtils.equals(this.basicsProductThird, passiveOrderResponseDTO.basicsProductThird) &&
+    ObjectUtils.equals(this.memo, passiveOrderResponseDTO.memo) &&
+    ObjectUtils.equals(this.terminalInfo, passiveOrderResponseDTO.terminalInfo);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, orderId, uniqueOrderNo, bankOrderId, status, payType, paySuccessTime, userId, payBank, transactionId, channelPromotionInfo, realPayAmount, channelTrxId, channel, payWay, orderAmount, cardType, channelMerchantNo, channelSettleAmount, buyerLogonId, yeepayOpenId, bankCardNo, fundChannel, enterprisePayInfo, basicsProductFirst, basicsProductSecond, basicsProductThird, memo, terminalInfo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class PassiveOrderResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
+    sb.append("    uniqueOrderNo: ").append(toIndentedString(uniqueOrderNo)).append("\n");
+    sb.append("    bankOrderId: ").append(toIndentedString(bankOrderId)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    payType: ").append(toIndentedString(payType)).append("\n");
+    sb.append("    paySuccessTime: ").append(toIndentedString(paySuccessTime)).append("\n");
+    sb.append("    userId: ").append(toIndentedString(userId)).append("\n");
+    sb.append("    payBank: ").append(toIndentedString(payBank)).append("\n");
+    sb.append("    transactionId: ").append(toIndentedString(transactionId)).append("\n");
+    sb.append("    channelPromotionInfo: ").append(toIndentedString(channelPromotionInfo)).append("\n");
+    sb.append("    realPayAmount: ").append(toIndentedString(realPayAmount)).append("\n");
+    sb.append("    channelTrxId: ").append(toIndentedString(channelTrxId)).append("\n");
+    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
+    sb.append("    payWay: ").append(toIndentedString(payWay)).append("\n");
+    sb.append("    orderAmount: ").append(toIndentedString(orderAmount)).append("\n");
+    sb.append("    cardType: ").append(toIndentedString(cardType)).append("\n");
+    sb.append("    channelMerchantNo: ").append(toIndentedString(channelMerchantNo)).append("\n");
+    sb.append("    channelSettleAmount: ").append(toIndentedString(channelSettleAmount)).append("\n");
+    sb.append("    buyerLogonId: ").append(toIndentedString(buyerLogonId)).append("\n");
+    sb.append("    yeepayOpenId: ").append(toIndentedString(yeepayOpenId)).append("\n");
+    sb.append("    bankCardNo: ").append(toIndentedString(bankCardNo)).append("\n");
+    sb.append("    fundChannel: ").append(toIndentedString(fundChannel)).append("\n");
+    sb.append("    enterprisePayInfo: ").append(toIndentedString(enterprisePayInfo)).append("\n");
+    sb.append("    basicsProductFirst: ").append(toIndentedString(basicsProductFirst)).append("\n");
+    sb.append("    basicsProductSecond: ").append(toIndentedString(basicsProductSecond)).append("\n");
+    sb.append("    basicsProductThird: ").append(toIndentedString(basicsProductThird)).append("\n");
+    sb.append("    memo: ").append(toIndentedString(memo)).append("\n");
+    sb.append("    terminalInfo: ").append(toIndentedString(terminalInfo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/PaymentResult.java

@@ -0,0 +1,1076 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fs.ybPay.request.serializer.YopCustomSerializer;
+import org.apache.commons.lang3.ObjectUtils;
+import org.joda.time.DateTime;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 聚合支付查询响应/通知参数
+ */
+public class PaymentResult implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-O80PdbU6roIrWHxAHWkcSpDwnBJ\">收单商户编号</div> </div>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Fb9kda6djon1XzxmiPwcKhdQn2r\">发起交易的商户编号</div> </div>
+   */
+  @JsonProperty("yopMerchantNo")
+  private String yopMerchantNo = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Y4icdyTNwoaXkjxjRHGcPFMCn9b\">易宝生成的订单号</div> </div>
+   */
+  @JsonProperty("orderNo")
+  private String orderNo = null;
+
+  /**
+   * <p>商户系统订单号</p>
+   */
+  @JsonProperty("mchOrderNo")
+  private String mchOrderNo = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-YmCAd6f0doYfysxn3nFc9v4cn3f\">金额，最多 10 位整数、2 位小数( <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-W0D8dEPu2oVMT7xoXg1cTEvHny9\">单位：元)</div> </div> </div> </div>
+   */
+  @JsonProperty("payAmount")
+  private String payAmount = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ESH2d09ZMoWejpxXjK6cCswwnNh\"> <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-VsPBdwzc2oseruxxdVRcfDG9nfe\">易宝营销平台优惠金额，单位：元</div> <div class=\"ace-line ace-line old-record-id-VsPBdwzc2oseruxxdVRcfDG9nfe\">金额，最多 10 位整数、2 位小数</div> </div> </div> </div>
+   */
+  @JsonProperty("promotionAmount")
+  private String promotionAmount = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Q8lQd9aryoXiZVx2uOAcRtUnn7f\">用户实际支付金额，单位：元, <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ByO6dbpsvo35ABx0zIUccRw6n7f\">金额，最多 10 位整数、2 位小数</div> </div> </div> </div>
+   */
+  @JsonProperty("paidAmount")
+  private String paidAmount = null;
+
+  /**
+   * <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-PMT3dXWnfowOQVxRFKtcrEW6n5g\">渠道应结算金额,单位：元， <div data-page-id=\"My2RdKoBjofMOaxZmHqcZqAanyf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-NIqhdAPszoJI9ZxYYwKcSklQnVb\">金额，最多 10 位整数、2 位小数</div> </div> </div> </div>
+   */
+  @JsonProperty("settlementAmount")
+  private String settlementAmount = null;
+
+  /**
+   *  可选项如下: PREPAID_REAL:预付实扣 REAL_TIME:实收 UN_REAL_TIME:后收 
+   */
+  public enum FeeTypeEnum {
+    PREPAID_REAL("PREPAID_REAL"),
+    
+    REAL_TIME("REAL_TIME"),
+    
+    UN_REAL_TIME("UN_REAL_TIME");
+
+    private String value;
+
+    FeeTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static FeeTypeEnum fromValue(String text) {
+      for (FeeTypeEnum b : FeeTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: PREPAID_REAL:预付实扣 REAL_TIME:实收 UN_REAL_TIME:后收 
+   */
+  @JsonProperty("feeType")
+  private FeeTypeEnum feeType = null;
+
+  /**
+   * <div data-page-id=\"RHsgd90gyoat7Jxy0kdcvmE4nPd\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-DPgSdbpnWoiNI6xvTvzcLyKhn7e\">商户承担的手续费金额,单位：元，<br />金额，最多 10 位整数、2 位小数(</div> <div class=\"ace-line ace-line old-record-id-XoN1dipKjoNDkaxPa1ncneDDn5c\">单位：元)</div> </div>
+   */
+  @JsonProperty("merchantFee")
+  private String merchantFee = null;
+
+  /**
+   * <p>手续费承担商编</p>
+   */
+  @JsonProperty("feeMerchantNo")
+  private String feeMerchantNo = null;
+
+  /**
+   * <p>手续费出资详情列表</p>
+   */
+  @JsonProperty("feeContributeInfo")
+  private List<FeeContributeInfo> feeContributeInfo = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;RHsgd90gyoat7Jxy0kdcvmE4nPd\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-MDWkdB4v1oE2gsxNEZIcyqYknNb\&quot;&gt;支付状态为成功时有值&lt;/div&gt; &lt;/div&gt; 可选项如下: SUCCESS:成功 PROCESSING:处理中 
+   */
+  public enum CsStatusEnum {
+    SUCCESS("SUCCESS"),
+    
+    PROCESSING("PROCESSING");
+
+    private String value;
+
+    CsStatusEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static CsStatusEnum fromValue(String text) {
+      for (CsStatusEnum b : CsStatusEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;RHsgd90gyoat7Jxy0kdcvmE4nPd\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-MDWkdB4v1oE2gsxNEZIcyqYknNb\&quot;&gt;支付状态为成功时有值&lt;/div&gt; &lt;/div&gt; 可选项如下: SUCCESS:成功 PROCESSING:处理中 
+   */
+  @JsonProperty("csStatus")
+  private CsStatusEnum csStatus = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;RHsgd90gyoat7Jxy0kdcvmE4nPd\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-WWBLdSIwAoHQxPx4Bubc9RMOnfd\&quot;&gt;支付状态为成功时有值&lt;/div&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-JN4FdeB3Wod8IrxejtocUgLKnxh\&quot;&gt;格式: yyyy-MM-dd HH:mm:ss&lt;/div&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-Dnsbdkh8Qo6x6Axup5HcVzNInxd\&quot;&gt;示例值：2026-01-23 11:41:59&lt;/div&gt; &lt;/div&gt;
+   */
+  @JsonProperty("csSuccessDate")
+  private DateTime csSuccessDate = null;
+
+  /**
+   *  可选项如下: WECHAT_JSAPI:微信JSAPI WECHAT_APP:微信APP WECHAT_MWEB:微信H5 WECHAT_APPLET:微信小程序 WECHAT_QR_CODE:微信付款码 ALIPAY_LIFE:支付宝生活号 ALIPAY_APPLET:支付宝小程序 ALIPAY_QR_CODE:支付宝付款码 ALIPAY_MWEB:支付宝H5 ALIPAY_NATIVE:支付宝主扫 ALIPAY_APP:支付宝APP UNION_JS:银联JS UNION_APP:银联APP UNION_MWEB:银联H5 UNION_NATIVE:银联主扫 UNION_QR_CODE:银联付款码 UNION_WECHAT_APPLET:银联微信小程序 DC_NATIVE:数字货币主扫 DC_QR_CODE:数字货币付款码 DC_APP:数字货币APP 
+   */
+  public enum PayTypeEnum {
+    WECHAT_JSAPI("WECHAT_JSAPI"),
+    
+    WECHAT_APP("WECHAT_APP"),
+    
+    WECHAT_MWEB("WECHAT_MWEB"),
+    
+    WECHAT_APPLET("WECHAT_APPLET"),
+    
+    WECHAT_QR_CODE("WECHAT_QR_CODE"),
+    
+    ALIPAY_LIFE("ALIPAY_LIFE"),
+    
+    ALIPAY_APPLET("ALIPAY_APPLET"),
+    
+    ALIPAY_QR_CODE("ALIPAY_QR_CODE"),
+    
+    ALIPAY_MWEB("ALIPAY_MWEB"),
+    
+    ALIPAY_NATIVE("ALIPAY_NATIVE"),
+    
+    ALIPAY_APP("ALIPAY_APP"),
+    
+    UNION_JS("UNION_JS"),
+    
+    UNION_APP("UNION_APP"),
+    
+    UNION_MWEB("UNION_MWEB"),
+    
+    UNION_NATIVE("UNION_NATIVE"),
+    
+    UNION_QR_CODE("UNION_QR_CODE"),
+    
+    UNION_WECHAT_APPLET("UNION_WECHAT_APPLET"),
+    
+    DC_NATIVE("DC_NATIVE"),
+    
+    DC_QR_CODE("DC_QR_CODE"),
+    
+    DC_APP("DC_APP");
+
+    private String value;
+
+    PayTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PayTypeEnum fromValue(String text) {
+      for (PayTypeEnum b : PayTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: WECHAT_JSAPI:微信JSAPI WECHAT_APP:微信APP WECHAT_MWEB:微信H5 WECHAT_APPLET:微信小程序 WECHAT_QR_CODE:微信付款码 ALIPAY_LIFE:支付宝生活号 ALIPAY_APPLET:支付宝小程序 ALIPAY_QR_CODE:支付宝付款码 ALIPAY_MWEB:支付宝H5 ALIPAY_NATIVE:支付宝主扫 ALIPAY_APP:支付宝APP UNION_JS:银联JS UNION_APP:银联APP UNION_MWEB:银联H5 UNION_NATIVE:银联主扫 UNION_QR_CODE:银联付款码 UNION_WECHAT_APPLET:银联微信小程序 DC_NATIVE:数字货币主扫 DC_QR_CODE:数字货币付款码 DC_APP:数字货币APP 
+   */
+  @JsonProperty("payType")
+  private PayTypeEnum payType = null;
+
+  /**
+   *  可选项如下: INIT:初始化 PROCESSING:处理中 SUCCESS:支付成功 FAILED:支付失败 CLOSED:支付取消 
+   */
+  public enum PayStatusEnum {
+    INIT("INIT"),
+    
+    PROCESSING("PROCESSING"),
+    
+    SUCCESS("SUCCESS"),
+    
+    FAILED("FAILED"),
+    
+    CLOSED("CLOSED");
+
+    private String value;
+
+    PayStatusEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PayStatusEnum fromValue(String text) {
+      for (PayStatusEnum b : PayStatusEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: INIT:初始化 PROCESSING:处理中 SUCCESS:支付成功 FAILED:支付失败 CLOSED:支付取消 
+   */
+  @JsonProperty("payStatus")
+  private PayStatusEnum payStatus = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-EIoHdVDLXoRnNdxi5BocvKqdnWb\&quot;&gt;格式: yyyy-MM-dd HH:mm:ss&lt;/div&gt; &lt;/div&gt;
+   */
+  @JsonProperty("orderTime")
+  private String orderTime = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-NWyFdFTQGoThewxy75LcjnbUneP\&quot;&gt; &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-K5XZdEfXJoHH3pxIoA4caswCnrd\&quot;&gt;格式: yyyy-MM-dd HH:mm:ss&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; &lt;/div&gt;
+   */
+  @JsonProperty("finishTime")
+  private String finishTime = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-MVuGd0ldaoR0gyxsDxXcFfF2nem\&quot;&gt;格式: yyyy-MM-dd HH:mm:ss&lt;/div&gt; &lt;/div&gt;
+   */
+  @JsonProperty("expireTime")
+  private String expireTime = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-QAridahYMozTzTxdIO2chuSmnc9\&quot;&gt;第三方支付渠道返回的订单号（微信或支付宝）&lt;/div&gt; &lt;/div&gt;
+   */
+  @JsonProperty("channelOrderNo")
+  private String channelOrderNo = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-QPakdXzhDoTMO2xec7pc25rZnSc\&quot;&gt;请求银联网联订单号&lt;/div&gt; &lt;/div&gt;
+   */
+  @JsonProperty("requestGatewayOrderNo")
+  private String requestGatewayOrderNo = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-UGRndYe88oruRsxk6e1cGqMBnxy\&quot;&gt;第三方支付渠道返回的错误码&lt;/div&gt; &lt;/div&gt;
+   */
+  @JsonProperty("channelFailCode")
+  private String channelFailCode = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-QAridahYMozTzTxdIO2chuSmnc9\&quot;&gt;渠道返回失败原因&lt;/div&gt; &lt;/div&gt;
+   */
+  @JsonProperty("channelFailMessage")
+  private String channelFailMessage = null;
+
+  /**
+   *  可选项如下: DEBIT:借记卡 CREDIT:贷记卡 
+   */
+  public enum CardTypeEnum {
+    DEBIT("DEBIT"),
+    
+    CREDIT("CREDIT");
+
+    private String value;
+
+    CardTypeEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static CardTypeEnum fromValue(String text) {
+      for (CardTypeEnum b : CardTypeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   *  可选项如下: DEBIT:借记卡 CREDIT:贷记卡 
+   */
+  @JsonProperty("cardType")
+  private CardTypeEnum cardType = null;
+
+  /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-Kzz7dth62o9m56x5zhvcGoLYnUg\&quot;&gt;标识资金是否被冻结&lt;/div&gt; &lt;/div&gt;
+   */
+  @JsonProperty("fundFreeze")
+  private Boolean fundFreeze = null;
+
+  /**
+   * &lt;p&gt;用户传的附加信息&lt;/p&gt;
+   */
+  @JsonProperty("remark")
+  private String remark = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("aliPayResponse")
+  private AliPayResponse aliPayResponse = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("wechatResponse")
+  private WechatResponse wechatResponse = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("unionPayResponse")
+  private UnionPayResponse unionPayResponse = null;
+
+  public PaymentResult merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-O80PdbU6roIrWHxAHWkcSpDwnBJ\&quot;&gt;收单商户编号&lt;/div&gt; &lt;/div&gt;
+   * @return merchantNo
+  **/
+
+  @JsonSerialize(using = YopCustomSerializer.class)
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public PaymentResult yopMerchantNo(String yopMerchantNo) {
+    this.yopMerchantNo = yopMerchantNo;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-Fb9kda6djon1XzxmiPwcKhdQn2r\&quot;&gt;发起交易的商户编号&lt;/div&gt; &lt;/div&gt;
+   * @return yopMerchantNo
+  **/
+
+  public String getYopMerchantNo() {
+    return yopMerchantNo;
+  }
+
+  public void setYopMerchantNo(String yopMerchantNo) {
+    this.yopMerchantNo = yopMerchantNo;
+  }
+
+  public PaymentResult orderNo(String orderNo) {
+    this.orderNo = orderNo;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-Y4icdyTNwoaXkjxjRHGcPFMCn9b\&quot;&gt;易宝生成的订单号&lt;/div&gt; &lt;/div&gt;
+   * @return orderNo
+  **/
+
+  public String getOrderNo() {
+    return orderNo;
+  }
+
+  public void setOrderNo(String orderNo) {
+    this.orderNo = orderNo;
+  }
+
+  public PaymentResult mchOrderNo(String mchOrderNo) {
+    this.mchOrderNo = mchOrderNo;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;商户系统订单号&lt;/p&gt;
+   * @return mchOrderNo
+  **/
+
+  public String getMchOrderNo() {
+    return mchOrderNo;
+  }
+
+  public void setMchOrderNo(String mchOrderNo) {
+    this.mchOrderNo = mchOrderNo;
+  }
+
+  public PaymentResult payAmount(String payAmount) {
+    this.payAmount = payAmount;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-YmCAd6f0doYfysxn3nFc9v4cn3f\&quot;&gt;金额，最多 10 位整数、2 位小数( &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-W0D8dEPu2oVMT7xoXg1cTEvHny9\&quot;&gt;单位：元)&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; &lt;/div&gt;
+   * @return payAmount
+  **/
+
+  public String getPayAmount() {
+    return payAmount;
+  }
+
+  public void setPayAmount(String payAmount) {
+    this.payAmount = payAmount;
+  }
+
+  public PaymentResult promotionAmount(String promotionAmount) {
+    this.promotionAmount = promotionAmount;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-ESH2d09ZMoWejpxXjK6cCswwnNh\&quot;&gt; &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-VsPBdwzc2oseruxxdVRcfDG9nfe\&quot;&gt;易宝营销平台优惠金额，单位：元&lt;/div&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-VsPBdwzc2oseruxxdVRcfDG9nfe\&quot;&gt;金额，最多 10 位整数、2 位小数&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; &lt;/div&gt;
+   * @return promotionAmount
+  **/
+
+  public String getPromotionAmount() {
+    return promotionAmount;
+  }
+
+  public void setPromotionAmount(String promotionAmount) {
+    this.promotionAmount = promotionAmount;
+  }
+
+  public PaymentResult paidAmount(String paidAmount) {
+    this.paidAmount = paidAmount;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-Q8lQd9aryoXiZVx2uOAcRtUnn7f\&quot;&gt;用户实际支付金额，单位：元, &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-ByO6dbpsvo35ABx0zIUccRw6n7f\&quot;&gt;金额，最多 10 位整数、2 位小数&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; &lt;/div&gt;
+   * @return paidAmount
+  **/
+
+  public String getPaidAmount() {
+    return paidAmount;
+  }
+
+  public void setPaidAmount(String paidAmount) {
+    this.paidAmount = paidAmount;
+  }
+
+  public PaymentResult settlementAmount(String settlementAmount) {
+    this.settlementAmount = settlementAmount;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-PMT3dXWnfowOQVxRFKtcrEW6n5g\&quot;&gt;渠道应结算金额,单位：元， &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-NIqhdAPszoJI9ZxYYwKcSklQnVb\&quot;&gt;金额，最多 10 位整数、2 位小数&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; &lt;/div&gt;
+   * @return settlementAmount
+  **/
+
+  public String getSettlementAmount() {
+    return settlementAmount;
+  }
+
+  public void setSettlementAmount(String settlementAmount) {
+    this.settlementAmount = settlementAmount;
+  }
+
+  public PaymentResult feeType(FeeTypeEnum feeType) {
+    this.feeType = feeType;
+    return this;
+  }
+
+   /**
+   *  可选项如下: PREPAID_REAL:预付实扣 REAL_TIME:实收 UN_REAL_TIME:后收 
+   * @return feeType
+  **/
+
+  public FeeTypeEnum getFeeType() {
+    return feeType;
+  }
+
+  public void setFeeType(FeeTypeEnum feeType) {
+    this.feeType = feeType;
+  }
+
+  public PaymentResult merchantFee(String merchantFee) {
+    this.merchantFee = merchantFee;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;RHsgd90gyoat7Jxy0kdcvmE4nPd\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-DPgSdbpnWoiNI6xvTvzcLyKhn7e\&quot;&gt;商户承担的手续费金额,单位：元，&lt;br /&gt;金额，最多 10 位整数、2 位小数(&lt;/div&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-XoN1dipKjoNDkaxPa1ncneDDn5c\&quot;&gt;单位：元)&lt;/div&gt; &lt;/div&gt;
+   * @return merchantFee
+  **/
+
+  public String getMerchantFee() {
+    return merchantFee;
+  }
+
+  public void setMerchantFee(String merchantFee) {
+    this.merchantFee = merchantFee;
+  }
+
+  public PaymentResult feeMerchantNo(String feeMerchantNo) {
+    this.feeMerchantNo = feeMerchantNo;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;手续费承担商编&lt;/p&gt;
+   * @return feeMerchantNo
+  **/
+
+  public String getFeeMerchantNo() {
+    return feeMerchantNo;
+  }
+
+  public void setFeeMerchantNo(String feeMerchantNo) {
+    this.feeMerchantNo = feeMerchantNo;
+  }
+
+  public PaymentResult feeContributeInfo(List<FeeContributeInfo> feeContributeInfo) {
+    this.feeContributeInfo = feeContributeInfo;
+    return this;
+  }
+
+  public PaymentResult addFeeContributeInfoItem(FeeContributeInfo feeContributeInfoItem) {
+    if (this.feeContributeInfo == null) {
+      this.feeContributeInfo = new ArrayList<>();
+    }
+    this.feeContributeInfo.add(feeContributeInfoItem);
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;手续费出资详情列表&lt;/p&gt;
+   * @return feeContributeInfo
+  **/
+
+  public List<FeeContributeInfo> getFeeContributeInfo() {
+    return feeContributeInfo;
+  }
+
+  public void setFeeContributeInfo(List<FeeContributeInfo> feeContributeInfo) {
+    this.feeContributeInfo = feeContributeInfo;
+  }
+
+  public PaymentResult csStatus(CsStatusEnum csStatus) {
+    this.csStatus = csStatus;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;RHsgd90gyoat7Jxy0kdcvmE4nPd\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-MDWkdB4v1oE2gsxNEZIcyqYknNb\&quot;&gt;支付状态为成功时有值&lt;/div&gt; &lt;/div&gt; 可选项如下: SUCCESS:成功 PROCESSING:处理中 
+   * @return csStatus
+  **/
+
+  public CsStatusEnum getCsStatus() {
+    return csStatus;
+  }
+
+  public void setCsStatus(CsStatusEnum csStatus) {
+    this.csStatus = csStatus;
+  }
+
+  public PaymentResult csSuccessDate(DateTime csSuccessDate) {
+    this.csSuccessDate = csSuccessDate;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;RHsgd90gyoat7Jxy0kdcvmE4nPd\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-WWBLdSIwAoHQxPx4Bubc9RMOnfd\&quot;&gt;支付状态为成功时有值&lt;/div&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-JN4FdeB3Wod8IrxejtocUgLKnxh\&quot;&gt;格式: yyyy-MM-dd HH:mm:ss&lt;/div&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-Dnsbdkh8Qo6x6Axup5HcVzNInxd\&quot;&gt;示例值：2026-01-23 11:41:59&lt;/div&gt; &lt;/div&gt;
+   * @return csSuccessDate
+  **/
+
+  public DateTime getCsSuccessDate() {
+    return csSuccessDate;
+  }
+
+  public void setCsSuccessDate(DateTime csSuccessDate) {
+    this.csSuccessDate = csSuccessDate;
+  }
+
+  public PaymentResult payType(PayTypeEnum payType) {
+    this.payType = payType;
+    return this;
+  }
+
+   /**
+   *  可选项如下: WECHAT_JSAPI:微信JSAPI WECHAT_APP:微信APP WECHAT_MWEB:微信H5 WECHAT_APPLET:微信小程序 WECHAT_QR_CODE:微信付款码 ALIPAY_LIFE:支付宝生活号 ALIPAY_APPLET:支付宝小程序 ALIPAY_QR_CODE:支付宝付款码 ALIPAY_MWEB:支付宝H5 ALIPAY_NATIVE:支付宝主扫 ALIPAY_APP:支付宝APP UNION_JS:银联JS UNION_APP:银联APP UNION_MWEB:银联H5 UNION_NATIVE:银联主扫 UNION_QR_CODE:银联付款码 UNION_WECHAT_APPLET:银联微信小程序 DC_NATIVE:数字货币主扫 DC_QR_CODE:数字货币付款码 DC_APP:数字货币APP 
+   * @return payType
+  **/
+
+  public PayTypeEnum getPayType() {
+    return payType;
+  }
+
+  public void setPayType(PayTypeEnum payType) {
+    this.payType = payType;
+  }
+
+  public PaymentResult payStatus(PayStatusEnum payStatus) {
+    this.payStatus = payStatus;
+    return this;
+  }
+
+   /**
+   *  可选项如下: INIT:初始化 PROCESSING:处理中 SUCCESS:支付成功 FAILED:支付失败 CLOSED:支付取消 
+   * @return payStatus
+  **/
+
+  public PayStatusEnum getPayStatus() {
+    return payStatus;
+  }
+
+  public void setPayStatus(PayStatusEnum payStatus) {
+    this.payStatus = payStatus;
+  }
+
+  public PaymentResult orderTime(String orderTime) {
+    this.orderTime = orderTime;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-EIoHdVDLXoRnNdxi5BocvKqdnWb\&quot;&gt;格式: yyyy-MM-dd HH:mm:ss&lt;/div&gt; &lt;/div&gt;
+   * @return orderTime
+  **/
+
+  public String getOrderTime() {
+    return orderTime;
+  }
+
+  public void setOrderTime(String orderTime) {
+    this.orderTime = orderTime;
+  }
+
+  public PaymentResult finishTime(String finishTime) {
+    this.finishTime = finishTime;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-NWyFdFTQGoThewxy75LcjnbUneP\&quot;&gt; &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-K5XZdEfXJoHH3pxIoA4caswCnrd\&quot;&gt;格式: yyyy-MM-dd HH:mm:ss&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; &lt;/div&gt;
+   * @return finishTime
+  **/
+
+  public String getFinishTime() {
+    return finishTime;
+  }
+
+  public void setFinishTime(String finishTime) {
+    this.finishTime = finishTime;
+  }
+
+  public PaymentResult expireTime(String expireTime) {
+    this.expireTime = expireTime;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-MVuGd0ldaoR0gyxsDxXcFfF2nem\&quot;&gt;格式: yyyy-MM-dd HH:mm:ss&lt;/div&gt; &lt;/div&gt;
+   * @return expireTime
+  **/
+
+  public String getExpireTime() {
+    return expireTime;
+  }
+
+  public void setExpireTime(String expireTime) {
+    this.expireTime = expireTime;
+  }
+
+  public PaymentResult channelOrderNo(String channelOrderNo) {
+    this.channelOrderNo = channelOrderNo;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-QAridahYMozTzTxdIO2chuSmnc9\&quot;&gt;第三方支付渠道返回的订单号（微信或支付宝）&lt;/div&gt; &lt;/div&gt;
+   * @return channelOrderNo
+  **/
+
+  public String getChannelOrderNo() {
+    return channelOrderNo;
+  }
+
+  public void setChannelOrderNo(String channelOrderNo) {
+    this.channelOrderNo = channelOrderNo;
+  }
+
+  public PaymentResult requestGatewayOrderNo(String requestGatewayOrderNo) {
+    this.requestGatewayOrderNo = requestGatewayOrderNo;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-QPakdXzhDoTMO2xec7pc25rZnSc\&quot;&gt;请求银联网联订单号&lt;/div&gt; &lt;/div&gt;
+   * @return requestGatewayOrderNo
+  **/
+
+  public String getRequestGatewayOrderNo() {
+    return requestGatewayOrderNo;
+  }
+
+  public void setRequestGatewayOrderNo(String requestGatewayOrderNo) {
+    this.requestGatewayOrderNo = requestGatewayOrderNo;
+  }
+
+  public PaymentResult channelFailCode(String channelFailCode) {
+    this.channelFailCode = channelFailCode;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-UGRndYe88oruRsxk6e1cGqMBnxy\&quot;&gt;第三方支付渠道返回的错误码&lt;/div&gt; &lt;/div&gt;
+   * @return channelFailCode
+  **/
+
+  public String getChannelFailCode() {
+    return channelFailCode;
+  }
+
+  public void setChannelFailCode(String channelFailCode) {
+    this.channelFailCode = channelFailCode;
+  }
+
+  public PaymentResult channelFailMessage(String channelFailMessage) {
+    this.channelFailMessage = channelFailMessage;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-QAridahYMozTzTxdIO2chuSmnc9\&quot;&gt;渠道返回失败原因&lt;/div&gt; &lt;/div&gt;
+   * @return channelFailMessage
+  **/
+
+  public String getChannelFailMessage() {
+    return channelFailMessage;
+  }
+
+  public void setChannelFailMessage(String channelFailMessage) {
+    this.channelFailMessage = channelFailMessage;
+  }
+
+  public PaymentResult cardType(CardTypeEnum cardType) {
+    this.cardType = cardType;
+    return this;
+  }
+
+   /**
+   *  可选项如下: DEBIT:借记卡 CREDIT:贷记卡 
+   * @return cardType
+  **/
+
+  public CardTypeEnum getCardType() {
+    return cardType;
+  }
+
+  public void setCardType(CardTypeEnum cardType) {
+    this.cardType = cardType;
+  }
+
+  public PaymentResult fundFreeze(Boolean fundFreeze) {
+    this.fundFreeze = fundFreeze;
+    return this;
+  }
+
+   /**
+   * &lt;div data-page-id&#x3D;\&quot;My2RdKoBjofMOaxZmHqcZqAanyf\&quot; data-lark-html-role&#x3D;\&quot;root\&quot; data-docx-has-block-data&#x3D;\&quot;false\&quot;&gt; &lt;div class&#x3D;\&quot;ace-line ace-line old-record-id-Kzz7dth62o9m56x5zhvcGoLYnUg\&quot;&gt;标识资金是否被冻结&lt;/div&gt; &lt;/div&gt;
+   * @return fundFreeze
+  **/
+
+  public Boolean isFundFreeze() {
+    return fundFreeze;
+  }
+
+  public void setFundFreeze(Boolean fundFreeze) {
+    this.fundFreeze = fundFreeze;
+  }
+
+  public PaymentResult remark(String remark) {
+    this.remark = remark;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;用户传的附加信息&lt;/p&gt;
+   * @return remark
+  **/
+
+  public String getRemark() {
+    return remark;
+  }
+
+  public void setRemark(String remark) {
+    this.remark = remark;
+  }
+
+  public PaymentResult aliPayResponse(AliPayResponse aliPayResponse) {
+    this.aliPayResponse = aliPayResponse;
+    return this;
+  }
+
+   /**
+   * Get aliPayResponse
+   * @return aliPayResponse
+  **/
+
+  public AliPayResponse getAliPayResponse() {
+    return aliPayResponse;
+  }
+
+  public void setAliPayResponse(AliPayResponse aliPayResponse) {
+    this.aliPayResponse = aliPayResponse;
+  }
+
+  public PaymentResult wechatResponse(WechatResponse wechatResponse) {
+    this.wechatResponse = wechatResponse;
+    return this;
+  }
+
+   /**
+   * Get wechatResponse
+   * @return wechatResponse
+  **/
+
+  public WechatResponse getWechatResponse() {
+    return wechatResponse;
+  }
+
+  public void setWechatResponse(WechatResponse wechatResponse) {
+    this.wechatResponse = wechatResponse;
+  }
+
+  public PaymentResult unionPayResponse(UnionPayResponse unionPayResponse) {
+    this.unionPayResponse = unionPayResponse;
+    return this;
+  }
+
+   /**
+   * Get unionPayResponse
+   * @return unionPayResponse
+  **/
+
+  public UnionPayResponse getUnionPayResponse() {
+    return unionPayResponse;
+  }
+
+  public void setUnionPayResponse(UnionPayResponse unionPayResponse) {
+    this.unionPayResponse = unionPayResponse;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    PaymentResult paymentResult = (PaymentResult) o;
+    return ObjectUtils.equals(this.merchantNo, paymentResult.merchantNo) &&
+    ObjectUtils.equals(this.yopMerchantNo, paymentResult.yopMerchantNo) &&
+    ObjectUtils.equals(this.orderNo, paymentResult.orderNo) &&
+    ObjectUtils.equals(this.mchOrderNo, paymentResult.mchOrderNo) &&
+    ObjectUtils.equals(this.payAmount, paymentResult.payAmount) &&
+    ObjectUtils.equals(this.promotionAmount, paymentResult.promotionAmount) &&
+    ObjectUtils.equals(this.paidAmount, paymentResult.paidAmount) &&
+    ObjectUtils.equals(this.settlementAmount, paymentResult.settlementAmount) &&
+    ObjectUtils.equals(this.feeType, paymentResult.feeType) &&
+    ObjectUtils.equals(this.merchantFee, paymentResult.merchantFee) &&
+    ObjectUtils.equals(this.feeMerchantNo, paymentResult.feeMerchantNo) &&
+    ObjectUtils.equals(this.feeContributeInfo, paymentResult.feeContributeInfo) &&
+    ObjectUtils.equals(this.csStatus, paymentResult.csStatus) &&
+    ObjectUtils.equals(this.csSuccessDate, paymentResult.csSuccessDate) &&
+    ObjectUtils.equals(this.payType, paymentResult.payType) &&
+    ObjectUtils.equals(this.payStatus, paymentResult.payStatus) &&
+    ObjectUtils.equals(this.orderTime, paymentResult.orderTime) &&
+    ObjectUtils.equals(this.finishTime, paymentResult.finishTime) &&
+    ObjectUtils.equals(this.expireTime, paymentResult.expireTime) &&
+    ObjectUtils.equals(this.channelOrderNo, paymentResult.channelOrderNo) &&
+    ObjectUtils.equals(this.requestGatewayOrderNo, paymentResult.requestGatewayOrderNo) &&
+    ObjectUtils.equals(this.channelFailCode, paymentResult.channelFailCode) &&
+    ObjectUtils.equals(this.channelFailMessage, paymentResult.channelFailMessage) &&
+    ObjectUtils.equals(this.cardType, paymentResult.cardType) &&
+    ObjectUtils.equals(this.fundFreeze, paymentResult.fundFreeze) &&
+    ObjectUtils.equals(this.remark, paymentResult.remark) &&
+    ObjectUtils.equals(this.aliPayResponse, paymentResult.aliPayResponse) &&
+    ObjectUtils.equals(this.wechatResponse, paymentResult.wechatResponse) &&
+    ObjectUtils.equals(this.unionPayResponse, paymentResult.unionPayResponse);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(merchantNo, yopMerchantNo, orderNo, mchOrderNo, payAmount, promotionAmount, paidAmount, settlementAmount, feeType, merchantFee, feeMerchantNo, feeContributeInfo, csStatus, csSuccessDate, payType, payStatus, orderTime, finishTime, expireTime, channelOrderNo, requestGatewayOrderNo, channelFailCode, channelFailMessage, cardType, fundFreeze, remark, aliPayResponse, wechatResponse, unionPayResponse);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class PaymentResult {\n");
+    
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    yopMerchantNo: ").append(toIndentedString(yopMerchantNo)).append("\n");
+    sb.append("    orderNo: ").append(toIndentedString(orderNo)).append("\n");
+    sb.append("    mchOrderNo: ").append(toIndentedString(mchOrderNo)).append("\n");
+    sb.append("    payAmount: ").append(toIndentedString(payAmount)).append("\n");
+    sb.append("    promotionAmount: ").append(toIndentedString(promotionAmount)).append("\n");
+    sb.append("    paidAmount: ").append(toIndentedString(paidAmount)).append("\n");
+    sb.append("    settlementAmount: ").append(toIndentedString(settlementAmount)).append("\n");
+    sb.append("    feeType: ").append(toIndentedString(feeType)).append("\n");
+    sb.append("    merchantFee: ").append(toIndentedString(merchantFee)).append("\n");
+    sb.append("    feeMerchantNo: ").append(toIndentedString(feeMerchantNo)).append("\n");
+    sb.append("    feeContributeInfo: ").append(toIndentedString(feeContributeInfo)).append("\n");
+    sb.append("    csStatus: ").append(toIndentedString(csStatus)).append("\n");
+    sb.append("    csSuccessDate: ").append(toIndentedString(csSuccessDate)).append("\n");
+    sb.append("    payType: ").append(toIndentedString(payType)).append("\n");
+    sb.append("    payStatus: ").append(toIndentedString(payStatus)).append("\n");
+    sb.append("    orderTime: ").append(toIndentedString(orderTime)).append("\n");
+    sb.append("    finishTime: ").append(toIndentedString(finishTime)).append("\n");
+    sb.append("    expireTime: ").append(toIndentedString(expireTime)).append("\n");
+    sb.append("    channelOrderNo: ").append(toIndentedString(channelOrderNo)).append("\n");
+    sb.append("    requestGatewayOrderNo: ").append(toIndentedString(requestGatewayOrderNo)).append("\n");
+    sb.append("    channelFailCode: ").append(toIndentedString(channelFailCode)).append("\n");
+    sb.append("    channelFailMessage: ").append(toIndentedString(channelFailMessage)).append("\n");
+    sb.append("    cardType: ").append(toIndentedString(cardType)).append("\n");
+    sb.append("    fundFreeze: ").append(toIndentedString(fundFreeze)).append("\n");
+    sb.append("    remark: ").append(toIndentedString(remark)).append("\n");
+    sb.append("    aliPayResponse: ").append(toIndentedString(aliPayResponse)).append("\n");
+    sb.append("    wechatResponse: ").append(toIndentedString(wechatResponse)).append("\n");
+    sb.append("    unionPayResponse: ").append(toIndentedString(unionPayResponse)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/ProductCouponDTO.java

@@ -0,0 +1,118 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 易宝营销产品信息
+ */
+public class ProductCouponDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>单品券ID</p>
+   */
+  @JsonProperty("id")
+  private String id = null;
+
+  public ProductCouponDTO id(String id) {
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * <p>单品券ID</p>
+   * @return id
+  **/
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    ProductCouponDTO productCouponDTO = (ProductCouponDTO) o;
+    return ObjectUtils.equals(this.id, productCouponDTO.id);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(id);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ProductCouponDTO {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/QueryApplyChannelNoRequestDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class QueryApplyChannelNoRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>申请渠道号的商编</p>
+   */
+  @JsonProperty("applyMerchantNo")
+  private String applyMerchantNo = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-U1O1dPJjCooyQQxb25scRSq9n1n\">场景</div> <div class=\"ace-line ace-line old-record-id-Z8yDdEUoloRmXWxWoVYcsSO3nHb\">枚举值：</div> <div class=\"ace-line ace-line old-record-id-Z2EgdqdEOo0PxyxXxyecJCOQnEg\">ONLINE:线上</div> <div class=\"ace-line ace-line old-record-id-U2GvdvL7Eo84dSxOoQVczEZonTc\">OFFLINE:线下</div> <div class=\"ace-line ace-line old-record-id-FRM1dZShzoCmSwxLO8Ac4m7Vnbd\">BAOXIAN:保险</div> <div class=\"ace-line ace-line old-record-id-YX28daGFIoTxLwxjP2zcCRTnn5f\">GONGYI:公益</div> <div class=\"ace-line ace-line old-record-id-Iv3hdk6e1o0QISxIUn3c6zlonwd\">DC_SEPARATION:借贷分离</div> <div class=\"ace-line ace-line old-record-id-FpsjdlOXdoqqcgxoajBcvZL2neN\">DIGITAL:数娱</div> <div class=\"ace-line ace-line old-record-id-JeuVdnznSoXhr9x95becuToKnwb\">REGISTRATION:报名(需要先优惠费率报名成功)</div> <div class=\"ace-line ace-line old-record-id-QZW2d7R43oreeHxAZvtcWCvRnxb\">PRIVATE_EDUCATION:民办教育</div> </div>
+   */
+  @JsonProperty("scene")
+  private String scene = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-GOrzd24T5oQSiGxWwXYcjtWPnyg\">活动类型</div> <div class=\"ace-line ace-line old-record-id-W1hidTGtYovZJfxRCIDcuqFDnig\">当场景为报名时，需要指定</div> <div class=\"ace-line ace-line old-record-id-YKR7dzlzaokVExx0AYYcKBOWnBg\">枚举值：</div> <div class=\"ace-line ace-line old-record-id-Tw64dzmMLo3wAqxi4ZhcDJYfnBf\">EDUCATION:教培机构</div> <div class=\"ace-line ace-line old-record-id-NO7sdvkmWoLkaYxsfyLc5qZEnsb\">HEALTHCARE:商业医疗</div> <div class=\"ace-line ace-line old-record-id-GYXidMhiLoXceYxCCs4cTZ6in7d\">PARKING:停车缴费</div> </div>
+   */
+  @JsonProperty("promotionType")
+  private String promotionType = null;
+
+  public QueryApplyChannelNoRequestDTO applyMerchantNo(String applyMerchantNo) {
+    this.applyMerchantNo = applyMerchantNo;
+    return this;
+  }
+
+   /**
+   * <p>申请渠道号的商编</p>
+   * @return applyMerchantNo
+  **/
+
+  public String getApplyMerchantNo() {
+    return applyMerchantNo;
+  }
+
+  public void setApplyMerchantNo(String applyMerchantNo) {
+    this.applyMerchantNo = applyMerchantNo;
+  }
+
+  public QueryApplyChannelNoRequestDTO scene(String scene) {
+    this.scene = scene;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-U1O1dPJjCooyQQxb25scRSq9n1n\">场景</div> <div class=\"ace-line ace-line old-record-id-Z8yDdEUoloRmXWxWoVYcsSO3nHb\">枚举值：</div> <div class=\"ace-line ace-line old-record-id-Z2EgdqdEOo0PxyxXxyecJCOQnEg\">ONLINE:线上</div> <div class=\"ace-line ace-line old-record-id-U2GvdvL7Eo84dSxOoQVczEZonTc\">OFFLINE:线下</div> <div class=\"ace-line ace-line old-record-id-FRM1dZShzoCmSwxLO8Ac4m7Vnbd\">BAOXIAN:保险</div> <div class=\"ace-line ace-line old-record-id-YX28daGFIoTxLwxjP2zcCRTnn5f\">GONGYI:公益</div> <div class=\"ace-line ace-line old-record-id-Iv3hdk6e1o0QISxIUn3c6zlonwd\">DC_SEPARATION:借贷分离</div> <div class=\"ace-line ace-line old-record-id-FpsjdlOXdoqqcgxoajBcvZL2neN\">DIGITAL:数娱</div> <div class=\"ace-line ace-line old-record-id-JeuVdnznSoXhr9x95becuToKnwb\">REGISTRATION:报名(需要先优惠费率报名成功)</div> <div class=\"ace-line ace-line old-record-id-QZW2d7R43oreeHxAZvtcWCvRnxb\">PRIVATE_EDUCATION:民办教育</div> </div>
+   * @return scene
+  **/
+
+  public String getScene() {
+    return scene;
+  }
+
+  public void setScene(String scene) {
+    this.scene = scene;
+  }
+
+  public QueryApplyChannelNoRequestDTO promotionType(String promotionType) {
+    this.promotionType = promotionType;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-GOrzd24T5oQSiGxWwXYcjtWPnyg\">活动类型</div> <div class=\"ace-line ace-line old-record-id-W1hidTGtYovZJfxRCIDcuqFDnig\">当场景为报名时，需要指定</div> <div class=\"ace-line ace-line old-record-id-YKR7dzlzaokVExx0AYYcKBOWnBg\">枚举值：</div> <div class=\"ace-line ace-line old-record-id-Tw64dzmMLo3wAqxi4ZhcDJYfnBf\">EDUCATION:教培机构</div> <div class=\"ace-line ace-line old-record-id-NO7sdvkmWoLkaYxsfyLc5qZEnsb\">HEALTHCARE:商业医疗</div> <div class=\"ace-line ace-line old-record-id-GYXidMhiLoXceYxCCs4cTZ6in7d\">PARKING:停车缴费</div> </div>
+   * @return promotionType
+  **/
+
+  public String getPromotionType() {
+    return promotionType;
+  }
+
+  public void setPromotionType(String promotionType) {
+    this.promotionType = promotionType;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    QueryApplyChannelNoRequestDTO queryApplyChannelNoRequestDTO = (QueryApplyChannelNoRequestDTO) o;
+    return ObjectUtils.equals(this.applyMerchantNo, queryApplyChannelNoRequestDTO.applyMerchantNo) &&
+    ObjectUtils.equals(this.scene, queryApplyChannelNoRequestDTO.scene) &&
+    ObjectUtils.equals(this.promotionType, queryApplyChannelNoRequestDTO.promotionType);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(applyMerchantNo, scene, promotionType);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class QueryApplyChannelNoRequestDTO {\n");
+    
+    sb.append("    applyMerchantNo: ").append(toIndentedString(applyMerchantNo)).append("\n");
+    sb.append("    scene: ").append(toIndentedString(scene)).append("\n");
+    sb.append("    promotionType: ").append(toIndentedString(promotionType)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/QueryApplyChannelNoResponseDTO.java

@@ -0,0 +1,222 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class QueryApplyChannelNoResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-T9lNduUKEov0oxxFFa9cOX8mnpc\">申请结果描述</div> <div class=\"ace-line ace-line old-record-id-T9lNduUKEov0oxxFFa9cOX8mnpc\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-K1zDdDKnNorYQBxZNUocY2efnBh\">失败时原因参考</div> </div> </div> </div>
+   */
+  @JsonProperty("applyResultDes")
+  private String applyResultDes = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ZXtcdIGUIocBZFxPSAPccfgmnyc\">渠道号</div> </div>
+   */
+  @JsonProperty("channelNo")
+  private String channelNo = null;
+
+  /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-FOKNdYeU4oH701xjB4KckxdZngg\">申请结果</div> <div class=\"ace-line ace-line old-record-id-FOKNdYeU4oH701xjB4KckxdZngg\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XibEd0uxxoFDAQxrMyNcShcnnZf\">SUBMITTING：申请中</div> <div class=\"ace-line ace-line old-record-id-GlRfdSQK9oxRUExw34Rcwq3pnRc\">SUCCESS：申请成功</div> <div class=\"ace-line ace-line old-record-id-Rg3Vd1OjSoj327xGuPscATHFnrf\">FAIL：申请失败</div> </div> </div> </div>
+   */
+  @JsonProperty("applyResult")
+  private String applyResult = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  public QueryApplyChannelNoResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <p>返回码</p>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public QueryApplyChannelNoResponseDTO applyResultDes(String applyResultDes) {
+    this.applyResultDes = applyResultDes;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-T9lNduUKEov0oxxFFa9cOX8mnpc\">申请结果描述</div> <div class=\"ace-line ace-line old-record-id-T9lNduUKEov0oxxFFa9cOX8mnpc\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-K1zDdDKnNorYQBxZNUocY2efnBh\">失败时原因参考</div> </div> </div> </div>
+   * @return applyResultDes
+  **/
+
+  public String getApplyResultDes() {
+    return applyResultDes;
+  }
+
+  public void setApplyResultDes(String applyResultDes) {
+    this.applyResultDes = applyResultDes;
+  }
+
+  public QueryApplyChannelNoResponseDTO channelNo(String channelNo) {
+    this.channelNo = channelNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ZXtcdIGUIocBZFxPSAPccfgmnyc\">渠道号</div> </div>
+   * @return channelNo
+  **/
+
+  public String getChannelNo() {
+    return channelNo;
+  }
+
+  public void setChannelNo(String channelNo) {
+    this.channelNo = channelNo;
+  }
+
+  public QueryApplyChannelNoResponseDTO applyResult(String applyResult) {
+    this.applyResult = applyResult;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-FOKNdYeU4oH701xjB4KckxdZngg\">申请结果</div> <div class=\"ace-line ace-line old-record-id-FOKNdYeU4oH701xjB4KckxdZngg\"> <div data-page-id=\"WrCsdj6eTop5k2xir63cPNtsngg\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-XibEd0uxxoFDAQxrMyNcShcnnZf\">SUBMITTING：申请中</div> <div class=\"ace-line ace-line old-record-id-GlRfdSQK9oxRUExw34Rcwq3pnRc\">SUCCESS：申请成功</div> <div class=\"ace-line ace-line old-record-id-Rg3Vd1OjSoj327xGuPscATHFnrf\">FAIL：申请失败</div> </div> </div> </div>
+   * @return applyResult
+  **/
+
+  public String getApplyResult() {
+    return applyResult;
+  }
+
+  public void setApplyResult(String applyResult) {
+    this.applyResult = applyResult;
+  }
+
+  public QueryApplyChannelNoResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * <p>返回信息</p>
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    QueryApplyChannelNoResponseDTO queryApplyChannelNoResponseDTO = (QueryApplyChannelNoResponseDTO) o;
+    return ObjectUtils.equals(this.code, queryApplyChannelNoResponseDTO.code) &&
+    ObjectUtils.equals(this.applyResultDes, queryApplyChannelNoResponseDTO.applyResultDes) &&
+    ObjectUtils.equals(this.channelNo, queryApplyChannelNoResponseDTO.channelNo) &&
+    ObjectUtils.equals(this.applyResult, queryApplyChannelNoResponseDTO.applyResult) &&
+    ObjectUtils.equals(this.message, queryApplyChannelNoResponseDTO.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, applyResultDes, channelNo, applyResult, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class QueryApplyChannelNoResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    applyResultDes: ").append(toIndentedString(applyResultDes)).append("\n");
+    sb.append("    channelNo: ").append(toIndentedString(channelNo)).append("\n");
+    sb.append("    applyResult: ").append(toIndentedString(applyResult)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/QueryMerReportAttachRequestDTO.java

@@ -0,0 +1,222 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请修改我
+ */
+public class QueryMerReportAttachRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div data-page-id=\"EtIgdgOCmof7O6xs1iSczLYunfb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-AdVndIugkoOa1nxf11Wc7xdbnIf\">发起方商户编号。</div> <div class=\"ace-line ace-line old-record-id-O09TdwxuSoKqF8xazM7cAPRAnAb\">*标准商户收付款方案中此参数与收款商户编号一致；</div> <div class=\"ace-line ace-line old-record-id-HBqodh2FtoKtKcxaNmrcyLRtnCh\">*平台商户收付款方案中此参数为平台商商户编号；</div> <div class=\"ace-line ace-line old-record-id-VwuEdREjGoVgwyxm4AJcpkMpnP7\">*服务商解决方案中，①标准商户申请活动时，该参数为标准商户商编 ②平台商收款或平台商入驻商户申请活动时，该参数为平台商商编。</div> </div>
+   */
+  @JsonProperty("parentMerchantNo")
+  private String parentMerchantNo = null;
+
+  /**
+   * <div data-page-id=\"EtIgdgOCmof7O6xs1iSczLYunfb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-M7n6dJNWpoB0LuxGJu1c419CnXc\">商户编号</div> <div class=\"ace-line ace-line old-record-id-X7mEd6tKdouFtoxAoi8cSopFnuo\">收单主体商编，平台商或服务商下的子商户，普通特约商户</div> </div>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <div data-page-id=\"EtIgdgOCmof7O6xs1iSczLYunfb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-OMx4dHv3ConPxmxPHtScBtuLnFD\">渠道号</div> </div>
+   */
+  @JsonProperty("channelNo")
+  private String channelNo = null;
+
+  /**
+   * <div data-page-id=\"EtIgdgOCmof7O6xs1iSczLYunfb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Fbxfd4F6PoLu9oxu7OicS28anye\">渠道类型</div> <div class=\"ace-line ace-line old-record-id-BF0MdnaNOooeyzxMcJ9coM62nGe\">枚举值：</div> <div class=\"ace-line ace-line old-record-id-MM2NdgeAzoqhxrxrG9zcwCKxn6b\">WECHAT:微信</div> <div class=\"ace-line ace-line old-record-id-EuL0du49ronTR0xUBU1c1uE0n8g\"> </div> </div>
+   */
+  @JsonProperty("channel")
+  private String channel = null;
+
+  /**
+   * <div data-page-id=\"EtIgdgOCmof7O6xs1iSczLYunfb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ZaIEdLwKeoxNShxd0LfcLH6wndg\">活动类型</div> <div class=\"ace-line ace-line old-record-id-ZaIEdLwKeoxNShxd0LfcLH6wndg\">EDUCATION：教培机构</div> <div class=\"ace-line ace-line old-record-id-ZaIEdLwKeoxNShxd0LfcLH6wndg\">PARKING：停车缴费</div> <div class=\"ace-line ace-line old-record-id-ZaIEdLwKeoxNShxd0LfcLH6wndg\">HEALTHCARE：商业医疗</div> <div class=\"ace-line ace-line old-record-id-ZaIEdLwKeoxNShxd0LfcLH6wndg\"> <div data-page-id=\"SmxYdVg5hoBtfUxSkV4cxYF3nuf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-GfpidkEZ6oqZNHxJgsIcsGI9noh\">WECHAT_B2B：微信B2B</div> <div class=\" old-record-id-GfpidkEZ6oqZNHxJgsIcsGI9noh\">SCHOOL_CANTEEN：微信教育学校食堂</div> <div class=\" old-record-id-GfpidkEZ6oqZNHxJgsIcsGI9noh\">CAMPUS_DINING：微信教育非学校餐饮</div> </div> </div> </div>
+   */
+  @JsonProperty("promotionType")
+  private String promotionType = null;
+
+  public QueryMerReportAttachRequestDTO parentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EtIgdgOCmof7O6xs1iSczLYunfb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-AdVndIugkoOa1nxf11Wc7xdbnIf\">发起方商户编号。</div> <div class=\"ace-line ace-line old-record-id-O09TdwxuSoKqF8xazM7cAPRAnAb\">*标准商户收付款方案中此参数与收款商户编号一致；</div> <div class=\"ace-line ace-line old-record-id-HBqodh2FtoKtKcxaNmrcyLRtnCh\">*平台商户收付款方案中此参数为平台商商户编号；</div> <div class=\"ace-line ace-line old-record-id-VwuEdREjGoVgwyxm4AJcpkMpnP7\">*服务商解决方案中，①标准商户申请活动时，该参数为标准商户商编 ②平台商收款或平台商入驻商户申请活动时，该参数为平台商商编。</div> </div>
+   * @return parentMerchantNo
+  **/
+
+  public String getParentMerchantNo() {
+    return parentMerchantNo;
+  }
+
+  public void setParentMerchantNo(String parentMerchantNo) {
+    this.parentMerchantNo = parentMerchantNo;
+  }
+
+  public QueryMerReportAttachRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EtIgdgOCmof7O6xs1iSczLYunfb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-M7n6dJNWpoB0LuxGJu1c419CnXc\">商户编号</div> <div class=\"ace-line ace-line old-record-id-X7mEd6tKdouFtoxAoi8cSopFnuo\">收单主体商编，平台商或服务商下的子商户，普通特约商户</div> </div>
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public QueryMerReportAttachRequestDTO channelNo(String channelNo) {
+    this.channelNo = channelNo;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EtIgdgOCmof7O6xs1iSczLYunfb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-OMx4dHv3ConPxmxPHtScBtuLnFD\">渠道号</div> </div>
+   * @return channelNo
+  **/
+
+  public String getChannelNo() {
+    return channelNo;
+  }
+
+  public void setChannelNo(String channelNo) {
+    this.channelNo = channelNo;
+  }
+
+  public QueryMerReportAttachRequestDTO channel(String channel) {
+    this.channel = channel;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EtIgdgOCmof7O6xs1iSczLYunfb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-Fbxfd4F6PoLu9oxu7OicS28anye\">渠道类型</div> <div class=\"ace-line ace-line old-record-id-BF0MdnaNOooeyzxMcJ9coM62nGe\">枚举值：</div> <div class=\"ace-line ace-line old-record-id-MM2NdgeAzoqhxrxrG9zcwCKxn6b\">WECHAT:微信</div> <div class=\"ace-line ace-line old-record-id-EuL0du49ronTR0xUBU1c1uE0n8g\"> </div> </div>
+   * @return channel
+  **/
+
+  public String getChannel() {
+    return channel;
+  }
+
+  public void setChannel(String channel) {
+    this.channel = channel;
+  }
+
+  public QueryMerReportAttachRequestDTO promotionType(String promotionType) {
+    this.promotionType = promotionType;
+    return this;
+  }
+
+   /**
+   * <div data-page-id=\"EtIgdgOCmof7O6xs1iSczLYunfb\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\"ace-line ace-line old-record-id-ZaIEdLwKeoxNShxd0LfcLH6wndg\">活动类型</div> <div class=\"ace-line ace-line old-record-id-ZaIEdLwKeoxNShxd0LfcLH6wndg\">EDUCATION：教培机构</div> <div class=\"ace-line ace-line old-record-id-ZaIEdLwKeoxNShxd0LfcLH6wndg\">PARKING：停车缴费</div> <div class=\"ace-line ace-line old-record-id-ZaIEdLwKeoxNShxd0LfcLH6wndg\">HEALTHCARE：商业医疗</div> <div class=\"ace-line ace-line old-record-id-ZaIEdLwKeoxNShxd0LfcLH6wndg\"> <div data-page-id=\"SmxYdVg5hoBtfUxSkV4cxYF3nuf\" data-lark-html-role=\"root\" data-docx-has-block-data=\"false\"> <div class=\" old-record-id-GfpidkEZ6oqZNHxJgsIcsGI9noh\">WECHAT_B2B：微信B2B</div> <div class=\" old-record-id-GfpidkEZ6oqZNHxJgsIcsGI9noh\">SCHOOL_CANTEEN：微信教育学校食堂</div> <div class=\" old-record-id-GfpidkEZ6oqZNHxJgsIcsGI9noh\">CAMPUS_DINING：微信教育非学校餐饮</div> </div> </div> </div>
+   * @return promotionType
+  **/
+
+  public String getPromotionType() {
+    return promotionType;
+  }
+
+  public void setPromotionType(String promotionType) {
+    this.promotionType = promotionType;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    QueryMerReportAttachRequestDTO queryMerReportAttachRequestDTO = (QueryMerReportAttachRequestDTO) o;
+    return ObjectUtils.equals(this.parentMerchantNo, queryMerReportAttachRequestDTO.parentMerchantNo) &&
+    ObjectUtils.equals(this.merchantNo, queryMerReportAttachRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.channelNo, queryMerReportAttachRequestDTO.channelNo) &&
+    ObjectUtils.equals(this.channel, queryMerReportAttachRequestDTO.channel) &&
+    ObjectUtils.equals(this.promotionType, queryMerReportAttachRequestDTO.promotionType);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(parentMerchantNo, merchantNo, channelNo, channel, promotionType);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class QueryMerReportAttachRequestDTO {\n");
+    
+    sb.append("    parentMerchantNo: ").append(toIndentedString(parentMerchantNo)).append("\n");
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    channelNo: ").append(toIndentedString(channelNo)).append("\n");
+    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
+    sb.append("    promotionType: ").append(toIndentedString(promotionType)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/QueryOrderResult.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 返回信息
+ */
+public class QueryOrderResult implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <div> <div>00000： 成功</div> </div>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * 
+   */
+  @JsonProperty("data")
+  private PaymentResult data = null;
+
+  public QueryOrderResult code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * <div> <div>00000： 成功</div> </div>
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public QueryOrderResult message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public QueryOrderResult data(PaymentResult data) {
+    this.data = data;
+    return this;
+  }
+
+   /**
+   * Get data
+   * @return data
+  **/
+
+  public PaymentResult getData() {
+    return data;
+  }
+
+  public void setData(PaymentResult data) {
+    this.data = data;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    QueryOrderResult queryOrderResult = (QueryOrderResult) o;
+    return ObjectUtils.equals(this.code, queryOrderResult.code) &&
+    ObjectUtils.equals(this.message, queryOrderResult.message) &&
+    ObjectUtils.equals(this.data, queryOrderResult.data);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, data);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class QueryOrderResult {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/QueryRetailInfoRequestDTO.java

@@ -0,0 +1,170 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 请求参数
+ */
+public class QueryRetailInfoRequestDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>收单商编，查询该商编的门店信息（商户需开通微信B2B及B2C产品）</p>
+   */
+  @JsonProperty("merchantNo")
+  private String merchantNo = null;
+
+  /**
+   * <p>手机号，与微信openid二选一必填（都填写时优先使用openid）</p>
+   */
+  @JsonProperty("mobilePhone")
+  private String mobilePhone = null;
+
+  /**
+   * <p>微信openid，与手机号二选一必填（都填写时优先使用openid）</p>
+   */
+  @JsonProperty("openId")
+  private String openId = null;
+
+  public QueryRetailInfoRequestDTO merchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+    return this;
+  }
+
+   /**
+   * <p>收单商编，查询该商编的门店信息（商户需开通微信B2B及B2C产品）</p>
+   * @return merchantNo
+  **/
+
+  public String getMerchantNo() {
+    return merchantNo;
+  }
+
+  public void setMerchantNo(String merchantNo) {
+    this.merchantNo = merchantNo;
+  }
+
+  public QueryRetailInfoRequestDTO mobilePhone(String mobilePhone) {
+    this.mobilePhone = mobilePhone;
+    return this;
+  }
+
+   /**
+   * <p>手机号，与微信openid二选一必填（都填写时优先使用openid）</p>
+   * @return mobilePhone
+  **/
+
+  public String getMobilePhone() {
+    return mobilePhone;
+  }
+
+  public void setMobilePhone(String mobilePhone) {
+    this.mobilePhone = mobilePhone;
+  }
+
+  public QueryRetailInfoRequestDTO openId(String openId) {
+    this.openId = openId;
+    return this;
+  }
+
+   /**
+   * <p>微信openid，与手机号二选一必填（都填写时优先使用openid）</p>
+   * @return openId
+  **/
+
+  public String getOpenId() {
+    return openId;
+  }
+
+  public void setOpenId(String openId) {
+    this.openId = openId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    QueryRetailInfoRequestDTO queryRetailInfoRequestDTO = (QueryRetailInfoRequestDTO) o;
+    return ObjectUtils.equals(this.merchantNo, queryRetailInfoRequestDTO.merchantNo) &&
+    ObjectUtils.equals(this.mobilePhone, queryRetailInfoRequestDTO.mobilePhone) &&
+    ObjectUtils.equals(this.openId, queryRetailInfoRequestDTO.openId);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(merchantNo, mobilePhone, openId);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class QueryRetailInfoRequestDTO {\n");
+    
+    sb.append("    merchantNo: ").append(toIndentedString(merchantNo)).append("\n");
+    sb.append("    mobilePhone: ").append(toIndentedString(mobilePhone)).append("\n");
+    sb.append("    openId: ").append(toIndentedString(openId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+

fs-service/src/main/java/com/fs/ybPay/aggpay/model/QueryRetailInfoResponseDTO.java

@@ -0,0 +1,180 @@
+/*
+ * 聚合支付
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package com.fs.ybPay.aggpay.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 响应参数
+ */
+public class QueryRetailInfoResponseDTO implements Serializable{
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <p>返回码</p>
+   */
+  @JsonProperty("code")
+  private String code = null;
+
+  /**
+   * <p>返回信息</p>
+   */
+  @JsonProperty("message")
+  private String message = null;
+
+  /**
+   * <p>门店信息列表</p>
+   */
+  @JsonProperty("infoList")
+  private List<QueryRetailResultInfoDTO> infoList = null;
+
+  public QueryRetailInfoResponseDTO code(String code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;返回码&lt;/p&gt;
+   * @return code
+  **/
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public QueryRetailInfoResponseDTO message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;返回信息&lt;/p&gt;
+   * @return message
+  **/
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public QueryRetailInfoResponseDTO infoList(List<QueryRetailResultInfoDTO> infoList) {
+    this.infoList = infoList;
+    return this;
+  }
+
+  public QueryRetailInfoResponseDTO addInfoListItem(QueryRetailResultInfoDTO infoListItem) {
+    if (this.infoList == null) {
+      this.infoList = new ArrayList<>();
+    }
+    this.infoList.add(infoListItem);
+    return this;
+  }
+
+   /**
+   * &lt;p&gt;门店信息列表&lt;/p&gt;
+   * @return infoList
+  **/
+
+  public List<QueryRetailResultInfoDTO> getInfoList() {
+    return infoList;
+  }
+
+  public void setInfoList(List<QueryRetailResultInfoDTO> infoList) {
+    this.infoList = infoList;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    QueryRetailInfoResponseDTO queryRetailInfoResponseDTO = (QueryRetailInfoResponseDTO) o;
+    return ObjectUtils.equals(this.code, queryRetailInfoResponseDTO.code) &&
+    ObjectUtils.equals(this.message, queryRetailInfoResponseDTO.message) &&
+    ObjectUtils.equals(this.infoList, queryRetailInfoResponseDTO.infoList);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(code, message, infoList);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class QueryRetailInfoResponseDTO {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    infoList: ").append(toIndentedString(infoList)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+  private final Map<String, Object> _extParamMap = new HashMap<>();
+
+  @JsonAnySetter
+  public Map<String, Object> addParam(String name, Object value) {
+    if (null != name && null != value) {
+      _extParamMap.put(name, value);
+    }
+    return _extParamMap;
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> get_extParamMap() {
+    return _extParamMap;
+  }
+
+  @JsonIgnore
+  public <T> T get_extParam(String name) {
+    return (T) _extParamMap.get(name);
+  }
+
+}
+