TRX 1 年間 前
コミット
07798af1b6
100 ファイル変更5332 行追加0 行削除
  1. 60 0
      FullCardClient/pom.xml
  2. 12 0
      FullCardClient/src/main/java/com/zhongshu/card/client/config/FullCardClientConfiguration.java
  3. 8 0
      FullCardClient/src/main/java/com/zhongshu/card/client/config/FullCardServerConfiguration.java
  4. 26 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/Pages.java
  5. 24 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/WithdrawOrderModel.java
  6. 12 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/base/IDParam.java
  7. 12 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/base/OidModel.java
  8. 36 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/base/SuperModel.java
  9. 25 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/base/SuperParam.java
  10. 36 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/base/SuperSearch.java
  11. 58 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/AddOrderParamModel.java
  12. 54 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/AddOrderParamModel2.java
  13. 42 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/AdminSeachOrderModel.java
  14. 20 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/ApplicantRefundParamModel.java
  15. 93 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/OrderResultModel.java
  16. 38 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/RefundParamModel.java
  17. 31 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/RefundResultModel.java
  18. 31 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/ScanModel.java
  19. 32 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/UserSeachOrderModel.java
  20. 21 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/VerifyModel.java
  21. 24 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/ApplicantRefundParam2Model.java
  22. 17 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/ChannelModel.java
  23. 132 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/CreatOrderResultModel.java
  24. 121 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/CreateOrder2Model.java
  25. 111 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/GoodsResultModel.java
  26. 76 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/OrderResult2Model.java
  27. 20 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/OrderStremModel.java
  28. 29 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/PaymentModel.java
  29. 30 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/Refund2Model.java
  30. 45 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/RefundParam2Model.java
  31. 84 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/TransferModel.java
  32. 23 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/UpdateGoodsModel.java
  33. 16 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/UpdateOrder2Model.java
  34. 20 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/UserSeachOrder2Model.java
  35. 24 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/VerificationModel.java
  36. 32 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/WithdrawRequestModel.java
  37. 35 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/DepartmentModel.java
  38. 25 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/DepartmentParam.java
  39. 25 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/DepartmentSearchParam.java
  40. 51 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationAddParam.java
  41. 51 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationModel.java
  42. 51 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationSearchParam.java
  43. 36 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationUserSearch.java
  44. 15 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RoleAddParam.java
  45. 15 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RoleModel.java
  46. 15 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RoleSearchParam.java
  47. 40 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountAddParam.java
  48. 59 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountModel.java
  49. 49 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountSearchParam.java
  50. 24 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/CloseRequestModel.java
  51. 71 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/CloseResponsetModel.java
  52. 249 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/CreateRequestModel.java
  53. 135 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/CreateResponseModel.java
  54. 34 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/QueryRequestModel.java
  55. 143 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/QueryResponseModel.java
  56. 36 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RefundQueryRequestModel.java
  57. 154 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RefundQueryResponseModel.java
  58. 53 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RefundRequestModel.java
  59. 165 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RefundResponseModel.java
  60. 60 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RequestBaseModel.java
  61. 38 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ResponseBaseModel.java
  62. 46 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/SubOrdersConfirmRequestModel.java
  63. 33 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/SubOrdersConfirmResponseModel.java
  64. 15 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/TxAmountQueryRequestModel.java
  65. 17 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/BaseBodyRequest.java
  66. 22 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/BatchQueryRequest.java
  67. 85 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/BatchQueryResponse.java
  68. 24 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/CsscQueryRequest.java
  69. 141 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/CsscQueryResponse.java
  70. 19 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/GetMoneyDetailRequest.java
  71. 106 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/GetMoneyDetailResponse.java
  72. 16 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/GetMoneyRequest.java
  73. 56 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/GetMoneyResponse.java
  74. 92 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/MsgHead.java
  75. 64 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/MsgHeadRequest.java
  76. 183 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/WithdrawalsRequest.java
  77. 38 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/WithdrawalsResponse.java
  78. 29 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/zhongshu/CountDetail.java
  79. 17 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/zhongshu/Withdraw.java
  80. 24 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/ApplyWithdrawalsModel.java
  81. 26 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/AuditWithdrawalsModel.java
  82. 20 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/CreatePayment2Model.java
  83. 61 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/CreatePaymentModel.java
  84. 24 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/PaymentBindModel.java
  85. 69 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/PaymentInfoModel.java
  86. 30 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/RefundModel.java
  87. 175 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/SyncInformModel.java
  88. 202 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/PaymentModel.java
  89. 29 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/AcctchangeVerifyAmtRequestModel.java
  90. 21 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/AgreementSignRequestModel.java
  91. 20 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/AlterQryRequestModel.java
  92. 41 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/AlterQryResponseModel.java
  93. 21 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/AlterSignRequestModel.java
  94. 26 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/ApplyQryRequestModel.java
  95. 265 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/ApplyQryResponseModel.java
  96. 50 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/BaseRequestModel.java
  97. 30 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/BaseResponseModel.java
  98. 25 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/BranchBankListRequestModel.java
  99. 36 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/BranchBankListResponseModel.java
  100. 30 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/CompanyAccountVerifyRequestModel.java

+ 60 - 0
FullCardClient/pom.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.github.microservice</groupId>
+		<artifactId>MSModule</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../../super/MSModule</relativePath>
+	</parent>
+
+	<groupId>com.github.microservice.card</groupId>
+	<artifactId>FullCardClient</artifactId>
+	<name>FullCardClient</name>
+	<properties>
+		<java.version>17</java.version>
+	</properties>
+	<dependencies>
+
+		<dependency>
+			<groupId>com.github.microservice</groupId>
+			<artifactId>PCore</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!--应用中心客户端-->
+		<dependency>
+			<groupId>com.github.microservice.components</groupId>
+			<artifactId>ApplicationClient</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>knife4j-spring-boot-starter</artifactId>
+			<version>3.0.3</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/cn.hutool/hutool-all -->
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>5.8.20</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.github.wechatpay-apiv3</groupId>
+			<artifactId>wechatpay-java</artifactId>
+			<version>0.2.12</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.github.microservice.auth</groupId>
+			<artifactId>AuthServer</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+	</dependencies>
+
+</project>

+ 12 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/config/FullCardClientConfiguration.java

@@ -0,0 +1,12 @@
+package com.zhongshu.card.client.config;
+
+
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableFeignClients("com.zhongshu.card.client.service")
+@ComponentScan({"com.zhongshu.card.client"})
+public class FullCardClientConfiguration {
+}

+ 8 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/config/FullCardServerConfiguration.java

@@ -0,0 +1,8 @@
+package com.zhongshu.card.client.config;
+
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FullCardServerConfiguration {
+}

+ 26 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/Pages.java

@@ -0,0 +1,26 @@
+package com.zhongshu.card.client.model;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Pages {
+
+    @ApiModelProperty("排序字段")
+    private String sort;
+
+    @ApiModelProperty("分页大小")
+    private int size;
+
+    @ApiModelProperty("页码")
+    private int page;
+
+
+
+
+}

+ 24 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/WithdrawOrderModel.java

@@ -0,0 +1,24 @@
+package com.zhongshu.card.client.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WithdrawOrderModel {
+
+
+    @ApiModelProperty(hidden = true)
+    public String id;
+    public String createTime;
+    public String orderNo;
+    public String targetOrderId;
+    public String goodsName;
+    public String transfer;
+    public BigDecimal Amount;
+}

+ 12 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/base/IDParam.java

@@ -0,0 +1,12 @@
+package com.zhongshu.card.client.model.base;
+
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/5/26
+ */
+@Data
+public class IDParam {
+    private String id;
+}

+ 12 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/base/OidModel.java

@@ -0,0 +1,12 @@
+package com.zhongshu.card.client.model.base;
+
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/6/3
+ */
+@Data
+public class OidModel {
+    private String oid;
+}

+ 36 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/base/SuperModel.java

@@ -0,0 +1,36 @@
+package com.zhongshu.card.client.model.base;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+
+/**
+ * @author TRX
+ * @date 2024/5/26
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SuperModel {
+
+    @Schema(description = "数据ID")
+    private String id;
+
+    @Schema(description = "创建时间")
+    private Long createTime;
+
+    @Schema(description = "最后编辑时间")
+    private Long updateTime;
+
+    @Schema(description = "排序", hidden = true)
+    private Long sort = 0l;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "所属机构ID")
+    private String oid;
+}

+ 25 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/base/SuperParam.java

@@ -0,0 +1,25 @@
+package com.zhongshu.card.client.model.base;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 添加/编辑的父类
+ * @author TRX
+ * @date 2024/5/26
+ */
+@Data
+public class SuperParam {
+
+    @Schema(description = "数据ID")
+    private String id;
+
+    @Schema(description = "排序")
+    private Long sort = 0l;
+
+    @Schema(description = "所属机构ID")
+    private String oid;
+
+    @Schema(description = "备注")
+    private String remark;
+}

+ 36 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/base/SuperSearch.java

@@ -0,0 +1,36 @@
+package com.zhongshu.card.client.model.base;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.data.domain.Sort;
+
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2024/5/26
+ */
+@Data
+public class SuperSearch {
+
+    @Schema(description = "数据ID", hidden = true)
+    private String id;
+
+    @Schema(description = "所属机构ID")
+    private String oid;
+
+    @Schema(description = "搜索时间范围")
+    private List<Long> times;
+
+    @Schema(description = "开始时间", hidden = true)
+    private Long startTime;
+
+    @Schema(description = "结束时间", hidden = true)
+    private Long endTime;
+
+    @Schema(description = "默认排序", hidden = true)
+    private Sort orderSort;
+
+    @Schema(description = "是否按照序号排序", hidden = true)
+    private Boolean isSortDesc;
+}

+ 58 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/AddOrderParamModel.java

@@ -0,0 +1,58 @@
+package com.zhongshu.card.client.model.order;
+
+import com.zhongshu.card.client.type.Channel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AddOrderParamModel {
+
+
+    /**
+     * 商户id
+     */
+
+    @ApiModelProperty(value = "商家Id", required = true)
+    private String shopId;
+
+
+    /**
+     * 商品信息
+     */
+
+    @ApiModelProperty(value = "商品列表", required = true)
+    private List<String> goodsList;
+
+
+    /**
+     * 优惠券
+     */
+    @ApiModelProperty("优惠券列表")
+    private List<String> discountId;
+
+    /**
+     * 幂等性
+     */
+
+    @ApiModelProperty(value = "idempotent", notes = "唯一值", required = true)
+    private String idempotent;
+
+    @NotNull
+    @ApiModelProperty(value = "渠道", required = true)
+    private Channel channel;
+
+    @ApiModelProperty(value = "扩展参数")
+    private String extend;
+
+
+}

+ 54 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/AddOrderParamModel2.java

@@ -0,0 +1,54 @@
+package com.zhongshu.card.client.model.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AddOrderParamModel2 {
+
+
+    /**
+     * 用户Id
+     */
+
+    @ApiModelProperty(value = "用户Id", required = true)
+    private String userId;
+    /**
+     * 商户id
+     */
+
+    @ApiModelProperty(value = "商家Id", required = true)
+    private String shopId;
+
+
+    /**
+     * 商品信息
+     */
+
+    @ApiModelProperty(value = "商品信息", required = true)
+    private String goodsId;
+
+
+    /**
+     * 优惠券
+     */
+    @ApiModelProperty("优惠券列表")
+    private String discountId;
+
+    private String idempotent;
+
+
+    @ApiModelProperty(value = "扩展参数")
+    private String extend;
+
+
+}

+ 42 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/AdminSeachOrderModel.java

@@ -0,0 +1,42 @@
+package com.zhongshu.card.client.model.order;
+
+import com.zhongshu.card.client.model.Pages;
+import com.zhongshu.card.client.type.Channel;
+import com.zhongshu.card.client.type.OrderType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AdminSeachOrderModel extends Pages {
+
+    @ApiModelProperty(value = "渠道",required = true)
+    @NotNull
+    private Channel channel;
+
+    @ApiModelProperty("订单号")
+    private String noOrGName;
+
+    @ApiModelProperty(value = "商户名称", hidden = true)
+    private String shopId;
+
+
+    /**
+     * 订单状态(正常/申请退款/拒绝退款/退款完成)
+     */
+    @ApiModelProperty("订单状态")
+    private OrderType orderType;
+
+    @ApiModelProperty("订单开始时间")
+    private Long startTime;
+
+    @ApiModelProperty("订单结束时间")
+    private Long endTime;
+
+
+}

+ 20 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/ApplicantRefundParamModel.java

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.model.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ApplicantRefundParamModel {
+
+    @ApiModelProperty("商品订单业务id")
+    private String id;
+
+    @ApiModelProperty("退款原因")
+    private String remark;
+}

+ 93 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/OrderResultModel.java

