dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-04 19:49:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 同步通知接收路径, 对账差错状态, 订单号生成工具类重命名, 一些注释相关的微调

Browse Source
This commit is contained in:
DaxPay
2024-06-28 18:02:15 +08:00
parent 7737c7efc2
commit da60b73edd
22 changed files with 101 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/core/param/channel/AliPayParam.java
View File

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* 支付宝支付参数
* @author xxm
* @since 2021/2/27
*/

2
daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/core/result/pay/PayResult.java
View File

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
@Schema(title = "统一下单响应参数")
@Schema(title = "统一支付响应参数")
public class PayResult extends PaymentCommonResult {
/** 商户订单号 */

18
daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/core/util/OrderNoGenerateUtil.java → daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/core/util/TradeNoGenerateUtil.java
View File

@@ -1,19 +1,19 @@
package cn.daxpay.single.core.util;
import cn.hutool.core.date.DatePattern;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.concurrent.atomic.AtomicLong;
/**
* 各类型订单号审查工具类
* 各类型订单号生成工具类
* @author yxc
* @since 2024/4/15
*/
@Slf4j
public class OrderNoGenerateUtil {
public class TradeNoGenerateUtil {
private static final AtomicLong ATOMIC_LONG = new AtomicLong();
private final static long ORDER_MAX_LIMIT = 999999L;
@@ -29,7 +29,7 @@ public class OrderNoGenerateUtil {
*/
public static String pay() {
StringBuilder orderNo = new StringBuilder();
String dateStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmmss"));
String dateStr = LocalDateTime.now().format(DatePattern.PURE_DATETIME_FORMATTER);
long id = ATOMIC_LONG.incrementAndGet();
orderNo.append(env).append("P").append(dateStr).append(machineNo).append(String.format("%06d", Math.abs(id) % ORDER_MAX_LIMIT));
return orderNo.toString();
@@ -40,7 +40,7 @@ public class OrderNoGenerateUtil {
*/
public static String refund() {
StringBuilder orderNo = new StringBuilder();
String dateStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmmss"));
String dateStr = LocalDateTime.now().format(DatePattern.PURE_DATETIME_FORMATTER);
long id = ATOMIC_LONG.incrementAndGet();
orderNo.append(env).append("R").append(dateStr).append(machineNo).append(String.format("%06d", Math.abs(id) % ORDER_MAX_LIMIT));
return orderNo.toString();
@@ -51,7 +51,7 @@ public class OrderNoGenerateUtil {
*/
public static String transfer() {
StringBuilder orderNo = new StringBuilder();
String dateStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmmss"));
String dateStr = LocalDateTime.now().format(DatePattern.PURE_DATETIME_FORMATTER);
long id = ATOMIC_LONG.incrementAndGet();
orderNo.append(env).append("T").append(dateStr).append(machineNo).append(String.format("%06d", Math.abs(id) % ORDER_MAX_LIMIT));
return orderNo.toString();
@@ -62,7 +62,7 @@ public class OrderNoGenerateUtil {
*/
public static String allocation() {
StringBuilder orderNo = new StringBuilder();
String dateStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmmss"));
String dateStr = LocalDateTime.now().format(DatePattern.PURE_DATETIME_FORMATTER);
long id = ATOMIC_LONG.incrementAndGet();
orderNo.append(env).append("A").append(dateStr).append(machineNo).append(String.format("%06d", Math.abs(id) % ORDER_MAX_LIMIT));
return orderNo.toString();
@@ -73,7 +73,7 @@ public class OrderNoGenerateUtil {
*/
public static String reconciliation() {
StringBuilder orderNo = new StringBuilder();
String dateStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmmss"));
String dateStr = LocalDateTime.now().format(DatePattern.PURE_DATETIME_FORMATTER);
long id = ATOMIC_LONG.incrementAndGet();
orderNo.append(env).append("C").append(dateStr).append(machineNo).append(String.format("%06d", Math.abs(id) % ORDER_MAX_LIMIT));
return orderNo.toString();
@@ -84,7 +84,7 @@ public class OrderNoGenerateUtil {
*/
public static String repair() {
StringBuilder orderNo = new StringBuilder();
String dateStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmmss"));
String dateStr = LocalDateTime.now().format(DatePattern.PURE_DATETIME_FORMATTER);
long id = ATOMIC_LONG.incrementAndGet();
orderNo.append(env).append("X").append(dateStr).append(machineNo).append(String.format("%06d", Math.abs(id) % ORDER_MAX_LIMIT));
return orderNo.toString();