From d7cef55bbed4756479a7aeab76362e2f30fa54f1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 13 四月 2026 10:10:54 +0800
Subject: [PATCH] 支付
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/CbyzxPayUtil.java | 71 ++---------------------------------
1 files changed, 5 insertions(+), 66 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/CbyzxPayUtil.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/CbyzxPayUtil.java
index 7f99ba6..f73261b 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/CbyzxPayUtil.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/CbyzxPayUtil.java
@@ -118,32 +118,17 @@
if (request == null) {
throw new IllegalArgumentException("request must not be null");
}
- if (!StringUtils.hasText(request.getTenant())) {
- throw new IllegalArgumentException("tenant must not be blank");
- }
- if (!StringUtils.hasText(request.getPaymentOrderType())) {
- throw new IllegalArgumentException("paymentOrderType must not be blank");
- }
if (!StringUtils.hasText(request.getOutRequestNo())) {
throw new IllegalArgumentException("outRequestNo must not be blank");
}
if (request.getPaymentOrderAmount() == null) {
throw new IllegalArgumentException("paymentOrderAmount must not be null");
}
- if (!StringUtils.hasText(request.getCurrency())) {
- throw new IllegalArgumentException("currency must not be blank");
- }
if (request.getBuyerId() == null) {
throw new IllegalArgumentException("buyerId must not be null");
}
if (!StringUtils.hasText(request.getOpenId())) {
throw new IllegalArgumentException("openId must not be blank");
- }
- if (request.getStoreIds().isEmpty()) {
- throw new IllegalArgumentException("storeIds must not be blank");
- }
- if (!StringUtils.hasText(request.getPayChannelCode())) {
- throw new IllegalArgumentException("payChannelCode must not be blank");
}
if (!StringUtils.hasText(request.getPayEndTime())) {
throw new IllegalArgumentException("payEndTime must not be blank");
@@ -170,15 +155,10 @@
*/
public static CreatePayOrderRequest mockRequest() {
CreatePayOrderRequest request = new CreatePayOrderRequest();
- request.setTenant(DEFAULT_TENANT);
- request.setPaymentOrderType(PAYMENT_ORDER_TYPE);
request.setOutRequestNo("TEST" + System.currentTimeMillis());
request.setPaymentOrderAmount(new BigDecimal("100"));
- request.setCurrency(DEFAULT_CURRENCY);
request.setBuyerId(10001L);
request.setOpenId("oMockOpenId123456789");
- request.setStoreIds(Arrays.asList("246"));
- request.setPayChannelCode(DEFAULT_PAY_CHANNEL_CODE);
request.setPayEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis() + 30L * 60L * 1000L)));
request.setCallbackUrl("http://127.0.0.1:8080/pay/mockCallback");
return request;
@@ -211,49 +191,29 @@
*/
public static class CreatePayOrderRequest {
- private String tenant;
- private String paymentOrderType;
private String outRequestNo;
private BigDecimal paymentOrderAmount;
- private String currency;
private Long buyerId;
private String openId;
- private List<String> storeIds;
- private String payChannelCode;
private String payEndTime;
private String callbackUrl;
public Map<String, Object> toParamMap() {
Map<String, Object> params = new LinkedHashMap<>();
- params.put("tenant", tenant);
- params.put("paymentOrderType", paymentOrderType);
+ params.put("tenant", DEFAULT_TENANT);
+ params.put("paymentOrderType", PAYMENT_ORDER_TYPE);
params.put("outRequestNo", outRequestNo);
params.put("paymentOrderAmount", paymentOrderAmount);
- params.put("currency", currency);
+ params.put("currency", DEFAULT_CURRENCY);
params.put("buyerId", buyerId);
params.put("openId", openId);
- params.put("storeIds", storeIds);
- params.put("payChannelCode", payChannelCode);
+ params.put("storeIds", Arrays.asList("246"));
+ params.put("payChannelCode", DEFAULT_PAY_CHANNEL_CODE);
params.put("payEndTime", payEndTime);
params.put("callbackUrl", callbackUrl);
return params;
}
- public String getTenant() {
- return tenant;
- }
-
- public void setTenant(String tenant) {
- this.tenant = tenant;
- }
-
- public String getPaymentOrderType() {
- return paymentOrderType;
- }
-
- public void setPaymentOrderType(String paymentOrderType) {
- this.paymentOrderType = paymentOrderType;
- }
public String getOutRequestNo() {
return outRequestNo;
@@ -271,13 +231,6 @@
this.paymentOrderAmount = paymentOrderAmount;
}
- public String getCurrency() {
- return currency;
- }
-
- public void setCurrency(String currency) {
- this.currency = currency;
- }
public Long getBuyerId() {
return buyerId;
@@ -295,21 +248,7 @@
this.openId = openId;
}
- public List<String> getStoreIds() {
- return storeIds;
- }
- public void setStoreIds(List<String> storeIds) {
- this.storeIds = storeIds;
- }
-
- public String getPayChannelCode() {
- return payChannelCode;
- }
-
- public void setPayChannelCode(String payChannelCode) {
- this.payChannelCode = payChannelCode;
- }
public String getPayEndTime() {
return payEndTime;
--
Gitblit v1.7.1