@@ -0,0 +1,93 @@
+package com.zhongshu.card.client.model.order;
+
+
+import com.zhongshu.card.client.type.OrderType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderResultModel {
+
+
+    @ApiModelProperty("订单号")
+    private String orderNo;
+
+    /**
+     * 商户名称
+     */
+    @ApiModelProperty("商户名称")
+    private String shopName;
+
+    @ApiModelProperty("商品地址")
+    private String shopAddr;
+
+    /**
+     * 商品总价格
+     */
+    @ApiModelProperty("商品总价格")
+    private BigDecimal goodsAmount;
+
+    /**
+     * 运费总价
+     */
+    @ApiModelProperty("运费总价")
+    private BigDecimal freightAmount;
+
+    /**
+     * 优惠总价
+     */
+    @ApiModelProperty("优惠总价")
+    private BigDecimal discountAmount;
+
+    /**
+     * 实际支付价格
+     */
+    @ApiModelProperty("实际支付价格")
+    private BigDecimal payAmount;
+
+    /**
+     * 订单状态
+     */
+    @ApiModelProperty("订单状态")
+    private OrderType orderType;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+
+    /**
+     * 商品列表
+     */
+    @ApiModelProperty("商品列表")
+    private Object goodsList;
+
+    @ApiModelProperty("支付订单号")
+    private String paymentNo;
+
+    @ApiModelProperty("支付时间")
+    private String paymentTime;
+
+    @ApiModelProperty("支付方式")
+    private String paymentWay;
+
+    @ApiModelProperty("退款信息")
+    private RefundResultModel refund;
+
+    @ApiModelProperty("扩展参数")
+    private String extend;
+
+    @ApiModelProperty("支付信息")
+    private String miniPayRequest;
+
+
+}

+ 38 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/RefundParamModel.java

@@ -0,0 +1,38 @@
+package com.zhongshu.card.client.model.order;
+
+import com.zhongshu.card.client.type.OrderType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RefundParamModel {
+
+
+    @NotNull
+    @ApiModelProperty("REFUSAL_REFUND 拒绝退款,APPLY_REFUNDING 退款中")
+    private OrderType orderType;
+    @NotNull
+    @ApiModelProperty(value = "订单号", required = true)
+    public String orderNo;
+    @NotNull
+    @ApiModelProperty(value = "退款金额", required = true)
+    public BigDecimal refundAmount;
+
+    @ApiModelProperty(value = "退款描述")
+    public String refundDesc;
+    @NotNull
+    @ApiModelProperty(value = "平台退款金额", required = true)
+    public BigDecimal platformAmount;
+    @NotNull
+    @ApiModelProperty(value = "子商户号退款金额", required = true)
+    private BigDecimal shopAmount;
+}

+ 31 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/RefundResultModel.java

@@ -0,0 +1,31 @@
+package com.zhongshu.card.client.model.order;
+
+import com.zhongshu.card.client.type.OrderType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RefundResultModel {
+
+
+    @ApiModelProperty("退款原因")
+    private String remark;
+
+    @ApiModelProperty("退款时间")
+    private Long refundTime;
+
+    @ApiModelProperty("申请退款时间")
+    private Long applicationRefundTime;
+
+    @ApiModelProperty("退款状态")
+    private OrderType refund;
+
+    @ApiModelProperty("退款结果")
+    private String conclusion;
+}

+ 31 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/ScanModel.java

@@ -0,0 +1,31 @@
+package com.zhongshu.card.client.model.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ScanModel {
+
+
+    @ApiModelProperty(value = "商家Id", required = true)
+    private String shopId;
+
+    @ApiModelProperty(value = "扩展参数")
+    private String extend;
+
+    @ApiModelProperty("优惠券列表")
+    private List<String> discountId;
+
+    @ApiModelProperty(value = "价格")
+    @NotNull
+    private BigDecimal price;
+}

+ 32 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/UserSeachOrderModel.java

@@ -0,0 +1,32 @@
+package com.zhongshu.card.client.model.order;
+
+import com.zhongshu.card.client.model.Pages;
+import com.zhongshu.card.client.type.Channel;
+import com.zhongshu.card.client.type.OrderType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserSeachOrderModel extends Pages {
+
+
+
+    /**
+     * 订单状态(正常/申请退款/拒绝退款/退款完成)
+     */
+    @ApiModelProperty("订单状态")
+    private OrderType orderType;
+
+    @ApiModelProperty("渠道")
+    @NotNull
+    private Channel channel;
+
+
+
+}

+ 21 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/VerifyModel.java

@@ -0,0 +1,21 @@
+package com.zhongshu.card.client.model.order;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class VerifyModel {
+
+    private String goodsName;
+
+    private String couponId;
+
+    private Long checkTime;
+
+    private String useShop;
+
+    private String name;
+}

+ 24 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/ApplicantRefundParam2Model.java

@@ -0,0 +1,24 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ApplicantRefundParam2Model {
+
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty(hidden = true)
+    private String userId;
+
+    @ApiModelProperty("退款原因")
+    private String remark;
+}

+ 17 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/ChannelModel.java

@@ -0,0 +1,17 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import com.zhongshu.card.client.type.Channel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChannelModel {
+    @ApiModelProperty(value = "渠道", required = true)
+    Channel channel;
+}

+ 132 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/CreatOrderResultModel.java

@@ -0,0 +1,132 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import cn.hutool.json.JSONObject;
+import com.zhongshu.card.client.type.JobFlowMap;
+import com.zhongshu.card.client.type.OrderType;
+import com.zhongshu.card.client.type.TransferType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CreatOrderResultModel {
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 店铺ID
+     */
+    private String shopId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 店铺信息
+     */
+    private JSONObject shopInfo;
+
+    /**
+     * 商品总价格
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 优惠价格
+     */
+    private BigDecimal discountAmount;
+
+    /**
+     * 实际支付价格
+     */
+    private BigDecimal payAmount;
+
+    /**
+     * 使用优惠券信息
+     */
+    private List<JSONObject> discountList;
+
+
+    /**
+     * 有效天数
+     */
+    private Integer validDay;
+
+    /**
+     * 分账账户
+     */
+    private String accesserUserId;
+
+    /**
+     * 支付状态: 未支付、已支付、关闭订单
+     */
+    private OrderType orderType;
+
+
+    private List<Goods> goodsList;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Goods {
+
+
+        /**
+         * 商品id
+         */
+        private String goodsId;
+
+        /**
+         * 商品类型
+         */
+        private JobFlowMap jobFlowMap;
+
+        /**
+         * 商品全部信息
+         */
+        private JSONObject goodsInfo;
+
+        /**
+         * 支付价格
+         */
+        private BigDecimal payAmount;
+
+        /**
+         * 优惠价格
+         */
+        private BigDecimal discountAmount;
+
+        /**
+         * 商品状态
+         */
+        private OrderType goodsState;
+
+        /**
+         * 分账类型
+         */
+        private TransferType transferType;
+
+        /**
+         * 分账规则
+         */
+        private List<CreateOrder2Model.Owner> transferRrule;
+
+
+        /**
+         * 扩展参数
+         */
+        private String extend;
+
+
+    }
+}

+ 121 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/CreateOrder2Model.java

@@ -0,0 +1,121 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import cn.hutool.json.JSONObject;
+import com.zhongshu.card.client.type.Channel;
+import com.zhongshu.card.client.type.JobFlowMap;
+import com.zhongshu.card.client.type.TransferOwner;
+import com.zhongshu.card.client.type.TransferType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CreateOrder2Model {
+
+    private String orderNo;
+
+    // 用户id
+    @NotNull
+    private String userId;
+
+    // 商铺id
+    @NotNull
+    private String shopId;
+
+    // 商铺全部信息
+    @NotNull
+    private JSONObject shopInfo;
+
+    // 商品总价
+    @NotNull
+    private BigDecimal totalAmount;
+
+    // 优惠价格
+    private BigDecimal discountAmount;
+
+    // 支付价格
+    @NotNull
+    private BigDecimal payAmount;
+
+    // 分账账户
+    @NotNull
+    private String accesserUserId;
+
+
+    // 优惠券信息
+    private List<JSONObject> discountList;
+
+    // 商品信息
+    @NotNull
+    private List<Goods> goodsList;
+
+    @NotNull
+    private Channel channel;
+
+
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Goods {
+
+        // 商品id
+        private String goodsId;
+
+        // 商品类型
+        private JobFlowMap jobFlowMap;
+
+        // 商品全部信息
+        @NotNull
+        private JSONObject goodsInfo;
+
+        // 商品支付价格
+        @NotNull
+        private BigDecimal payAmount;
+
+        // 有效期
+        private Integer validDay;
+
+
+        // 分账类型
+        @NotNull
+        private TransferType transferType;
+
+        // 分账明细
+        private List<Owner> transferDetail;
+
+        // 分账规则
+        @NotNull
+        private List<Owner> transferRrule;
+
+        // 扩展参数
+        private String extend;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Owner {
+
+        @NotNull
+        private TransferOwner owner;
+
+        // 需要分账的商家
+        private String shopId;
+
+        // 分多少(百分比或具体的值)
+        @NotNull
+        private BigDecimal value;
+
+
+    }
+
+}

+ 111 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/GoodsResultModel.java

@@ -0,0 +1,111 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import cn.hutool.json.JSONObject;
+import com.zhongshu.card.client.type.JobFlowMap;
+import com.zhongshu.card.client.type.OrderType;
+import com.zhongshu.card.client.type.TransferType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GoodsResultModel {
+
+    /**
+     * 数据id
+     */
+    private String id;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 店铺id
+     */
+
+    private String shopId;
+
+    /**
+     * 店铺id
+     */
+    private JSONObject shopInfo;
+
+    /**
+     * 商品id
+     */
+    private String goodsId;
+
+    /**
+     * 商品类型
+     */
+    private JobFlowMap jobFlowMap;
+
+    /**
+     * 商品全部信息
+     */
+    private JSONObject goodsInfo;
+
+    /**
+     * 支付价格
+     */
+    private BigDecimal payAmount;
+
+    /**
+     * 优惠价格
+     */
+    private BigDecimal discountAmount;
+
+    /**
+     * 商品状态
+     */
+    private OrderType goodsState;
+
+    /**
+     * 分账类型
+     */
+    private TransferType transferType;
+
+    /**
+     * 分账规则
+     */
+    private List<CreateOrder2Model.Owner> transferRrule;
+
+    /**
+     * 验证信息
+     */
+    private JSONObject verifyModel;
+
+    /**
+     * 支付信息
+     */
+    private JSONObject paymentInfo;
+
+    /**
+     * 扩展参数
+     */
+    private String extend;
+
+
+    // 有效期
+    private Integer validDay;
+
+
+    // 是否发货
+    private boolean delivery;
+
+
+    private OrderType refundBeforeState;
+
+
+}

+ 76 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/OrderResult2Model.java

@@ -0,0 +1,76 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import cn.hutool.json.JSONObject;
+import com.zhongshu.card.client.type.JobFlowMap;
+import com.zhongshu.card.client.type.OrderType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderResult2Model {
+
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "店铺信息")
+    private JSONObject shopInfo;
+
+
+    @ApiModelProperty(value = "优惠券信息")
+    private List<JSONObject> discountList;
+
+    @ApiModelProperty(value = "支付价格")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty(value = "优惠价格")
+    private BigDecimal discountAmount;
+
+
+    @ApiModelProperty(value = "商品信息")
+    private List<GoodsModel> goodsModelList;
+
+    @ApiModelProperty(value = "订单创建时间")
+    private Long createTime;
+
+
+
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class GoodsModel{
+
+        @ApiModelProperty(value = "数据id")
+        private String id;
+
+        @ApiModelProperty(value = "商品信息")
+        private JSONObject goodsInfo;
+
+        @ApiModelProperty(value = "商品订单状态")
+        private OrderType goodsState;
+
+        @ApiModelProperty(value = "支付价格")
+        private BigDecimal payAmount;
+
+        @ApiModelProperty(value = "优惠价格")
+
+        private BigDecimal discountAmount;
+
+        @ApiModelProperty(value = "商品类型")
+        private JobFlowMap jobFlowMap;
+
+        @ApiModelProperty(value = "商品扩展信息")
+        private String extend;
+
+
+    }
+
+}

+ 20 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/OrderStremModel.java

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import com.zhongshu.card.client.type.OrderType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderStremModel {
+
+    private String orderNo;
+
+    private String userId;
+
+    private OrderType orderType;
+
+
+}

+ 29 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/PaymentModel.java

@@ -0,0 +1,29 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaymentModel {
+
+
+    @ApiModelProperty(value = "支付订单号")
+    private String paymentNo;
+
+    @ApiModelProperty(value = "支付时间")
+    private String paymentTime;
+
+    @ApiModelProperty(value = "支付方式")
+    private String paymentWay;
+
+    @ApiModelProperty(value = "支付订单状态")
+    private String paymentStatus;
+
+    @ApiModelProperty(value = "支付信息")
+    private String miniPayRequest;
+
+}

+ 30 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/Refund2Model.java

