From 0e26b22e392523069153a1b05ea5c7a89b4952ac Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Sat, 6 Apr 2019 22:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=EF=BC=9A=E5=8E=BB=E9=99=A4?=
=?UTF-8?q?=20pay=20=E6=A8=A1=E5=9D=97=E7=9A=84=20setting=20getting=20?=
=?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pay/pay-application/pom.xml | 47 +----
pay/pay-service-api/pom.xml | 21 ++-
.../mall/pay/api/bo/PayTransactionBO.java | 160 +-----------------
.../pay/api/bo/PayTransactionSubmitBO.java | 25 +--
.../pay/api/dto/PayTransactionCreateDTO.java | 79 +--------
.../pay/api/dto/PayTransactionSubmitDTO.java | 43 +----
pay/pay-service-impl/pom.xml | 26 +--
.../mall/pay/biz/dataobject/PayAppDO.java | 42 +----
.../mall/pay/biz/dataobject/PayLogDO.java | 7 +-
.../mall/pay/biz/dataobject/PayRefundDO.java | 5 +
.../dataobject/PayRepeatTransactionDO.java | 5 +
.../pay/biz/dataobject/PayTransactionDO.java | 158 +----------------
.../dataobject/PayTransactionExtensionDO.java | 69 +-------
.../dataobject/PayTransactionNotifyLogDO.java | 51 +-----
.../PayTransactionNotifyTaskDO.java | 105 +-----------
15 files changed, 91 insertions(+), 752 deletions(-)
diff --git a/pay/pay-application/pom.xml b/pay/pay-application/pom.xml
index 850f1bc1a..8f7bf977b 100644
--- a/pay/pay-application/pom.xml
+++ b/pay/pay-application/pom.xml
@@ -22,12 +22,16 @@
common-framework
1.0-SNAPSHOT
-
cn.iocoder.mall
pay-service-impl
1.0-SNAPSHOT
+
+ cn.iocoder.mall
+ admin-sdk
+ 1.0-SNAPSHOT
+
org.springframework.boot
@@ -43,42 +47,24 @@
com.alibaba
dubbo
- 2.6.5
-
com.alibaba.boot
dubbo-spring-boot-starter
- 0.2.1.RELEASE
org.apache.curator
curator-framework
- 2.12.0
-
-
-
- org.mapstruct
- mapstruct
- ${org.mapstruct.version}
io.springfox
springfox-swagger2
- 2.9.2
io.springfox
springfox-swagger-ui
- 2.9.2
-
-
-
- org.mapstruct
- mapstruct
- ${org.mapstruct.version}
@@ -87,12 +73,6 @@
true
-
- cn.iocoder.mall
- admin-sdk
- 1.0-SNAPSHOT
-
-
@@ -122,30 +102,15 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.5.1
-
-
- 1.8
-
-
- org.mapstruct
- mapstruct-processor
- ${org.mapstruct.version}
-
-
-
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
\ No newline at end of file
+
diff --git a/pay/pay-service-api/pom.xml b/pay/pay-service-api/pom.xml
index 42799e634..2bf007bbc 100644
--- a/pay/pay-service-api/pom.xml
+++ b/pay/pay-service-api/pom.xml
@@ -15,9 +15,26 @@
cn.iocoder.mall
common-framework
1.0-SNAPSHOT
- compile
+
+
+
+ javax.validation
+ validation-api
+
+
+
+ org.mapstruct
+ mapstruct
+
+
+ org.mapstruct
+ mapstruct-jdk8
+
+
+ org.projectlombok
+ lombok
-
\ No newline at end of file
+
diff --git a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java
index 1ef08264a..a1803089c 100644
--- a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java
+++ b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java
@@ -1,10 +1,15 @@
package cn.iocoder.mall.pay.api.bo;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
import java.util.Date;
/**
* 支付交易 BO
*/
+@Data
+@Accessors(chain = true)
public class PayTransactionBO {
/**
@@ -86,157 +91,4 @@ public class PayTransactionBO {
*/
private Date createTime;
- public Integer getId() {
- return id;
- }
-
- public PayTransactionBO setId(Integer id) {
- this.id = id;
- return this;
- }
-
- public String getAppId() {
- return appId;
- }
-
- public PayTransactionBO setAppId(String appId) {
- this.appId = appId;
- return this;
- }
-
- public String getCreateIp() {
- return createIp;
- }
-
- public PayTransactionBO setCreateIp(String createIp) {
- this.createIp = createIp;
- return this;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public PayTransactionBO setOrderId(String orderId) {
- this.orderId = orderId;
- return this;
- }
-
- public String getOrderSubject() {
- return orderSubject;
- }
-
- public PayTransactionBO setOrderSubject(String orderSubject) {
- this.orderSubject = orderSubject;
- return this;
- }
-
- public String getOrderDescription() {
- return orderDescription;
- }
-
- public PayTransactionBO setOrderDescription(String orderDescription) {
- this.orderDescription = orderDescription;
- return this;
- }
-
- public String getOrderMemo() {
- return orderMemo;
- }
-
- public PayTransactionBO setOrderMemo(String orderMemo) {
- this.orderMemo = orderMemo;
- return this;
- }
-
- public Integer getPrice() {
- return price;
- }
-
- public PayTransactionBO setPrice(Integer price) {
- this.price = price;
- return this;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public PayTransactionBO setStatus(Integer status) {
- this.status = status;
- return this;
- }
-
- public Date getExpireTime() {
- return expireTime;
- }
-
- public PayTransactionBO setExpireTime(Date expireTime) {
- this.expireTime = expireTime;
- return this;
- }
-
- public Date getFinishTime() {
- return finishTime;
- }
-
- public PayTransactionBO setFinishTime(Date finishTime) {
- this.finishTime = finishTime;
- return this;
- }
-
- public Integer getExtensionId() {
- return extensionId;
- }
-
- public PayTransactionBO setExtensionId(Integer extensionId) {
- this.extensionId = extensionId;
- return this;
- }
-
- public Integer getPayChannel() {
- return payChannel;
- }
-
- public PayTransactionBO setPayChannel(Integer payChannel) {
- this.payChannel = payChannel;
- return this;
- }
-
- public Date getPaymentTime() {
- return paymentTime;
- }
-
- public PayTransactionBO setPaymentTime(Date paymentTime) {
- this.paymentTime = paymentTime;
- return this;
- }
-
- public Date getNotifyTime() {
- return notifyTime;
- }
-
- public PayTransactionBO setNotifyTime(Date notifyTime) {
- this.notifyTime = notifyTime;
- return this;
- }
-
- public String getTradeNo() {
- return tradeNo;
- }
-
- public PayTransactionBO setTradeNo(String tradeNo) {
- this.tradeNo = tradeNo;
- return this;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public PayTransactionBO setCreateTime(Date createTime) {
- this.createTime = createTime;
- return this;
- }
-
-}
\ No newline at end of file
+}
diff --git a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java
index 1fc33d240..affad3d1e 100644
--- a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java
+++ b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java
@@ -1,8 +1,13 @@
package cn.iocoder.mall.pay.api.bo;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
/**
* 支付交易提交结果 BO
*/
+@Data
+@Accessors(chain = true)
public class PayTransactionSubmitBO {
/**
@@ -14,22 +19,4 @@ public class PayTransactionSubmitBO {
*/
private String invokeResponse;
- public Integer getId() {
- return id;
- }
-
- public PayTransactionSubmitBO setId(Integer id) {
- this.id = id;
- return this;
- }
-
- public String getInvokeResponse() {
- return invokeResponse;
- }
-
- public PayTransactionSubmitBO setInvokeResponse(String invokeResponse) {
- this.invokeResponse = invokeResponse;
- return this;
- }
-
-}
\ No newline at end of file
+}
diff --git a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionCreateDTO.java b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionCreateDTO.java
index b95d87139..4eedd49a9 100644
--- a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionCreateDTO.java
+++ b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionCreateDTO.java
@@ -1,5 +1,8 @@
package cn.iocoder.mall.pay.api.dto;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@@ -9,6 +12,8 @@ import java.util.Date;
/**
* 支付交易创建 DTO
*/
+@Data
+@Accessors(chain = true)
public class PayTransactionCreateDTO {
/**
@@ -55,76 +60,4 @@ public class PayTransactionCreateDTO {
@NotNull(message = "交易过期时间不能为空")
private Date expireTime;
- public String getAppId() {
- return appId;
- }
-
- public PayTransactionCreateDTO setAppId(String appId) {
- this.appId = appId;
- return this;
- }
-
- public String getCreateIp() {
- return createIp;
- }
-
- public PayTransactionCreateDTO setCreateIp(String createIp) {
- this.createIp = createIp;
- return this;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public PayTransactionCreateDTO setOrderId(String orderId) {
- this.orderId = orderId;
- return this;
- }
-
- public String getOrderSubject() {
- return orderSubject;
- }
-
- public PayTransactionCreateDTO setOrderSubject(String orderSubject) {
- this.orderSubject = orderSubject;
- return this;
- }
-
- public String getOrderDescription() {
- return orderDescription;
- }
-
- public PayTransactionCreateDTO setOrderDescription(String orderDescription) {
- this.orderDescription = orderDescription;
- return this;
- }
-
- public String getOrderMemo() {
- return orderMemo;
- }
-
- public PayTransactionCreateDTO setOrderMemo(String orderMemo) {
- this.orderMemo = orderMemo;
- return this;
- }
-
- public Integer getPrice() {
- return price;
- }
-
- public PayTransactionCreateDTO setPrice(Integer price) {
- this.price = price;
- return this;
- }
-
- public Date getExpireTime() {
- return expireTime;
- }
-
- public PayTransactionCreateDTO setExpireTime(Date expireTime) {
- this.expireTime = expireTime;
- return this;
- }
-
-}
\ No newline at end of file
+}
diff --git a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionSubmitDTO.java b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionSubmitDTO.java
index 782da8990..c0050a0e3 100644
--- a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionSubmitDTO.java
+++ b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionSubmitDTO.java
@@ -1,11 +1,16 @@
package cn.iocoder.mall.pay.api.dto;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
/**
* 支付交易提交 DTO
*/
+@Data
+@Accessors(chain = true)
public class PayTransactionSubmitDTO {
/**
@@ -29,40 +34,4 @@ public class PayTransactionSubmitDTO {
@NotNull(message = "支付渠道")
private Integer payChannel;
- public String getAppId() {
- return appId;
- }
-
- public PayTransactionSubmitDTO setAppId(String appId) {
- this.appId = appId;
- return this;
- }
-
- public String getCreateIp() {
- return createIp;
- }
-
- public PayTransactionSubmitDTO setCreateIp(String createIp) {
- this.createIp = createIp;
- return this;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public PayTransactionSubmitDTO setOrderId(String orderId) {
- this.orderId = orderId;
- return this;
- }
-
- public Integer getPayChannel() {
- return payChannel;
- }
-
- public PayTransactionSubmitDTO setPayChannel(Integer payChannel) {
- this.payChannel = payChannel;
- return this;
- }
-
-}
\ No newline at end of file
+}
diff --git a/pay/pay-service-impl/pom.xml b/pay/pay-service-impl/pom.xml
index 012b7ffbc..967fb2afc 100644
--- a/pay/pay-service-impl/pom.xml
+++ b/pay/pay-service-impl/pom.xml
@@ -19,19 +19,16 @@
com.alibaba
dubbo
- compile
cn.iocoder.mall
admin-service-api
1.0-SNAPSHOT
- compile
cn.iocoder.mall
pay-service-api
1.0-SNAPSHOT
- compile
@@ -46,18 +43,11 @@
org.mybatis.spring.boot
mybatis-spring-boot-starter
- 2.0.0
-
-
- org.mapstruct
- mapstruct
- ${org.mapstruct.version}
com.google.guava
guava
- 27.0.1-jre
@@ -70,13 +60,11 @@
com.xuxueli
xxl-job-core
- 2.0.1
org.apache.rocketmq
rocketmq-spring-boot-starter
- 2.0.1
@@ -87,18 +75,6 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.5.1
-
-
- 1.8
-
-
- org.mapstruct
- mapstruct-processor
- ${org.mapstruct.version}
-
-
-
@@ -115,4 +91,4 @@
-
\ No newline at end of file
+
diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayAppDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayAppDO.java
index f7d062791..b06ce0f24 100644
--- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayAppDO.java
+++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayAppDO.java
@@ -1,10 +1,14 @@
package cn.iocoder.mall.pay.biz.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO;
+import lombok.Data;
+import lombok.experimental.Accessors;
/**
* 支付应用(业务线)DO
*/
+@Data
+@Accessors(chain = true)
public class PayAppDO extends DeletableDO {
/**
@@ -24,40 +28,4 @@ public class PayAppDO extends DeletableDO {
*/
private Integer status;
- public String getId() {
- return id;
- }
-
- public PayAppDO setId(String id) {
- this.id = id;
- return this;
- }
-
- public String getName() {
- return name;
- }
-
- public PayAppDO setName(String name) {
- this.name = name;
- return this;
- }
-
- public String getNotifyUrl() {
- return notifyUrl;
- }
-
- public PayAppDO setNotifyUrl(String notifyUrl) {
- this.notifyUrl = notifyUrl;
- return this;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public PayAppDO setStatus(Integer status) {
- this.status = status;
- return this;
- }
-
-}
\ No newline at end of file
+}
diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayLogDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayLogDO.java
index 35ab44c83..a18c42f4b 100644
--- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayLogDO.java
+++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayLogDO.java
@@ -1,5 +1,8 @@
package cn.iocoder.mall.pay.biz.dataobject;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
/**
* 交易日志 DO
*
@@ -7,6 +10,8 @@ package cn.iocoder.mall.pay.biz.dataobject;
*
* TODO 芋艿,后面在捉摸
*/
+@Data
+@Accessors(chain = true)
public class PayLogDO {
/**
@@ -21,4 +26,4 @@ public class PayLogDO {
* 业务线订单编号
*/
private Integer orderId;
-}
\ No newline at end of file
+}
diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRefundDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRefundDO.java
index 7f8664bbc..eea5ce411 100644
--- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRefundDO.java
+++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRefundDO.java
@@ -1,4 +1,9 @@
package cn.iocoder.mall.pay.biz.dataobject;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
public class PayRefundDO {
}
diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRepeatTransactionDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRepeatTransactionDO.java
index c94ab8810..eef449846 100644
--- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRepeatTransactionDO.java
+++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRepeatTransactionDO.java
@@ -1,9 +1,14 @@
package cn.iocoder.mall.pay.biz.dataobject;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
/**
* TODO 重复支付的交易
*
* 可能不靠这个表,而是差错处理。
*/
+@Data
+@Accessors(chain = true)
public class PayRepeatTransactionDO {
}
diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionDO.java
index 81cd56a12..77159d037 100644
--- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionDO.java
+++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionDO.java
@@ -1,12 +1,16 @@
package cn.iocoder.mall.pay.biz.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO;
+import lombok.Data;
+import lombok.experimental.Accessors;
import java.util.Date;
/**
* 支付交易 DO
*/
+@Data
+@Accessors(chain = true)
public class PayTransactionDO extends DeletableDO {
/**
@@ -100,156 +104,4 @@ public class PayTransactionDO extends DeletableDO {
*/
private String tradeNo;
- public Integer getId() {
- return id;
- }
-
- public PayTransactionDO setId(Integer id) {
- this.id = id;
- return this;
- }
-
- public String getAppId() {
- return appId;
- }
-
- public PayTransactionDO setAppId(String appId) {
- this.appId = appId;
- return this;
- }
-
- public String getCreateIp() {
- return createIp;
- }
-
- public PayTransactionDO setCreateIp(String createIp) {
- this.createIp = createIp;
- return this;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public PayTransactionDO setOrderId(String orderId) {
- this.orderId = orderId;
- return this;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public PayTransactionDO setStatus(Integer status) {
- this.status = status;
- return this;
- }
-
- public Integer getPrice() {
- return price;
- }
-
- public PayTransactionDO setPrice(Integer price) {
- this.price = price;
- return this;
- }
-
- public Integer getPayChannel() {
- return payChannel;
- }
-
- public PayTransactionDO setPayChannel(Integer payChannel) {
- this.payChannel = payChannel;
- return this;
- }
-
- public Date getPaymentTime() {
- return paymentTime;
- }
-
- public PayTransactionDO setPaymentTime(Date paymentTime) {
- this.paymentTime = paymentTime;
- return this;
- }
-
- public Date getNotifyTime() {
- return notifyTime;
- }
-
- public PayTransactionDO setNotifyTime(Date notifyTime) {
- this.notifyTime = notifyTime;
- return this;
- }
-
- public String getTradeNo() {
- return tradeNo;
- }
-
- public PayTransactionDO setTradeNo(String tradeNo) {
- this.tradeNo = tradeNo;
- return this;
- }
-
- public String getOrderSubject() {
- return orderSubject;
- }
-
- public PayTransactionDO setOrderSubject(String orderSubject) {
- this.orderSubject = orderSubject;
- return this;
- }
-
- public String getOrderDescription() {
- return orderDescription;
- }
-
- public PayTransactionDO setOrderDescription(String orderDescription) {
- this.orderDescription = orderDescription;
- return this;
- }
-
- public String getOrderMemo() {
- return orderMemo;
- }
-
- public PayTransactionDO setOrderMemo(String orderMemo) {
- this.orderMemo = orderMemo;
- return this;
- }
-
- public Date getExpireTime() {
- return expireTime;
- }
-
- public PayTransactionDO setExpireTime(Date expireTime) {
- this.expireTime = expireTime;
- return this;
- }
-
- public Date getFinishTime() {
- return finishTime;
- }
-
- public PayTransactionDO setFinishTime(Date finishTime) {
- this.finishTime = finishTime;
- return this;
- }
-
- public Integer getExtensionId() {
- return extensionId;
- }
-
- public PayTransactionDO setExtensionId(Integer extensionId) {
- this.extensionId = extensionId;
- return this;
- }
-
- public String getNotifyUrl() {
- return notifyUrl;
- }
-
- public PayTransactionDO setNotifyUrl(String notifyUrl) {
- this.notifyUrl = notifyUrl;
- return this;
- }
-}
\ No newline at end of file
+}
diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionExtensionDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionExtensionDO.java
index c25ee8ea5..e5f4c6162 100644
--- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionExtensionDO.java
+++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionExtensionDO.java
@@ -1,10 +1,14 @@
package cn.iocoder.mall.pay.biz.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO;
+import lombok.Data;
+import lombok.experimental.Accessors;
/**
* 交易扩展表
*/
+@Data
+@Accessors(chain = true)
public class PayTransactionExtensionDO extends DeletableDO {
/**
@@ -43,67 +47,4 @@ public class PayTransactionExtensionDO extends DeletableDO {
*/
private Integer status;
- public Integer getId() {
- return id;
- }
-
- public PayTransactionExtensionDO setId(Integer id) {
- this.id = id;
- return this;
- }
-
- public Integer getTransactionId() {
- return transactionId;
- }
-
- public PayTransactionExtensionDO setTransactionId(Integer transactionId) {
- this.transactionId = transactionId;
- return this;
- }
-
- public Integer getPayChannel() {
- return payChannel;
- }
-
- public PayTransactionExtensionDO setPayChannel(Integer payChannel) {
- this.payChannel = payChannel;
- return this;
- }
-
- public String getTransactionCode() {
- return transactionCode;
- }
-
- public PayTransactionExtensionDO setTransactionCode(String transactionCode) {
- this.transactionCode = transactionCode;
- return this;
- }
-
- public String getExtensionData() {
- return extensionData;
- }
-
- public PayTransactionExtensionDO setExtensionData(String extensionData) {
- this.extensionData = extensionData;
- return this;
- }
-
- public String getCreateIp() {
- return createIp;
- }
-
- public PayTransactionExtensionDO setCreateIp(String createIp) {
- this.createIp = createIp;
- return this;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public PayTransactionExtensionDO setStatus(Integer status) {
- this.status = status;
- return this;
- }
-
-}
\ No newline at end of file
+}
diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyLogDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyLogDO.java
index 341b5d22c..9280acd3e 100644
--- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyLogDO.java
+++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyLogDO.java
@@ -1,12 +1,16 @@
package cn.iocoder.mall.pay.biz.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO;
+import lombok.Data;
+import lombok.experimental.Accessors;
/**
* 支付交易通知 App 的日志 DO
*
* 通过该表,记录通知 App 时,产生的日志
*/
+@Data
+@Accessors(chain = true)
public class PayTransactionNotifyLogDO extends DeletableDO {
/**
@@ -32,49 +36,4 @@ public class PayTransactionNotifyLogDO extends DeletableDO {
*/
private Integer status;
- public Integer getId() {
- return id;
- }
-
- public PayTransactionNotifyLogDO setId(Integer id) {
- this.id = id;
- return this;
- }
-
- public String getRequest() {
- return request;
- }
-
- public PayTransactionNotifyLogDO setRequest(String request) {
- this.request = request;
- return this;
- }
-
- public String getResponse() {
- return response;
- }
-
- public PayTransactionNotifyLogDO setResponse(String response) {
- this.response = response;
- return this;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public PayTransactionNotifyLogDO setStatus(Integer status) {
- this.status = status;
- return this;
- }
-
- public Integer getNotifyId() {
- return notifyId;
- }
-
- public PayTransactionNotifyLogDO setNotifyId(Integer notifyId) {
- this.notifyId = notifyId;
- return this;
- }
-
-}
\ No newline at end of file
+}
diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyTaskDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyTaskDO.java
index 531606221..5a3393166 100644
--- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyTaskDO.java
+++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyTaskDO.java
@@ -2,12 +2,16 @@ package cn.iocoder.mall.pay.biz.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import cn.iocoder.mall.pay.biz.service.PayServiceImpl;
+import lombok.Data;
+import lombok.experimental.Accessors;
import java.util.Date;
/**
* 支付交易通知 App 的任务 DO
*/
+@Data
+@Accessors(chain = true)
public class PayTransactionNotifyTaskDO extends DeletableDO {
/**
@@ -84,103 +88,4 @@ public class PayTransactionNotifyTaskDO extends DeletableDO {
*/
private String notifyUrl;
- public Integer getTransactionId() {
- return transactionId;
- }
-
- public PayTransactionNotifyTaskDO setTransactionId(Integer transactionId) {
- this.transactionId = transactionId;
- return this;
- }
-
- public String getAppId() {
- return appId;
- }
-
- public PayTransactionNotifyTaskDO setAppId(String appId) {
- this.appId = appId;
- return this;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public PayTransactionNotifyTaskDO setOrderId(String orderId) {
- this.orderId = orderId;
- return this;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public PayTransactionNotifyTaskDO setStatus(Integer status) {
- this.status = status;
- return this;
- }
-
- public Date getNextNotifyTime() {
- return nextNotifyTime;
- }
-
- public PayTransactionNotifyTaskDO setNextNotifyTime(Date nextNotifyTime) {
- this.nextNotifyTime = nextNotifyTime;
- return this;
- }
-
- public Integer getNotifyTimes() {
- return notifyTimes;
- }
-
- public PayTransactionNotifyTaskDO setNotifyTimes(Integer notifyTimes) {
- this.notifyTimes = notifyTimes;
- return this;
- }
-
- public Integer getMaxNotifyTimes() {
- return maxNotifyTimes;
- }
-
- public PayTransactionNotifyTaskDO setMaxNotifyTimes(Integer maxNotifyTimes) {
- this.maxNotifyTimes = maxNotifyTimes;
- return this;
- }
-
- public Integer getId() {
- return id;
- }
-
- public PayTransactionNotifyTaskDO setId(Integer id) {
- this.id = id;
- return this;
- }
-
- public Integer getTransactionExtensionId() {
- return transactionExtensionId;
- }
-
- public PayTransactionNotifyTaskDO setTransactionExtensionId(Integer transactionExtensionId) {
- this.transactionExtensionId = transactionExtensionId;
- return this;
- }
-
- public String getNotifyUrl() {
- return notifyUrl;
- }
-
- public PayTransactionNotifyTaskDO setNotifyUrl(String notifyUrl) {
- this.notifyUrl = notifyUrl;
- return this;
- }
-
- public Date getLastExecuteTime() {
- return lastExecuteTime;
- }
-
- public PayTransactionNotifyTaskDO setLastExecuteTime(Date lastExecuteTime) {
- this.lastExecuteTime = lastExecuteTime;
- return this;
- }
-
-}
\ No newline at end of file
+}