后端:去除 pay 模块的 setting getting 方法

This commit is contained in:
YunaiV 2019-04-06 22:06:33 +08:00
parent fe4793fb94
commit 0e26b22e39
15 changed files with 91 additions and 752 deletions

View File

@ -22,12 +22,16 @@
<artifactId>common-framework</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>pay-service-impl</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>admin-sdk</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -43,42 +47,24 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
<version>2.6.5</version>
</dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>0.2.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
<version>${org.mapstruct.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
<version>${org.mapstruct.version}</version>
</dependency>
<dependency>
@ -87,12 +73,6 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>admin-sdk</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!--<dependency>-->
<!--<groupId>de.codecentric</groupId>-->
<!--<artifactId>spring-boot-admin-starter-server</artifactId>-->
@ -122,30 +102,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source> <!-- or higher, depending on your project -->
<target>1.8</target> <!-- or higher, depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<!-- 打包 -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>

View File

@ -15,9 +15,26 @@
<groupId>cn.iocoder.mall</groupId>
<artifactId>common-framework</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-jdk8</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
</project>
</project>

View File

@ -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;
}
}
}

View File

@ -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;
}
}
}

View File

@ -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;
}
}
}

View File

@ -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;
}
}
}

View File

@ -19,19 +19,16 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>admin-service-api</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>pay-service-api</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -46,18 +43,11 @@
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${org.mapstruct.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>27.0.1-jre</version>
</dependency>
<dependency>
@ -70,13 +60,11 @@
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>
<version>2.0.1</version>
</dependency>
</dependencies>
@ -87,18 +75,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source> <!-- or higher, depending on your project -->
<target>1.8</target> <!-- or higher, depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
@ -115,4 +91,4 @@
</repository>
</repositories>
</project>
</project>

View File

@ -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;
}
}
}

View File

@ -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;
}
}

View File

@ -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 {
}

View File

@ -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 {
}

View File

@ -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;
}
}
}

View File

@ -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;
}
}
}

View File

@ -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;
}
}
}

View File

@ -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;
}
}
}