@@ -0,0 +1,30 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import com.zhongshu.card.client.model.payment.CreateRequestModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Refund2Model {
+
+    @ApiModelProperty(value = "订单号", required = true)
+    public String orderNo;
+
+    @ApiModelProperty(value = "退款金额", required = true)
+    public Long refundAmount;
+
+    @ApiModelProperty(value = "退款描述")
+    public String refundDesc;
+
+    @ApiModelProperty(value = "平台退款金额", required = true)
+    public Long platformAmount;
+
+    @ApiModelProperty(value = "退款明细", required = true)
+    public List<CreateRequestModel.SubOrders> subOrders;
+}

+ 45 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/RefundParam2Model.java

@@ -0,0 +1,45 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import com.zhongshu.card.client.type.OrderType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RefundParam2Model {
+
+    @NotNull
+    @ApiModelProperty("商品订单数据id")
+    private String id;
+
+    @NotNull
+    @ApiModelProperty("REFUSAL_REFUND 拒绝退款,APPLY_REFUNDING 退款中")
+    private OrderType orderType;
+
+    @ApiModelProperty(value = "退款总金额金额", required = true)
+    @NotNull
+    public BigDecimal refundAmount;
+
+    @ApiModelProperty(value = "平台退款金额", required = true)
+    @NotNull
+    public BigDecimal platformAmount;
+
+    @ApiModelProperty(value = "购买商铺退款金额", required = true)
+    @NotNull
+    private BigDecimal buyShopAmount;
+
+    @ApiModelProperty(value = "使用商铺退款金额")
+    @NotNull
+    private BigDecimal useShopAmount;
+
+    @ApiModelProperty(value = "退款描述")
+    private String refundDesc;
+}

+ 84 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/TransferModel.java

@@ -0,0 +1,84 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import cn.hutool.json.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TransferModel {
+
+    /**
+     * 创建时间
+     */
+    private Long createTime;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 商品订单id
+     */
+    private String goodsId;
+    /**
+     * 商品信息
+     */
+    private JSONObject shopInfo;
+
+    /**
+     * 商品信息
+     */
+    private JSONObject goodsInfo;
+
+    /**
+     * 支付价格
+     */
+
+    private BigDecimal payAmount;
+
+    /**
+     * 平台分得金额
+     */
+    private BigDecimal platform;
+
+    /**
+     * 购买店铺分得金额
+     */
+    private BigDecimal buyShop;
+
+    /**
+     * 使用店铺分得金额
+     */
+    private BigDecimal useShop;
+
+    /**
+     * 是否支付
+     */
+    private Boolean pay;
+
+    /**
+     * 支付时间
+     */
+    private String payTime;
+
+    /**
+     * 第三方订单号
+     */
+    private String targetOrderId;
+
+    /**
+     * 是否分账
+     */
+    private Boolean transfer;
+
+    /**
+     * 完成分账时间
+     */
+    private Long transferTime;
+}

+ 23 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/UpdateGoodsModel.java

@@ -0,0 +1,23 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import cn.hutool.json.JSONObject;
+import com.zhongshu.card.client.type.OrderType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdateGoodsModel {
+
+    private String id;
+
+    private OrderType goodsState;
+
+    private JSONObject verifyModel;
+
+    private Boolean delivery;
+
+    private String extend;
+}

+ 16 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/UpdateOrder2Model.java

@@ -0,0 +1,16 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import com.zhongshu.card.client.type.OrderType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdateOrder2Model {
+
+    private String orderNo;
+
+    private OrderType orderType;
+}

+ 20 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/UserSeachOrder2Model.java

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import com.zhongshu.card.client.model.order.UserSeachOrderModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserSeachOrder2Model extends UserSeachOrderModel {
+
+
+    @NotNull
+    private String userId;
+
+
+}

+ 24 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/VerificationModel.java

@@ -0,0 +1,24 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import cn.hutool.json.JSONObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class VerificationModel {
+    @NotNull
+    @ApiModelProperty("商品订单数据id")
+    private String id;
+
+    private String shopId;
+
+    @NotNull
+    @ApiModelProperty("核验信息")
+    private JSONObject verification;
+}

+ 32 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/order/v2/WithdrawRequestModel.java

@@ -0,0 +1,32 @@
+package com.zhongshu.card.client.model.order.v2;
+
+import com.zhongshu.card.client.model.Pages;
+import com.zhongshu.card.client.type.Channel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WithdrawRequestModel extends Pages {
+
+    @ApiModelProperty("渠道")
+    @NotNull
+    private Channel channel;
+
+    @ApiModelProperty("订单号")
+    private String noOrGName;
+
+    @ApiModelProperty(value = "商户名称", hidden = true)
+    private String shopId;
+
+    @ApiModelProperty("订单开始时间")
+    private Long startTime;
+
+    @ApiModelProperty("订单结束时间")
+    private Long endTime;
+}

+ 35 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/DepartmentModel.java

@@ -0,0 +1,35 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.type.DataState;
+import com.zhongshu.card.client.utils.ITree;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.junit.experimental.theories.DataPoints;
+import org.springframework.data.mongodb.core.index.Indexed;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2024/6/3
+ */
+@Data
+public class DepartmentModel extends SuperModel implements ITree<DepartmentModel>, Serializable {
+
+    @Schema(description = "部门名称")
+    private String name;
+
+    @Schema(description = "部门状态")
+    private DataState state = DataState.Enable;
+
+    @Schema(description = "上级ID")
+    @Indexed
+    private String parentId;
+
+    @ApiModelProperty("子层级")
+    private List<DepartmentModel> child = new ArrayList<>();
+}

+ 25 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/DepartmentParam.java

@@ -0,0 +1,25 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperParam;
+import com.zhongshu.card.client.type.DataState;
+import com.zhongshu.card.client.utils.ITree;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.data.mongodb.core.index.Indexed;
+
+/**
+ * @author TRX
+ * @date 2024/6/3
+ */
+@Data
+public class DepartmentParam extends SuperParam {
+    @Schema(description = "部门名称")
+    private String name;
+
+    @Schema(description = "部门状态")
+    private DataState state = DataState.Enable;
+
+    @Schema(description = "上级ID")
+    @Indexed
+    private String parentId = ITree.ROOT_ID;
+}

+ 25 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/DepartmentSearchParam.java

@@ -0,0 +1,25 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperSearch;
+import com.zhongshu.card.client.type.DataState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.data.mongodb.core.index.Indexed;
+
+/**
+ * @author TRX
+ * @date 2024/6/3
+ */
+@Data
+public class DepartmentSearchParam extends SuperSearch {
+
+    @Schema(description = "部门名称")
+    private String name;
+
+    @Schema(description = "部门状态")
+    private DataState state = DataState.Enable;
+
+    @Schema(description = "上级ID")
+    @Indexed
+    private String parentId;
+}

+ 51 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationAddParam.java

@@ -0,0 +1,51 @@
+package com.zhongshu.card.client.model.org;
+
+import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.card.client.model.base.SuperParam;
+import com.zhongshu.card.client.type.OrganizationState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class OrganizationAddParam extends SuperParam {
+
+    @Schema(description = "机构名称")
+    private String name;
+
+    @Schema(description = "统一社会信用代码")
+    private String orgCode;
+
+    @Schema(description = "联系人邮箱")
+    private String contactEmail;
+
+    @Schema(description = "联系人-用来初始管理员")
+    private String contactName;
+
+    @Schema(description = "联系人电话")
+    private String contactPhone;
+
+    @Schema(description = "logo")
+    private String logo;
+
+    @Schema(description = "地址")
+    private String address;
+
+    @Schema(description = " 行政区划编码")
+    private String adminDivisionItemCode;
+
+    @Schema(description = "经度")
+    private String mapLon;
+
+    @Schema(description = "纬度")
+    private String mapLat;
+
+    @Schema(description = "机构类型")
+    private AuthType authType = AuthType.Enterprise;
+
+    @Schema(description = "状态")
+    private OrganizationState state;
+}

+ 51 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationModel.java

@@ -0,0 +1,51 @@
+package com.zhongshu.card.client.model.org;
+
+import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.type.OrganizationState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.data.mongodb.core.index.Indexed;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class OrganizationModel extends SuperModel {
+    @Schema(description = "机构名称")
+    private String name;
+
+    @Schema(description = "统一社会信用代码")
+    private String orgCode;
+
+    @Schema(description = "联系人邮箱")
+    private String contactEmail;
+
+    @Schema(description = "联系人-用来初始管理员")
+    private String contactName;
+
+    @Schema(description = "联系人电话")
+    private String contactPhone;
+
+    @Schema(description = "logo")
+    private String logo;
+
+    @Schema(description = "地址")
+    private String address;
+
+    @Schema(description = " 行政区划编码")
+    private String adminDivisionItemCode;
+
+    @Schema(description = "经度")
+    private String mapLon;
+
+    @Schema(description = "纬度")
+    private String mapLat;
+
+    @Schema(description = "机构类型")
+    private AuthType authType = AuthType.Enterprise;
+
+    @Schema(description = "状态")
+    private OrganizationState state;
+}

+ 51 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationSearchParam.java

@@ -0,0 +1,51 @@
+package com.zhongshu.card.client.model.org;
+
+import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.card.client.model.base.SuperSearch;
+import com.zhongshu.card.client.type.OrganizationState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.data.mongodb.core.index.Indexed;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class OrganizationSearchParam extends SuperSearch {
+    @Schema(description = "机构名称")
+    private String name;
+
+    @Schema(description = "统一社会信用代码")
+    private String orgCode;
+
+    @Schema(description = "联系人邮箱")
+    private String contactEmail;
+
+    @Schema(description = "联系人-用来初始管理员")
+    private String contactName;
+
+    @Schema(description = "联系人电话")
+    private String contactPhone;
+
+    @Schema(description = "logo")
+    private String logo;
+
+    @Schema(description = "地址")
+    private String address;
+
+    @Schema(description = " 行政区划编码")
+    private String adminDivisionItemCode;
+
+    @Schema(description = "经度")
+    private String mapLon;
+
+    @Schema(description = "纬度")
+    private String mapLat;
+
+    @Schema(description = "机构类型")
+    private AuthType authType = AuthType.Enterprise;
+
+    @Schema(description = "状态")
+    private OrganizationState state;
+}

+ 36 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationUserSearch.java

@@ -0,0 +1,36 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperSearch;
+import com.zhongshu.card.client.type.UserState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class OrganizationUserSearch extends SuperSearch {
+
+    @Schema(description = "用户ID")
+    private String userId;
+
+    @Schema(description = "登录名")
+    private String loginName;
+
+    @Schema(description = "用户手机号")
+    @Indexed(unique = true)
+    private String phone;
+
+    @Schema(description = "姓名")
+    @Indexed
+    private String name;
+
+    @Schema(description = "用户状态")
+    private UserState state;
+
+    @Schema(description = "是否是企业管理员")
+    private Boolean isAdmin;
+}

+ 15 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RoleAddParam.java

@@ -0,0 +1,15 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class RoleAddParam extends SuperParam {
+    @Schema(description = "名称")
+    private String name;
+}

+ 15 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RoleModel.java

@@ -0,0 +1,15 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class RoleModel extends SuperModel {
+    @Schema(description = "名称")
+    private String name;
+}

+ 15 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RoleSearchParam.java

@@ -0,0 +1,15 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperSearch;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class RoleSearchParam extends SuperSearch {
+    @Schema(description = "名称")
+    private String name;
+}

+ 40 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountAddParam.java

@@ -0,0 +1,40 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperParam;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.UserLoginType;
+import com.zhongshu.card.client.type.UserState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class UserCountAddParam extends SuperParam {
+
+    @Schema(description = "用户ID")
+    private String userId;
+
+    @Schema(description = "登录名")
+    private String loginName;
+
+    @Schema(description = "用户手机号")
+    private String phone;
+
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "用户名  用户真实姓名的拼音")
+    private String spellCode;
+
+    @Schema(description = "头像")
+    private String profilePic;
+
+    @Schema(description = "性别")
+    private Sex sex;
+
+    @Schema(description = "地址")
+    private String address;
+}

+ 59 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountModel.java

@@ -0,0 +1,59 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.UserLoginType;
+import com.zhongshu.card.client.type.UserState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserCountModel extends SuperModel {
+
+    @Schema(description = "用户ID(由鉴权中心颁发)")
+    private String userId;
+
+    @Schema(description = "登录名")
+    private String loginName;
+
+    @Schema(description = "用户手机号")
+    private String phone;
+
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "用户名  用户真实姓名的拼音")
+    private String spellCode;
+
+    @Schema(description = "头像")
+    private String profilePic;
+
+    @Schema(description = "性别")
+    private Sex sex;
+
+    private String sexStr;
+
+    public String getSexStr(){
+        if (sex != null) {
+            return sex.getRemark();
+        }
+        return "";
+    }
+
+    @Schema(description = "地址")
+    private String address;
+
+    @Schema(description = "用户状态")
+    UserState state = UserState.Normal;
+
+    @Schema(description = "可登录端类型")
+    UserLoginType loginType = UserLoginType.All;
+}

+ 49 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountSearchParam.java

@@ -0,0 +1,49 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.model.base.SuperSearch;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.UserLoginType;
+import com.zhongshu.card.client.type.UserState;
+import com.zhongshu.card.client.type.UserType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class UserCountSearchParam extends SuperSearch {
+    @Schema(description = "用户ID(由鉴权中心颁发)")
+    private String userId;
+
+    @Schema(description = "登录名")
+    private String loginName;
+
+    @Schema(description = "用户手机号")
+    private String phone;
+
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "用户名  用户真实姓名的拼音")
+    private String spellCode;
+
+    @Schema(description = "头像")
+    private String profilePic;
+
+    @Schema(description = "性别")
+    private Sex sex;
+
+    @Schema(description = "地址")
+    private String address;
+
+    @Schema(description = "用户状态")
+    UserState state = UserState.Normal;
+
+    @Schema(description = "可登录端类型")
+    UserLoginType loginType = UserLoginType.All;
+
+    @Schema(description = "用户类型")
+    UserType userType;
+}

+ 24 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/CloseRequestModel.java

@@ -0,0 +1,24 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.Data;
+
+@Data
+public class CloseRequestModel extends RequestBaseModel {
+
+
+    /**
+     * 商户订单号
+     */
+    private String merOrderId;
+
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+
+    public CloseRequestModel() {
+        super("close");
+    }
+}

+ 71 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/CloseResponsetModel.java

@@ -0,0 +1,71 @@
+package com.zhongshu.card.client.model.payment;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CloseResponsetModel extends ResponseBaseModel {
+
+
+    /**
+     * 商户订单号
+     */
+    private String merOrderId;
+
+    /**
+     * 结算时间
+     */
+    private String settleDate;
+
+    /**
+     * 链接系统
+     */
+    private String connectSys;
+
+    /**
+     * 清分ID
+     */
+    private String settleRefId;
+
+    /**
+     * 支付渠道商户号
+     */
+    private String targetMid;
+
+    /**
+     * 商户号
+     */
+    private String mid;
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+    /**
+     * 商户名称
+     */
+    private String merName;
+
+    /**
+     * 交易状态
+     */
+    private String status;
+
+    /**
+     * 目标平台的状态
+     */
+    private String targetStatus;
+
+    /**
+     * 目标平台代码
+     */
+    private String targetSys;
+
+
+
+}

+ 249 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/CreateRequestModel.java

@@ -0,0 +1,249 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+public class CreateRequestModel extends RequestBaseModel {
+
+
+    /**
+     * 消息ID
+     */
+    private final String msgId = "4217";
+
+    /**
+     * 订单过期时间 格式:yyyy-MM-dd HH:mm:ss
+     */
+    private String expireTime;
+
+    /**
+     * 商户订单号
+     */
+    private String merOrderId;
+
+    /**
+     * 商户业务订单号
+     */
+    private String busiOrderId;
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+
+    /**
+     * 商户附加数据
+     */
+    private String attachedData;
+
+    /**
+     * 账单描述
+     */
+    private String orderDesc;
+
+    /**
+     * 操作员工号
+     */
+    private String employeeNo;
+
+    /**
+     * 订单原始金额,单位分
+     */
+    private Long originalAmount;
+
+    /**
+     * 支付总金额,单位分
+     */
+    private Long totalAmount;
+
+    /**
+     * 支付结果通知地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 回跳地址
+     */
+    private String returnUrl;
+
+    /**
+     * 异步分账标记
+     */
+    private Boolean asynDivisionFlag;
+
+    /**
+     * 分账标记
+     */
+    private Boolean divisionFlag;
+
+    /**
+     * 商品信息
+     */
+    private List<Goods> goods;
+
+    /**
+     * 分账信息
+     */
+    private List<SubOrders> subOrders;
+
+    /**
+     * 平台商户分账金额
+     */
+    private Long platformAmount;
+
+    /**
+     * 付款人openid
+     */
+    private String subOpenId;
+
+    /**
+     * 支付宝买家ID
+     */
+    private String userId;
+
+    /**
+     * 商户微信appId
+     */
+    private String subAppId;
+
+    /**
+     * 是否需要限制信用卡支付
+     */
+    private Boolean limitCreditCard;
+
+    /**
+     * 标识是否是担保交易
+     */
+    private Boolean secureTransaction;
+
+    /**
+     * 开具发票
+     */
+    private String issueInvoice;
+
+    /**
+     * 是否需要实名认证
+     */
+    private String fixBuyer;
+
+    /**
+     * 实名认证姓名
+     */
+    private String name;
+
+    /**
+     * 实名认证手机号
+     */
+    private String mobile;
+
+    /**
+     * 实名认证证件类型
+     */
+    private String certType;
+
+    /**
+     * 实名认证证件号
+     */
+    private String certNo;
+
+    /**
+     * 扩展字段1
+     */
+    private String extend1;
+
+    /**
+     * 扩展字段2
+     */
+    private String extend2;
+
+    /**
+     * 扩展字段3
+     */
+    private String extend3;
+
+    /**
+     * 扩展字段4
+     */
+    private String extend4;
+
+    public CreateRequestModel(String msgType) {
+        super(msgType);
+    }
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class SubOrders {
+
+        /**
+         * 子商户号
+         */
+        private String mid;
+
+        /**
+         * 子商户号所得金额(分)
+         */
+        private Long totalAmount;
+
+
+    }
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Goods {
+
+        /**
+         * 商品ID
+         */
+        private String goodsId;
+
+        /**
+         * 商品名称
+         */
+        private String goodsName;
+
+        /**
+         * 商品数量
+         */
+        private String quantity;
+
+        /**
+         * 商品单价(分)
+         */
+        private String price;
+
+        /**
+         * 商品分类
+         */
+        private String goodsCategory;
+
+        /**
+         * 子商户号
+         */
+        private String subMerchantId;
+
+        /**
+         * 商户子订单号
+         */
+        private String merOrderId;
+
+        /**
+         * 子商户商品总额
+         */
+        private String subOrderAmount;
+
+
+
+
+    }
+
+
+}

+ 135 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/CreateResponseModel.java

@@ -0,0 +1,135 @@
+package com.zhongshu.card.client.model.payment;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CreateResponseModel extends ResponseBaseModel {
+
+    /**
+     * 平台流水号
+     */
+    private  String seqId;
+
+    /**
+     * 清分	如果来源方传了bankRefId就等于bankRefId,否则等于seqId
+     */
+    private  String settleRefId;
+
+    /**
+     * 交易状态
+     * (1).NEW_ORDER新订单
+     * (2).TRADE_CLOSED 在指定时间段内未支付时关闭的交易;在交易完成全额退款成功时关闭的交易;支付失败的交易。 TRADE_CLOSED的交易不允许进行任何操作。
+     * (3).WAIT_BUYER_PAY 交易创建,等待买家付款。
+     * (4).TRADE_SUCCESS 支付成功
+     * (5).TRADE_REFUND 订单转入退货流程 退货可能是部分也可能是全部。
+     * (6).UNKNOWN 不明确的交易状态
+     */
+    private  String status;
+
+    /**
+     * 第三方订单号
+     */
+    private  String targetOrderId;
+
+    /**
+     * 目标平台代码
+     */
+    @ApiModelProperty("目标平台代码")
+    private  String targetSys;
+
+    /**
+     * 目标平台的状态
+     */
+    @ApiModelProperty("目标平台的状态")
+    private  String targetStatus;
+
+    @ApiModelProperty("小程序支付用的请求报文,带有签名信息")
+    private  String miniPayRequest;
+
+    /**
+     * 商户订单号
+     */
+    @ApiModelProperty("商户订单号")
+    private  String merOrderId;
+
+    /**
+     * 商户号
+     */
+    @ApiModelProperty("商户号")
+    private  String mid;
+
+    /**
+     * 终端号
+     */
+    @ApiModelProperty("终端号")
+    private  String tid;
+
+    /**
+     * 操作员工号
+     */
+    @ApiModelProperty("操作员工号")
+    private  String employeeNo;
+
+    /**
+     * 商户附加数据
+     */
+    @ApiModelProperty("商户附加数据")
+    private  String attachedData;
+
+    /**
+     * 订单原始金额,单位分
+     */
+    @ApiModelProperty("订单原始金额,单位分")
+    private  String originalAmount;
+
+    /**
+     * 支付总金额,单位分
+     */
+    private  String totalAmount;
+
+    /**
+     * 平台商户分账金额
+     */
+    private  String platformAmount;
+
+    /**
+     * 分账明细
+     */
+    private  String subOrders;
+
+    /**
+     * 付款人openid
+     */
+    private  String subOpenId;
+
+    /**
+     * 商户微信appId
+     */
+    private  String subAppId;
+
+    /**
+     * 扩展字段1
+     */
+    private  String extend1;
+
+    /**
+     * 扩展字段2
+     */
+    private  String extend2;
+
+    /**
+     * 扩展字段3
+     */
+    private  String extend3;
+
+    /**
+     * 扩展字段4
+     */
+    private  String extend4;
+}

+ 34 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/QueryRequestModel.java

@@ -0,0 +1,34 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.Data;
+
+@Data
+public class QueryRequestModel extends RequestBaseModel {
+
+
+    /**
+     * 订单id
+     */
+    private String merOrderId;
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+    /**
+     * 订单下单日期	yyyy-MM-dd
+     */
+    private String billDate;
+
+    /**
+     * 是否执行回调
+     */
+    private Boolean executeNotify;
+
+
+
+    public QueryRequestModel() {
+        super("query");
+    }
+}

+ 143 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/QueryResponseModel.java

@@ -0,0 +1,143 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class QueryResponseModel extends ResponseBaseModel {
+
+
+    /**
+     * 平台流水号,类似检索参考号
+     */
+    private String seqId;
+
+    /**
+     * 清分ID
+     */
+    private String settleRefId;
+
+    /**
+     * 检索参考号
+     */
+    private String refId;
+
+    /**
+     * 交易状态
+     */
+    private String status;
+
+    /**
+     * 第三方订单号
+     */
+    private String targetOrderId;
+
+    /**
+     * 目标平台代码
+     */
+    private String targetSys;
+
+    /**
+     * 目标平台的状态
+     */
+    private String targetStatus;
+
+    /**
+     * 买家ID
+     */
+    private String buyerId;
+
+    /**
+     * 支付渠道商户号
+     */
+    private String targetMid;
+
+    /**
+     * 银行卡号
+     */
+    private String bankCardNo;
+
+    /**
+     * 银行信息
+     */
+    private String bankInfo;
+
+    /**
+     * 支付渠道列表
+     */
+    private String billFunds;
+
+    /**
+     * 支付渠道描述
+     */
+    private String billFundsDesc;
+
+    /**
+     * 买家付款的金额
+     */
+    private BigDecimal buyerPayAmount;
+
+    /**
+     * 买家用户名
+     */
+    private String buyerUsername;
+
+    /**
+     * 网付计算的优惠金额
+     */
+    private BigDecimal couponAmount;
+
+    /***
+     * 给用户开具发票的金额
+     */
+    private String invoiceAmount;
+
+    /**
+     * 订单金额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 支付时间
+     */
+    private String payTime;
+
+    /**
+     * 商户实收金额
+     */
+    private BigDecimal receiptAmount;
+
+    /**
+     * 结算日期
+     */
+    private String settleDate;
+
+    /**
+     * 子买家ID,比如微信的subOpenId
+     */
+    private String subBuyerId;
+
+    /**
+     * 订单下单日期
+     */
+    private String billDate;
+
+    /**
+     * 银联商务大华捷通系统流水号
+     */
+    private String queryId;
+
+    /**
+     * 消息Id
+     */
+    private String msgId;
+
+    /**
+     * 业务类型
+     */
+    private String instMid;
+
+    // 后续原样返回字段 需要时添加
+
+}

+ 36 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RefundQueryRequestModel.java

@@ -0,0 +1,36 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.Data;
+
+@Data
+public class RefundQueryRequestModel extends RequestBaseModel{
+
+
+    /**
+     * 商户订单号
+     */
+    private String merOrderId;
+
+    /**
+     * 退款订单号	退款订单号
+     */
+    private String refundOrderId;
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+    /**
+     * 订单下单日期
+     */
+    private String billDate;
+
+
+
+
+
+    public RefundQueryRequestModel() {
+        super("refundQuery");
+    }
+}

+ 154 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RefundQueryResponseModel.java

@@ -0,0 +1,154 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RefundQueryResponseModel extends ResponseBaseModel{
+
+
+    /**
+     * 平台流水号,类似检索参考号
+     */
+    private String seqId;
+
+    /**
+     * 清分ID
+     */
+    private String settleRefId;
+
+    /**
+     * 检索参考号
+     */
+    private String refId;
+
+    /**
+     * 交易状态
+     */
+    private String status;
+
+    /**
+     * 第三方订单号
+     */
+    private String targetOrderId;
+
+    /**
+     * 目标平台代码
+     */
+    private String targetSys;
+
+    /**
+     * 目标平台的状态
+     */
+    private String targetStatus;
+
+    /**
+     * 退款状态
+     */
+    private String refundStatus;
+
+    /**
+     * 退款订单号
+     */
+    private String refundOrderId;
+
+    /**
+     * 支付渠道列表
+     */
+    private String refundFunds;
+
+    /**
+     * 商户实退金额
+     */
+    private BigDecimal sendBackAmount;
+
+    /**
+     * 实付部分退款金额
+     */
+    private BigDecimal refundInvoiceAmount;
+
+    /**
+     * 买家ID
+     */
+    private String buyerId;
+
+    /**
+     * 支付渠道商户号
+     */
+    private String targetMid;
+
+    /**
+     * 银行卡号
+     */
+    private String bankCardNo;
+
+    /**
+     * 银行信息
+     */
+    private String bankInfo;
+
+    /**
+     * 支付渠道列表
+     */
+    private String billFunds;
+
+    /**
+     * 支付渠道描述
+     */
+    private String billFundsDesc;
+
+    /**
+     * 买家用户名
+     */
+    private String buyerUsername;
+
+    /**
+     * 网付计算的优惠金额
+     */
+    private BigDecimal couponAmount;
+
+    /**
+     * 给用户开具发票的金额
+     */
+    private BigDecimal invoiceAmount;
+
+    /**
+     * 订单金额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 支付时间
+     */
+    private String payTime;
+
+    /**
+     * 结算日期
+     */
+    private String settleDate;
+
+    /**
+     * 子买家ID,比如微信的subOpenId
+     */
+    private String subBuyerId;
+
+    /**
+     * 订单下单日期
+     */
+    private String billDate;
+
+    /**
+     * 银联商务大华捷通系统流水号
+     */
+    private String queryId;
+
+
+
+
+
+}

+ 53 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RefundRequestModel.java

@@ -0,0 +1,53 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RefundRequestModel extends RequestBaseModel {
+
+    /**
+     * 商户订单号
+     */
+    private String merOrderId;
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+    /**
+     * 订单下单日期
+     */
+    private String billDate;
+
+    /**
+     * 退款金额
+     */
+    private Long refundAmount;
+
+    /**
+     * 退款订单号	 跟merOrderId一样的生成规则
+     */
+    private String refundOrderId;
+
+    /**
+     * 退款描述
+     */
+    private String refundDesc;
+
+    /**
+     * 平台退款金额
+     */
+    private Long platformAmount;
+
+    /**
+     * 子商户退款明细
+     */
+    private List<CreateRequestModel.SubOrders> subOrders;
+
+    public RefundRequestModel() {
+        super("refund");
+    }
+}

+ 165 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RefundResponseModel.java

@@ -0,0 +1,165 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RefundResponseModel extends ResponseBaseModel {
+
+    /**
+     * 退款渠道列表
+     */
+    private String refundFunds;
+
+    /**
+     * 退款渠道描述
+     */
+    private String refundFundsDesc;
+
+    /**
+     * 实付部分退款金额
+     */
+    private BigDecimal refundInvoiceAmount;
+
+    /**
+     * 退款订单号
+     */
+    private String refundOrderId;
+
+    /**
+     * 目标系统退货订单号
+     */
+    private String refundTargetOrderId;
+
+    /**
+     * 退款状态
+     */
+    private String refundStatus;
+
+    /**
+     * 总退款金额
+     */
+    private BigDecimal refundAmount;
+
+    /**
+     * 清分ID
+     */
+    private String seqId;
+
+    /**
+     * 检索参考号
+     */
+    private String refId;
+
+    /**
+     * 交易状态
+     */
+    private String status;
+
+    /**
+     * 第三方订单号
+     */
+    private String targetOrderId;
+
+    /**
+     * 目标平台代码
+     */
+    private String targetSys;
+
+    /**
+     * 目标平台的状态
+     */
+    private String targetStatus;
+
+    /**
+     * 买家ID
+     */
+    private String buyerId;
+
+    /**
+     * 支付渠道商户号
+     */
+    private String targetMid;
+
+    /**
+     * 银行卡号
+     */
+    private String bankCardNo;
+
+    /**
+     * 银行信息
+     */
+    private String bankInfo;
+
+    /**
+     * 支付渠道列表
+     */
+    private String billFunds;
+
+    /**
+     * 支付渠道描述
+     */
+    private String billFundsDesc;
+
+    /**
+     * 买家付款的金额
+     */
+    private BigDecimal buyerPayAmount;
+
+    /**
+     * 买家用户名
+     */
+    private String buyerUsername;
+
+    /**
+     * 网付计算的优惠金额
+     */
+    private BigDecimal couponAmount;
+
+    /**
+     * 给用户开具发票的金额
+     */
+    private BigDecimal invoiceAmount;
+
+    /**
+     * 订单金额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 支付时间
+     */
+    private String payTime;
+
+    /**
+     * 商户实收金额
+     */
+    private BigDecimal receiptAmount;
+
+    /**
+     * 结算日期
+     */
+    private String settleDate;
+
+    /**
+     * 子买家ID,比如微信的subOpenId
+     */
+    private String subBuyerId;
+
+    /**
+     * 订单下单日期
+     */
+    private String billDate;
+
+    /**
+     * 银联商务大华捷通系统流水号
+     */
+    private String queryId;
+
+
+}

+ 60 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RequestBaseModel.java

@@ -0,0 +1,60 @@
+package com.zhongshu.card.client.model.payment;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class RequestBaseModel {
+    /**
+     * 版本号
+     */
+    private final String version = "20191031";
+
+    /**
+     * 消息类型
+     */
+    private String msgType;
+
+    /**
+     * 商户号
+     */
+    private String mid;
+
+
+    /**
+     * 时间戳
+     */
+    private final String requestTimestamp;
+
+
+    /**
+     * 业务类型
+     */
+    private final String instMid = "MINIDEFAULT";
+
+
+    /**
+     * 签名算法
+     */
+    private final String signType = "SHA256";
+
+
+    /**
+     * 签名
+     */
+    private String sign;
+
+    public RequestBaseModel(String msgType ){
+        Date date = new Date();
+        this.msgType=msgType;
+        this.requestTimestamp = DateUtil.format(date, "yyyy-MM-dd HH:mm:ss");
+
+
+
+    }
+
+
+}

+ 38 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ResponseBaseModel.java

@@ -0,0 +1,38 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ResponseBaseModel {
+    /**
+     * 版本号
+     */
+    private String version;
+    /**
+     * 平台错误码
+     */
+    private String errCode;
+
+    /**
+     * 错误消息
+     */
+    private String errMsg;
+
+    /**
+     * 报文响应时间
+     */
+    private String requestTimestamp;
+
+
+    /**
+     * 签名
+     */
+    private String sign;
+
+
+}

+ 46 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/SubOrdersConfirmRequestModel.java

@@ -0,0 +1,46 @@
+package com.zhongshu.card.client.model.payment;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SubOrdersConfirmRequestModel extends RequestBaseModel {
+
+    /**
+     * 消息ID	跟下单支付时一致4217
+     */
+    private String msgId;
+
+    /**
+     * 订单日期
+     */
+    private String billDate;
+
+    /**
+     * 商户订单号
+     */
+    private String merOrderId;
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+    /**
+     * 分账信息
+     */
+    private List<CreateRequestModel.SubOrders> subOrders;
+
+    /**
+     * 平台商户分账金额
+     */
+    private Long platformAmount;
+
+
+
+    public SubOrdersConfirmRequestModel() {
+        super("subOrdersConfirm");
+    }
+}

+ 33 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/SubOrdersConfirmResponseModel.java

@@ -0,0 +1,33 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SubOrdersConfirmResponseModel extends ResponseBaseModel {
+
+    /**
+     * 业务类型
+     */
+    private String instMid;
+
+    /**
+     * 商户订单号
+     */
+    private String merOrderId;
+
+    /**
+     * 商户号
+     */
+    private String mid;
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+
+}

+ 15 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/TxAmountQueryRequestModel.java

@@ -0,0 +1,15 @@
+package com.zhongshu.card.client.model.payment;
+
+import lombok.Data;
+
+@Data
+public class TxAmountQueryRequestModel extends RequestBaseModel {
+
+    private String mchntNo;
+
+    private String mac;
+
+    public TxAmountQueryRequestModel() {
+        super("txAmountQuery");
+    }
+}

+ 17 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/BaseBodyRequest.java

@@ -0,0 +1,17 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import lombok.Data;
+
+@Data
+public class BaseBodyRequest {
+    /**
+     * 业务
+     */
+    private String transType;
+
+    /**
+     * 交易商户号
+     */
+    private String transMid;
+
+}

+ 22 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/BatchQueryRequest.java

@@ -0,0 +1,22 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BatchQueryRequest extends BaseBodyRequest {
+
+    private String transMid;
+    private String batchNo;
+    private String txnDate;
+
+    public BatchQueryRequest() {
+        Date date = new Date();
+        this.setTxnDate(DateUtil.format(date, "YYYYMMDD"));
+        this.setTransType("batchQuery");
+
+
+    }
+}

+ 85 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/BatchQueryResponse.java

@@ -0,0 +1,85 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BatchQueryResponse {
+
+    private String insCode;
+    private String batchNo;
+    private String txnDate;
+    private String totalQty;
+    private List<Detail> results;
+
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class Detail {
+
+        private String acctName;
+        private String acctNo;
+        private String bankNo;
+        private String bankTrace;
+        private String batchNo;
+        private String busiOrderId;
+        private String clearDate;
+        private String cmpDate;
+        private String comparison;
+        private String confirmOrderNo;
+        private String erpStatus;
+        private String feeTrans;
+        private String feeTx;
+        private String feeTxCalcType;
+        private String feeTxFlag;
+        private String feeTxT0;
+        private String feeTxT1;
+        private String insCode;
+        private String keyIndex;
+        private String merAppId;
+        private String merAppType;
+        private String merId;
+        private String merName;
+        private String merNo;
+        private String merOrderId;
+        private String moneyTxT0;
+        private String moneyTxT1;
+        private String notifyUrl;
+        private String purpose;
+        private String realMoneyTx;
+        private String realfeeTx;
+        private String refundDate;
+        private String refundNo;
+        private String remark;
+        private String reserve;
+        private String rtnReason;
+        private String settMid;
+        private String sndTime;
+        private String state;
+        private String subsidyFlag;
+        private String subsidyInst;
+        private String subsidyMoney;
+        private String summary;
+        private String totalAmt;
+        private String totalQty;
+        private String transAmount;
+        private String transMid;
+        private String txnAmt;
+        private String txnDate;
+        private String txnNo;
+        private String txnType;
+        private String useAcctType;
+        private String workDate;
+
+
+    }
+
+}

+ 24 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/CsscQueryRequest.java

@@ -0,0 +1,24 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import lombok.Data;
+
+@Data
+public class CsscQueryRequest extends BaseBodyRequest {
+
+    /**
+     * 明细交易流水号
+     */
+    private String txnNo;
+
+    /**
+     * 交易日期
+     */
+    private String txnDate;
+
+    public CsscQueryRequest() {
+
+
+        this.setTransType("csscQuery");
+    }
+
+}

+ 141 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/CsscQueryResponse.java

@@ -0,0 +1,141 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CsscQueryResponse  {
+
+    private String insCode;
+    private String batchNo;
+    private String txnDate;
+    private List<Results> results;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class Results{
+        /**
+         * 处理日期
+         */
+        private String  workDate;
+
+        /**
+         * 明细流水号
+         */
+        private String  txnNo;
+
+        /**
+         * 商户号
+         */
+        private String  merNo;
+
+        /**
+         *  商户多应用 ID
+         */
+        private String  merAppId;
+
+        /**
+         * 商户收款行号
+         */
+        private String  bankNo;
+
+        /**
+         * 收款账号
+         */
+        private String  acctNo;
+
+        /**
+         * 收款账户名
+         */
+        private String  acctName;
+
+        /**
+         * 提现金额
+         */
+        private String  txnAmt;
+
+        /**
+         * 实际提现净额
+         */
+        private String  realMoneyTx;
+
+        /**
+         * 实际提现手续费
+         */
+        private String  realFeeTx;
+
+        /**
+         * 垫资提现手续费
+         */
+        private String  feeTxT0;
+
+        /**
+         * 非垫资提现手续费
+         */
+        private String  feeTxT1;
+
+        /**
+         * 附言
+         */
+        private String  remark;
+
+        /**
+         * 状态
+         */
+        private String  state;
+
+        /**
+         * 对账标志
+         */
+        private String  comparison;
+
+        /**
+         * 勾兑日期
+         */
+        private String  cmpDate;
+
+        /**
+         * 退票日期
+         */
+        private String  refundDate;
+
+        /**
+         * 支付备注
+         */
+        private String  payNote;
+
+        /**
+         * 退票原因
+         */
+        private String  rtnReason;
+
+        /**
+         * 保留域
+         */
+        private String  reserve;
+
+        /**
+         * 加密索引
+         */
+        private String  keyIndex;
+
+        /**
+         * 提现 T1 金额
+         */
+        private String  moneyTxT1;
+
+        /**
+         * 提现 T0 金额
+         */
+        private String  moneyTxT0;
+
+
+
+    }
+}

+ 19 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/GetMoneyDetailRequest.java

@@ -0,0 +1,19 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import lombok.Data;
+
+@Data
+public class GetMoneyDetailRequest extends BaseBodyRequest {
+
+    /**
+     * 商户多应用 ID
+     */
+    private String mappId;
+
+    public GetMoneyDetailRequest() {
+
+
+        this.setTransType("getMoneyDetail");
+    }
+
+}

+ 106 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/GetMoneyDetailResponse.java

@@ -0,0 +1,106 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetMoneyDetailResponse {
+
+    /**
+     * 返回代码
+     */
+    private String errCode;
+
+    /**
+     * 返回结果
+     */
+    private String errMsg;
+
+    /**
+     * 应答明细
+     */
+    private List<MappDetail> data;
+
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class MappDetail {
+
+        /**
+         * 商户多应用 ID
+         */
+        private String mappId;
+
+        /**
+         * 响应码000000 为处理成功,其他失败
+         */
+        private String resCode;
+
+        /**
+         * 相应信息
+         */
+        private String resMsg;
+
+        /**
+         * 资管账户余额
+         */
+        private String moneyPay;
+
+        /**
+         * 暂缓金额
+         */
+        private String pmoney;
+
+        /**
+         * 待暂缓金额
+         */
+        private String pmoneyWait;
+
+        /**
+         * 本金已冻结金额
+         */
+        private String fmoney;
+
+        /**
+         * 本金待冻结金额
+         */
+        private String fmoneyWait;
+
+        /**
+         * 已扣收金额
+         */
+        private String kmoney;
+
+        /**
+         * 待扣收金额
+         */
+        private String kmoneyWait;
+
+        /**
+         * 实时业务本金垫
+         * 支
+         */
+        private String moneyPrepaySh;
+
+        /**
+         * 本金垫支
+         */
+        private String moneyPrepay;
+
+        /**
+         * 往期实时业务本
+         * 金垫支
+         */
+        private String moneyPrepayShHis;
+
+
+    }
+
+
+}

+ 16 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/GetMoneyRequest.java

@@ -0,0 +1,16 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import lombok.Data;
+
+@Data
+public class GetMoneyRequest extends BaseBodyRequest {
+
+    /**
+     * 商户多应用 ID
+     */
+    private String mappId;
+    public GetMoneyRequest(){
+        this.setTransType("getMoney");
+    }
+
+}

+ 56 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/GetMoneyResponse.java

@@ -0,0 +1,56 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GetMoneyResponse {
+
+    /**
+     * 返回编码000000 为成功,其他失败
+     */
+    private String errCode;
+
+    /**
+     * 返回信息
+     */
+    private String errMsg;
+
+    /**
+     * 应答明细
+     */
+    private List<MappId> data;
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class MappId {
+
+        /**
+         * 商户多应用 ID
+         */
+        private String mappId;
+
+        /**
+         * 响应码
+         */
+        private String resCode;
+
+        /**
+         * 相应信息
+         */
+        private String resMsg;
+
+        /**
+         * 账户提现余额
+         */
+        private String quotaUse;
+
+
+    }
+}

+ 92 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/MsgHead.java

@@ -0,0 +1,92 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+public class MsgHead {
+
+    /**
+     * 版本号
+     */
+    private final String versionID="1.0.1";
+
+    /**
+     * 字符编码
+     */
+    private final String charSet="UTF-8";
+
+    /**
+     * 请求方系统代码
+     */
+    private final String orgSenderID="0000000150";
+
+    /**
+     * 接受方系统代码
+     */
+    private final String orgReceiverID="0000008200";
+
+    /**
+     * 请求方日期
+     */
+    private String orgSendDate;
+
+    /**
+     * 请求方时间
+     */
+    private String orgSendTime;
+
+    /**
+     * 请求流水号
+     */
+    private String orgSendTransID;
+
+    /**
+     * 签名算法类型
+     */
+    private final String signType = "SHA256";
+
+    /**
+     * 接受方日期
+     */
+    private String orgRcvDate;
+
+    /**
+     * 接受方时间
+     */
+    private String orgRcvTime;
+
+    /**
+     * 接受方流水号
+     */
+    private String orgRcvTransID;
+
+    /**
+     * 返回码
+     */
+    private String errCode;
+
+    /**
+     * 返回码说明
+     */
+    private String errMsg;
+
+    /**
+     * 签名信息
+     */
+    private String sign;
+
+
+    public MsgHead() {
+        Date date = new Date();
+        this.setOrgSendDate(DateUtil.format(date, "YYYYMMDD"));
+        this.setOrgSendTime(DateUtil.format(date, "HHmmss"));
+        this.setOrgSendTransID("0000000150" + DateUtil.format(date, "YYYYMMDDHHMMSS") + RandomUtil.randomNumbers(6));
+    }
+
+}

+ 64 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/MsgHeadRequest.java

@@ -0,0 +1,64 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+public class MsgHeadRequest {
+
+    /**
+     * 版本号
+     */
+    private final String versionID="1.0.1";
+
+    /**
+     * 字符编码
+     */
+    private final String charSet="UTF-8";
+
+    /**
+     * 请求方系统代码
+     */
+    private String orgSenderID;
+
+    /**
+     * 接受方系统代码
+     */
+    private String orgReceiverID;
+
+    /**
+     * 请求方日期
+     */
+    private String orgSendDate;
+
+    /**
+     * 请求方时间
+     */
+    private String orgSendTime;
+
+    /**
+     * 请求流水号
+     */
+    private String orgSendTransID;
+
+    /**
+     * 签名算法类型
+     */
+    private final String signType = "SHA256";
+
+
+    public MsgHeadRequest() {
+        Date date = new Date();
+        this.setOrgSenderID("0000000150");
+        this.setOrgReceiverID("0000008200");
+        this.setOrgSendDate(DateUtil.format(date, "YYYYMMDD"));
+        this.setOrgSendTime(DateUtil.format(date, "HHmmss"));
+        this.setOrgSendTransID("0000000150" + DateUtil.format(date, "YYYYMMDDHHMMSS") + RandomUtil.randomNumbers(6));
+    }
+
+}

+ 183 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/WithdrawalsRequest.java

@@ -0,0 +1,183 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class WithdrawalsRequest extends BaseBodyRequest {
+
+    private final String version = "1.0.0";
+
+    /**
+     * 提现批次号
+     */
+    private String batchNo;
+
+    /**
+     * 交易日期
+     */
+    private String txnDate;
+
+    /**
+     * 发送时间
+     */
+    private String sndTime;
+
+    /**
+     * 总笔数
+     */
+    private Integer totalQty;
+
+    /**
+     * 总金额
+     */
+    private BigDecimal totalAmt;
+
+    /**
+     * 明细信息
+     */
+    private List<Deatil> detail;
+
+
+    public WithdrawalsRequest() {
+        Date date = new Date();
+        this.setTxnDate(DateUtil.format(date, "YYYYMMDD"));
+        this.setSndTime(DateUtil.format(date, "HHmmss"));
+        this.setTransType("withdrawals");
+
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Deatil {
+
+        /**
+         * 明细交易流水号明细交易流水号
+         * 需要唯一不重复,后期查询可用
+         */
+        private String txnNo;
+
+        /**
+         * 订单号
+         * 大华根据清算日期、订单号和上面的交易商户号,查询对账,判断是否可以发起提现
+         */
+        private String merOrderId;
+
+        /**
+         * 清算日期 yyyyMMdd
+         */
+        private String clearDate;
+
+        /**
+         * 商户号
+         */
+        private String merNo;
+
+        /**
+         * 商户名
+         */
+        private String merName;
+
+        /**
+         * 商户行号
+         */
+        private String bankNo;
+
+        /**
+         * 商户收款账号
+         */
+        private String acctNo;
+
+        /**
+         * 商户收款账户名
+         */
+        private String acctName;
+
+        /**
+         * 使用账户信息
+         * 类型
+         */
+        private final String useAcctType="02";
+
+        /**
+         * 提现金额
+         */
+        private String txnAmt;
+
+        /**
+         * 提现类型
+         */
+        private final String txnType="0";
+
+        /**
+         * 附言
+         */
+        private String remark;
+
+        /**
+         * 摘要
+         */
+        private String summary;
+
+        /**
+         * 用途
+         */
+        private String purpose;
+
+        /**
+         * 保留域
+         */
+        private String reserve;
+
+        /**
+         * 国密索引
+         */
+        private String keyIndex;
+
+        /**
+         * 提现手续费收
+         * 取类型
+         */
+        private final String feeTxFlag="1";
+
+        /**
+         * 提现手续费计
+         * 算模式
+         */
+        private final String feeTxCalcType="0";
+
+        /**
+         * 提现手续费
+         */
+        private String feeTx;
+
+        /**
+         * 交易手续费
+         */
+        private String feeTrans;
+
+        /**
+         * 费补计算模式
+         */
+        private String subsidyFlag;
+
+        /**
+         * 费补金额
+         */
+        private String subsidyMoney;
+
+        /**
+         * 费补机构
+         */
+        private String subsidyInst;
+    }
+
+}

+ 38 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/WithdrawalsResponse.java

@@ -0,0 +1,38 @@
+package com.zhongshu.card.client.model.payment.withdrawals;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+public class WithdrawalsResponse  {
+
+    /**
+     * 请求报文中提现批次号
+     */
+    private String batchNo;
+
+    /**
+     * 原报文上送的交易日期
+     */
+    private String txnDate;
+
+    /**
+     * 9000:处理中(表示受理成功)
+     * 其余编码视为失败
+     */
+    private String txnRespCode;
+
+    /**
+     * 响应编码具体描述
+     */
+    private String txnRespDesc;
+
+
+
+
+
+}

+ 29 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/zhongshu/CountDetail.java

@@ -0,0 +1,29 @@
+package com.zhongshu.card.client.model.payment.withdrawals.zhongshu;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class CountDetail {
+
+    @ApiModelProperty("资金余额")
+    private String moneyPay;
+
+    @ApiModelProperty("冻结金额")
+    private String fmoney;
+
+    @ApiModelProperty("待结算金额")
+    private String toBeSettled;
+
+    @ApiModelProperty("可提现金额")
+    private String quotaUse;
+
+    @ApiModelProperty("交易笔数")
+    private Integer transactionNumber;
+}

+ 17 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/withdrawals/zhongshu/Withdraw.java

@@ -0,0 +1,17 @@
+package com.zhongshu.card.client.model.payment.withdrawals.zhongshu;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Withdraw {
+
+    @ApiModelProperty("提现金额")
+    private BigDecimal amount;
+}

+ 24 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/ApplyWithdrawalsModel.java

@@ -0,0 +1,24 @@
+package com.zhongshu.card.client.model.payment.zswl;
+
+import com.zhongshu.card.client.type.Channel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ApplyWithdrawalsModel {
+
+    @NotNull
+    @ApiModelProperty(value = "渠道", required = true)
+    private Channel channel;
+    @ApiModelProperty(value = "店铺id", hidden = true)
+    private String shopId;
+
+    @ApiModelProperty(value = "是否为平台", hidden = true)
+    private Boolean platform;
+}

+ 26 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/AuditWithdrawalsModel.java

@@ -0,0 +1,26 @@
+package com.zhongshu.card.client.model.payment.zswl;
+
+import com.zhongshu.card.client.type.OrderType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AuditWithdrawalsModel {
+    @NotNull
+    @ApiModelProperty(value = "PASS_WITHDRAW,REFUSAL_WITHDRAW", required = true)
+    private OrderType auditType;
+
+    @NotNull
+    @ApiModelProperty(value = "提现编号", required = true)
+    private String batchNo;
+
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

+ 20 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/CreatePayment2Model.java

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.model.payment.zswl;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CreatePayment2Model extends CreatePaymentModel {
+    @NotNull
+    @ApiModelProperty(value = "平台用户id", required = true)
+    private String authUserId;
+
+
+
+}

+ 61 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/CreatePaymentModel.java

@@ -0,0 +1,61 @@
+package com.zhongshu.card.client.model.payment.zswl;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CreatePaymentModel {
+
+
+    @NotNull
+    @ApiModelProperty(value = "订单号", required = true)
+    private String orderNo;
+
+    @NotNull
+    @ApiModelProperty(value = "订单号", required = true,example = "微信:wx.unifiedOrder;支付宝:trade.create;云闪付uac.miniOrder")
+    private String msgType;
+
+    @ApiModelProperty(value = "商户附加数据")
+    private String attachedData;
+
+    @ApiModelProperty(value = "账单描述")
+    private String orderDesc;
+
+    @ApiModelProperty(value = "操作员工号")
+    private String employeeNo;
+
+    @ApiModelProperty(value = "回跳地址")
+    private String returnUrl;
+
+
+    /**
+     * 付款人openid
+     */
+    @ApiModelProperty(value = "付款人openid 微信小程序必传")
+    private String subOpenId;
+
+    /**
+     * 支付宝买家ID
+     */
+    @ApiModelProperty(value = "支付宝买家ID 支付宝小程序必传")
+    private String userId;
+
+    /**
+     * 商户微信appId
+     */
+    @ApiModelProperty(value = "商户微信appId")
+    private String subAppId;
+
+
+
+
+
+
+
+}

+ 24 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/PaymentBindModel.java

@@ -0,0 +1,24 @@
+package com.zhongshu.card.client.model.payment.zswl;
+
+import com.zhongshu.card.client.type.Channel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaymentBindModel {
+
+    @NotNull
+    @ApiModelProperty(value = "主商户id", required = true)
+    private Channel channel;
+
+    @NotNull
+    @ApiModelProperty(value = "银联数据id", required = true)
+    private String infoId;
+
+}

+ 69 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/PaymentInfoModel.java

@@ -0,0 +1,69 @@
+package com.zhongshu.card.client.model.payment.zswl;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaymentInfoModel {
+
+
+    private String id;
+    // 公司名称
+    @NotNull
+    @ApiModelProperty(value = "公司名称", required = true)
+    private String companyName;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String merNo;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String tid;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String accesserId;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String key;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String h5PageUrl;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String pcPageUrl;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String interfaceUrl;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String payUrl;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String payKey;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String withdrawalsUrl;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String withdrawalsKey;
+
+    @NotNull
+    @ApiModelProperty(required = true)
+    private String notifyUrl;
+}

+ 30 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/RefundModel.java

@@ -0,0 +1,30 @@
+package com.zhongshu.card.client.model.payment.zswl;
+
+import com.zhongshu.card.client.model.payment.CreateRequestModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RefundModel {
+
+    @ApiModelProperty(value = "订单号", required = true)
+    public String orderNo;
+
+    @ApiModelProperty(value = "退款金额", required = true)
+    public Long refundAmount;
+
+    @ApiModelProperty(value = "退款描述")
+    public String refundDesc;
+
+    @ApiModelProperty(value = "平台退款金额", required = true)
+    public Long platformAmount;
+
+    @ApiModelProperty(value = "退款明细", required = true)
+    public List<CreateRequestModel.SubOrders> subOrders;
+}

+ 175 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/zswl/SyncInformModel.java

@@ -0,0 +1,175 @@
+package com.zhongshu.card.client.model.payment.zswl;
+
+import com.zhongshu.card.client.model.payment.ResponseBaseModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SyncInformModel extends ResponseBaseModel {
+    /**
+     * 交易状态
+     * (1).NEW_ORDER新订单
+     * (2).TRADE_CLOSED 在指定时间段内未支付时关闭的交易;在交易完成全额退款成功时关闭的交易;支付失败的交易。 TRADE_CLOSED的交易不允许进行任何操作。
+     * (3).WAIT_BUYER_PAY 交易创建,等待买家付款。
+     * (4).TRADE_SUCCESS 支付成功
+     * (5).TRADE_REFUND 订单转入退货流程 退货可能是部分也可能是全部。
+     * (6).UNKNOWN 不明确的交易状态
+     */
+    private String status;
+
+    /**
+     * 支付银行信息
+     */
+    private String bankCardNo;
+
+    /**
+     * 资金渠道
+     */
+    private String billFunds;
+
+    /**
+     * 资金渠道说明
+     */
+    private String billFundsDesc;
+
+    /**
+     * 买家ID
+     */
+    private String buyerId;
+
+    /**
+     * 买家用户名
+     */
+    private String buyerUsername;
+
+    /**
+     * 网付计算的优惠金额
+     */
+    private String couponAmount;
+
+    /**
+     * 实付金额
+     */
+    private String buyerPayAmount;
+
+    /**
+     * 订单金额,单位分
+     */
+    private String totalAmount;
+
+    /**
+     * 开票金额
+     */
+    private String invoiceAmount;
+
+    /**
+     * 实收金额
+     */
+    private String receiptAmount;
+
+
+    /**
+     * 平台流水号
+     */
+    private String seqId;
+
+    /**
+     * 清分	如果来源方传了bankRefId就等于bankRefId,否则等于seqId
+     */
+    private String settleRefId;
+
+
+    /**
+     * 第三方订单号
+     */
+    private String targetOrderId;
+
+    /**
+     * 目标平台代码
+     */
+    private String targetSys;
+
+    /**
+     * 目标平台的状态
+     */
+    private String targetStatus;
+
+    /**
+     * 小程序支付用的请求报文,带有签名信息
+     */
+    private String miniPayRequest;
+
+    /**
+     * 商户订单号
+     */
+    private String merOrderId;
+
+    /**
+     * 商户号
+     */
+    private String mid;
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+    /**
+     * 操作员工号
+     */
+    private String employeeNo;
+
+    /**
+     * 商户附加数据
+     */
+    private String attachedData;
+
+    /**
+     * 订单原始金额,单位分
+     */
+    private String originalAmount;
+
+
+    /**
+     * 平台商户分账金额
+     */
+    private String platformAmount;
+
+    /**
+     * 分账明细
+     */
+    private String subOrders;
+
+    /**
+     * 付款人openid
+     */
+    private String subOpenId;
+
+    /**
+     * 商户微信appId
+     */
+    private String subAppId;
+
+    /**
+     * 扩展字段1
+     */
+    private String extend1;
+
+    /**
+     * 扩展字段2
+     */
+    private String extend2;
+
+    /**
+     * 扩展字段3
+     */
+    private String extend3;
+
+    /**
+     * 扩展字段4
+     */
+    private String extend4;
+}

+ 202 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/PaymentModel.java

@@ -0,0 +1,202 @@
+package com.zhongshu.card.client.model.sign;
+
+import com.zhongshu.card.client.model.payment.CreateRequestModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaymentModel {
+
+
+    /**
+     * 订单过期时间
+     */
+    @ApiModelProperty(value = "订单过期时间",required = true)
+    private String expireTime;
+
+    /**
+     * 商户订单号
+     */
+    @ApiModelProperty("商户订单号")
+    private String merOrderId;
+
+    /**
+     * 商户业务订单号
+     */
+    @ApiModelProperty("商户业务订单号")
+    private String busiOrderId;
+
+    /**
+     * 商户号
+     */
+    @ApiModelProperty(value = "商户号",required = true)
+    private String mid;
+
+    /**
+     * 终端号
+     */
+    @ApiModelProperty(value = "终端号",required = true)
+    private String tid;
+
+
+    /**
+     * 商户附加数据
+     */
+    @ApiModelProperty("商户附加数据")
+    private String attachedData;
+
+    /**
+     * 账单描述
+     */
+    @ApiModelProperty("账单描述")
+    private String orderDesc;
+
+    /**
+     * 操作员工号
+     */
+    @ApiModelProperty("操作员工号")
+    private String employeeNo;
+
+    /**
+     * 订单原始金额,单位分
+     */
+    @ApiModelProperty("订单原始金额,单位分")
+    private BigDecimal originalAmount;
+
+    /**
+     * 支付总金额,单位分
+     */
+    @ApiModelProperty(value = "支付总金额,单位分",required = true)
+    private BigDecimal totalAmount;
+
+    /**
+     * 支付结果通知地址
+     */
+    @ApiModelProperty("支付结果通知地址")
+    private String notifyUrl;
+
+    /**
+     * 回跳地址
+     */
+    @ApiModelProperty("回跳地址")
+    private String returnUrl;
+
+    /**
+     * 异步分账标记
+     */
+    @ApiModelProperty("异步分账标记")
+    private Boolean asynDivisionFlag;
+
+    /**
+     * 分账标记
+     */
+    @ApiModelProperty("分账标记")
+    private Boolean divisionFlag;
+
+    /**
+     * 分账信息
+     */
+    @ApiModelProperty("分账信息")
+    private List<CreateRequestModel.SubOrders> subOrders;
+
+    /**
+     * 平台商户分账金额
+     */
+    @ApiModelProperty("平台商户分账金额")
+    private BigDecimal platformAmount;
+
+    /**
+     * 付款人openid
+     */
+    @ApiModelProperty("付款人openid")
+    private String subOpenId;
+
+    /**
+     * 支付宝买家ID
+     */
+    @ApiModelProperty("支付宝买家ID")
+    private String userId;
+
+    /**
+     * 商户微信appId
+     */
+    @ApiModelProperty("商户微信appId")
+    private String subAppId;
+
+    /**
+     * 是否需要限制信用卡支付
+     */
+    @ApiModelProperty("是否需要限制信用卡支付")
+    private Boolean limitCreditCard;
+
+    /**
+     * 标识是否是担保交易
+     */
+    @ApiModelProperty("标识是否是担保交易")
+    private Boolean secureTransaction;
+
+    /**
+     * 开具发票
+     */
+    @ApiModelProperty("开具发票")
+    private String issueInvoice;
+
+    /**
+     * 是否需要实名认证
+     */
+    @ApiModelProperty("是否需要实名认证")
+    private String fixBuyer;
+
+    /**
+     * 实名认证姓名
+     */
+    @ApiModelProperty("实名认证姓名")
+    private String name;
+
+    /**
+     * 实名认证手机号
+     */
+    @ApiModelProperty("实名认证手机号")
+    private String mobile;
+
+    /**
+     * 实名认证证件类型
+     */
+    @ApiModelProperty("实名认证证件类型")
+    private String certType;
+
+    /**
+     * 实名认证证件号
+     */
+    @ApiModelProperty("实名认证证件号")
+    private String certNo;
+
+    /**
+     * 扩展字段1
+     */
+    @ApiModelProperty("扩展字段")
+    private String extend1;
+
+    /**
+     * 扩展字段2
+     */
+    private String extend2;
+
+    /**
+     * 扩展字段3
+     */
+    private String extend3;
+
+    /**
+     * 扩展字段4
+     */
+    private String extend4;
+}

+ 29 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/AcctchangeVerifyAmtRequestModel.java

@@ -0,0 +1,29 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import lombok.Data;
+
+@Data
+public class AcctchangeVerifyAmtRequestModel extends BaseRequestModel{
+
+    /**
+     * 自助签约平台流水号 变更档案资料上传接口返回
+     */
+    private String ums_reg_id;
+
+    /**
+     * 变更档案资料上传接口中提供的对公账号
+     */
+    private String company_account;
+
+    /**
+     * 交易金额,对公账户收到的验证交易金额,以分为单位
+     */
+    private String trans_amt;
+
+
+
+    public AcctchangeVerifyAmtRequestModel(){
+        super("acctchange_verify_amt");
+
+    }
+}

+ 21 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/AgreementSignRequestModel.java

@@ -0,0 +1,21 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import lombok.Data;
+
+/**
+ * 3.3  前台签约接口
+ */
+@Data
+public class AgreementSignRequestModel extends BaseRequestModel {
+
+    /**
+     * 档案资料上传接口返回
+     */
+    private String ums_reg_id;
+
+    private String pcOrH5;
+
+    public AgreementSignRequestModel() {
+        super("agreement_sign");
+    }
+}

+ 20 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/AlterQryRequestModel.java

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import lombok.Data;
+
+/**
+ *  3.11  变更入网状态查询接口
+ */
+@Data
+public class AlterQryRequestModel extends BaseRequestModel {
+
+
+    /**
+     * 档案资料上传接口返回(后台接入平台参数)
+     */
+    private String ums_reg_id;
+    public AlterQryRequestModel(){
+        super("alter_qry");
+
+    }
+}

+ 41 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/AlterQryResponseModel.java

@@ -0,0 +1,41 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AlterQryResponseModel extends BaseResponseModel {
+
+
+    /**
+     * 申请状态
+     * 00:签约中
+     * 01:签约成功(中间状态)
+     * 02:入网审核中(人工审核流程)
+     * 03:入网成功(最终成功状态)
+     * 04:入网失败
+     * 99:其它错误
+     */
+    private String apply_status;
+    /**
+     * 申请状态对应的描述信息
+     * 00:签约中
+     * 01:签约成功(中间状态)
+     * 02:入网审核中(人工审核流程)
+     * 03:入网成功(最终成功状态)
+     * 04:入网失败
+     * 99:其它错误
+     */
+    private String apply_status_msg;
+
+
+    /**
+     * 失败原因,协议退回原因
+     */
+    private String fail_reason;
+
+
+}

+ 21 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/AlterSignRequestModel.java

@@ -0,0 +1,21 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import lombok.Data;
+
+/**
+ * 3.10  变更签约接口
+ */
+@Data
+public class AlterSignRequestModel extends BaseRequestModel {
+
+    /**
+     * 商户账户信息变更接口返回
+     */
+    private String ums_reg_id;
+
+    public AlterSignRequestModel() {
+
+        super("alter_sign");
+
+    }
+}

+ 26 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/ApplyQryRequestModel.java

@@ -0,0 +1,26 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+
+import lombok.Data;
+
+/**
+ * 3.4  入网状态查询接口
+ */
+@Data
+public class ApplyQryRequestModel extends BaseRequestModel {
+
+    /**
+     * 档案资料上传接口返回(后台接入平台参数)
+     */
+    private String ums_reg_id;
+
+    /**
+     * epId 平台id
+     */
+    private String accesser_acct;
+
+    public ApplyQryRequestModel(){
+        super("apply_qry");
+
+    }
+}

+ 265 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/ApplyQryResponseModel.java

@@ -0,0 +1,265 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ApplyQryResponseModel extends BaseResponseModel {
+
+    /**
+     * epId
+     */
+    @ApiModelProperty("epId")
+    private String accesser_acct;
+
+    /**
+     * 签约流水号
+     */
+    @ApiModelProperty("签约流水号")
+    private String ums_reg_id;
+    /**
+     * 入网状态
+     * 00:签约中
+     * 01:签约成功(中间状态)
+     * 02:入网审核中(人工审核流程)
+     * 03:入网成功(最终成功状态)
+     * 04:入网失败
+     * 05:对公账户待验证或异常(对公账户状态)
+     * 06:风控审核中(系统审核状态)
+     * 11:短信签生成合同成功(短信签约流程)
+     * 18:资料填写中(前端流程状态)
+     * 28:资料验证失败
+     * 31:冻结账户
+     * 32:客服视频核验中(可再次调用签约接口)
+     * 33:客服视频核验失败(可再次调用签约接口)
+     * 34:待客户经理补充材料(等待客户经理处理工单)
+     * 35:DM已冻结
+     * <p>
+     * 99:其它错误
+     */
+    @ApiModelProperty("入网状态 00:签约中 01:签约成功(中间状态) 02:入网审核中(人工审核流程) 03:入网成功(最终成功状态) 04:入网失败 05:对公账户待验证或异常(对公账户状态) 06:风控审核中(系统审核状态) 11:短信签生成合同成功(短信签约流程) 18:资料填写中(前端流程状态) 28:资料验证失败 31:冻结账户 32:客服视频核验中(可再次调用签约接口) 33:客服视频核验失败(可再次调用签约接口) 34:待客户经理补充材料(等待客户经理处理工单) 35:DM已冻结\n" +
+            "99:其它错误")
+    private String apply_status;
+
+    /**
+     * 状态消息
+     * 00:签约中
+     * 01:签约成功(中间状态)
+     * 02:入网审核中(人工审核流程)
+     * 03:入网成功(最终成功状态)
+     * 04:入网失败
+     * 05:对公账户待验证或异常(对公账户状态)
+     * 06:风控审核中(系统审核状态)
+     * 11:短信签生成合同成功(短信签约流程)
+     * 18:资料填写中(前端流程状态)
+     * 28:资料验证失败
+     * 31:冻结账户
+     * 32:客服视频核验中(可再次调用签约接口)
+     * 33:客服视频核验失败(可再次调用签约接口)
+     * 34:待客户经理补充材料(等待客户经理处理工单)
+     * 35:DM已冻结
+     * <p>
+     * 99:其它错误
+     */
+    @ApiModelProperty("状态消息 00:签约中 01:签约成功(中间状态) 02:入网审核中(人工审核流程) 03:入网成功(最终成功状态) 04:入网失败 05:对公账户待验证或异常(对公账户状态) 06:风控审核中(系统审核状态) 11:短信签生成合同成功(短信签约流程) 18:资料填写中(前端流程状态) 28:资料验证失败 31:冻结账户 32:客服视频核验中(可再次调用签约接口) 33:客服视频核验失败(可再次调用签约接口) 34:待客户经理补充材料(等待客户经理处理工单) 35:DM已冻结\n" +
+            "99:其它错误")
+    private String apply_status_msg;
+
+    /**
+     * 商户号
+     */
+    @ApiModelProperty("商户号,入网成功时返回")
+    private String mer_no;
+
+    /**
+     * 企业号 对于入网成功且开通泛账户的商户,返回企业号,此返回参数非实时更新
+     */
+    @ApiModelProperty("企业号 ")
+    private String company_no;
+
+    /**
+     * 失败原因 协议退回原因
+     */
+    @ApiModelProperty("失败原因")
+    private String fail_reason;
+
+    /**
+     * 商户多应用信息
+     * mapp_no;
+     * term_app_no_list;
+     * card_type_fee_list;  费率 card_fee ; 卡种card_type
+     * isPayable;
+     * contract_state;
+     * contract_state_msg;
+     * wechatPayRecordMchntNo;
+     * aliPayRecordMchntNo;
+     */
+    @ApiModelProperty("商户多应用信息")
+    private List<MappInfoList> mapp_info_list;
+
+    /**
+     * C扫B多应用商户号是否可支付
+     * "00","可支付"
+     * "01","不可支付,商户信息同步失败"
+     * "02","网付平台接口未响应"03","apply_status非03入网成功状态"
+     * "04","没有开通C扫B多应用商户号或者B扫C商户号"
+     * "05","不可支付,T表同步中,在30分钟内"
+     * "06","网付接口查询不到此商户号"
+     */
+    @ApiModelProperty("C扫B多应用商户号是否可支付 \"00\",\"可支付\" \"01\",\"不可支付,商户信息同步失败\" \"02\",\"网付平台接口未响应\"03\",\"apply_status非03入网成功状态\" \"04\",\"没有开通C扫B多应用商户号或者B扫C商户号\" \"05\",\"不可支付,T表同步中,在30分钟内\" \"06\",\"网付接口查询不到此商户号\"")
+    private String isPayable;
+    /**
+     * 短信签合同状态
+     * 100:生成合同成功
+     * 101:生成合同失败
+     * 102:发送合同成功
+     * 103:发送合同失败
+     * 104:签署合同成功
+     * 106:签署合同失败
+     * 107:甲方签署合同成功
+     * 108:甲方签署合同失败
+     * 109:标记合同生效成功
+     * 110:标记合同生效失败
+     * 111:撤销合同成功
+     * 112:撤销合同失败
+     * 113:签署合同超时
+     */
+    @ApiModelProperty("短信签合同状态 100:生成合同成功 101:生成合同失败 102:发送合同成功 103:发送合同失败 104:签署合同成功 106:签署合同失败 107:甲方签署合同成功 108:甲方签署合同失败 109:标记合同生效成功 110:标记合同生效失败 111:撤销合同成功 112:撤销合同失败 113:签署合同超时")
+    private String contract_state;
+
+    /**
+     * 短信签合同描述
+     * 100:生成合同成功
+     * 101:生成合同失败
+     * 102:发送合同成功
+     * 103:发送合同失败
+     * 104:签署合同成功
+     * 106:签署合同失败
+     * 107:甲方签署合同成功
+     * 108:甲方签署合同失败
+     * 109:标记合同生效成功
+     * 110:标记合同生效失败
+     * 111:撤销合同成功
+     * 112:撤销合同失败
+     * 113:签署合同超时
+     */
+    @ApiModelProperty("短信签合同描述 100:生成合同成功 101:生成合同失败 102:发送合同成功 103:发送合同失败 104:签署合同成功 106:签署合同失败 107:甲方签署合同成功 108:甲方签署合同失败 109:标记合同生效成功 110:标记合同生效失败 111:撤销合同成功 112:撤销合同失败 113:签署合同超时")
+    private String contract_state_msg;
+
+
+    /**
+     * 微信备案商户号
+     */
+    @ApiModelProperty("微信备案商户号")
+    private String wechatPayRecordMchntNo;
+
+    /**
+     * 支付宝备案商户号
+     */
+    @ApiModelProperty("支付宝备案商户号")
+    private String aliPayRecordMchntNo;
+
+    /**
+     * 银联云闪付备案商户号
+     */
+    @ApiModelProperty("银联云闪付备案商户号")
+    private String unionPayRecordMchntNo;
+
+
+    /**
+     * 主从关系绑定结果
+     */
+    @ApiModelProperty("主从关系绑定结果")
+    private String merMsRelation;
+
+    /**
+     * 数字人民币钱包集合
+     * mappNo 商户号
+     * dcepStatus 进件状态
+     * 0=未进件
+     * 1=进件失败
+     * 2=进行中
+     * 3进件成功
+     * walletId 钱包ID
+     * submchnt_info_list 分店列表,submchntId 分店id ,submchntName 门店全称  submchntBriefName 门店简称term_app_no_list多应用终端号列表
+     */
+    private String dcepInfoList;
+
+    @Data
+    @AllArgsConstructor
+    public class MappInfoList {
+
+        @ApiModelProperty("多应用商户号")
+        private String mapp_no;
+
+        @ApiModelProperty("多应用终端号列表")
+        private String term_app_no_list;
+
+        @ApiModelProperty("业务类型ID")
+        private String apptype_id;
+
+        @ApiModelProperty("卡种费率列表")
+        private List<CardTypeFeeLis> card_type_fee_list;
+
+
+    }
+
+    @Data
+    @AllArgsConstructor
+    class CardTypeFeeLis {
+
+        @ApiModelProperty("卡种")
+        private String card_type;
+
+        @ApiModelProperty("费率")
+        private String card_fee;
+
+
+    }
+
+    @Data
+    @AllArgsConstructor
+    class DcepInfoList {
+        @ApiModelProperty("商户号")
+        private String mappNo;
+
+
+        @ApiModelProperty("进件状态 0=未进件\n" +
+                "1=进件失败\n" +
+                "2=进行中\n" +
+                "3进件成功\n")
+        private String dcepStatus;
+
+        @ApiModelProperty("钱包ID")
+        private String walletId;
+
+        @ApiModelProperty("分店列表")
+        private List<SubmchntInfoList> submchnt_info_list;
+
+    }
+
+    @Data
+    @AllArgsConstructor
+    class SubmchntInfoList {
+
+        @ApiModelProperty("分店Id")
+        private String submchntId;
+
+        @ApiModelProperty("门店全称")
+        private String submchntName;
+
+        @ApiModelProperty("门店简称")
+        private String submchntBriefName;
+
+        @ApiModelProperty("多应用终端号列表")
+        private String term_app_no_list;
+
+    }
+
+}

+ 50 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/BaseRequestModel.java

@@ -0,0 +1,50 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BaseRequestModel {
+
+
+    /**
+     * 接口名称
+     */
+    private String service;
+
+    /**
+     * 接入平台id
+     */
+    String accesser_id;
+
+
+    /**
+     * 签名方式
+     */
+    final String sign_type = "SHA-256";
+
+
+    /**
+     * 请求时间
+     */
+    private String request_date;
+
+    /**
+     * 请求流水号
+     */
+    private String request_seq;
+
+
+    public BaseRequestModel(String service) {
+
+        Date date = new Date();
+        request_date = DateUtil.format(date, "yyyyMMddhhmmss");
+        request_seq = IdUtil.simpleUUID();
+        this.service = service;
+    }
+
+
+}

+ 30 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/BaseResponseModel.java

@@ -0,0 +1,30 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseResponseModel {
+
+    /**
+     * 状态码
+     */
+    @ApiModelProperty("银联状态码")
+    private String res_code;
+
+    /**
+     * 状态信息
+     */
+    @ApiModelProperty("状态信息")
+    private String res_msg;
+
+    /**
+     * 请求流水号
+     */
+    @ApiModelProperty("请求流水号")
+    private String request_seq;
+}

+ 25 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/BranchBankListRequestModel.java

@@ -0,0 +1,25 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import lombok.Data;
+
+/**
+ * 3.5  所属支行查询接口
+ */
+@Data
+public class BranchBankListRequestModel extends BaseRequestModel {
+
+    /**
+     * 查询关键字
+     */
+    private String key;
+    /**
+     *地区code (3.13接口查询)
+     */
+    private String areaCode;
+
+
+    public BranchBankListRequestModel() {
+        super("branch_bank_list");
+
+    }
+}

+ 36 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/BranchBankListResponseModel.java

@@ -0,0 +1,36 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BranchBankListResponseModel extends BaseResponseModel {
+
+    @ApiModelProperty("支行列表")
+    private ArrayList<Bank> branchBankList;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    class Bank {
+
+        /**
+         * 开户行行号
+         */
+        @ApiModelProperty("开户行行号")
+        private String code;
+
+        /**
+         * 所属支行名称
+         */
+        @ApiModelProperty("所属支行名称")
+        private String bankBranchName;
+
+    }
+}

+ 30 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/sign/dahua/CompanyAccountVerifyRequestModel.java

@@ -0,0 +1,30 @@
+package com.zhongshu.card.client.model.sign.dahua;
+
+import lombok.Data;
+
+/**
+ * 3.6  对公账户认证接口
+ */
+@Data
+public class CompanyAccountVerifyRequestModel extends BaseRequestModel {
+
+    /**
+     * 档案资料上传接口返回
+     */
+    private String ums_reg_id;
+
+    /**
+     * 档案资料上传接口中提供的对公账号
+     */
+    private String company_account;
+
+    /**
+     * 交易金额
+     */
+    private String trans_amt;
+
+    public CompanyAccountVerifyRequestModel(){
+        super("company_account_verify");
+
+    }
+}

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません