From 2572e085227c263557c11710116939d9b3e024bd Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Wed, 15 May 2024 13:22:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=20demo=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4,=20=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=AD=E5=8C=85=E8=A3=85=E7=B1=BB=E5=B1=9E=E6=80=A7=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E7=A9=BA=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                              |  2 +-
 .../single/demo/param/CashierSimplePayParam.java       |  1 -
 .../daxpay/single/demo/service/AggregateService.java   |  1 +
 .../core/channel/alipay/entity/AliPayConfig.java       |  9 +++++++++
 .../core/channel/wechat/entity/WeChatPayConfig.java    | 10 ++++++++++
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a418953b..0bd1e1f4 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@
 
 ## 🍈项目介绍
 
-> DaxPay是一套开源支付网关系统，已经对接支付宝、微信支付相关的接口。可以独立部署，提供接口供业务系统进行调用，不对原有系统产生影响
+> DaxPay是一套开源支付网关系统，已经对接支付宝、微信支付、云闪付相关的接口。可以独立部署，提供接口供业务系统进行调用，不对原有系统产生影响
 
 ## 🧭 特色功能
 - 封装各类支付通道的接口为统一的接口，方便业务系统进行调用，简化对接多种支付方式的复杂度
diff --git a/daxpay-single-demo/src/main/java/cn/daxpay/single/demo/param/CashierSimplePayParam.java b/daxpay-single-demo/src/main/java/cn/daxpay/single/demo/param/CashierSimplePayParam.java
index bcf70332..9ed61e3e 100644
--- a/daxpay-single-demo/src/main/java/cn/daxpay/single/demo/param/CashierSimplePayParam.java
+++ b/daxpay-single-demo/src/main/java/cn/daxpay/single/demo/param/CashierSimplePayParam.java
@@ -23,7 +23,6 @@ public class CashierSimplePayParam {
     private String bizOrderNo;
 
     @Schema(description = "是否分账")
-    @NotNull(message = "分账是否启用必输")
     private Boolean allocation;
 
 
diff --git a/daxpay-single-demo/src/main/java/cn/daxpay/single/demo/service/AggregateService.java b/daxpay-single-demo/src/main/java/cn/daxpay/single/demo/service/AggregateService.java
index 33158d61..c5c7be45 100644
--- a/daxpay-single-demo/src/main/java/cn/daxpay/single/demo/service/AggregateService.java
+++ b/daxpay-single-demo/src/main/java/cn/daxpay/single/demo/service/AggregateService.java
@@ -59,6 +59,7 @@ public class AggregateService {
                 .setTitle(param.getTitle())
                 .setBizOrderNo(param.getBizOrderNo())
                 .setAllocation(param.getAllocation())
+                .setAutoAllocation(param.getAutoAllocation())
                 .setAmount(amount);
         String code = IdUtil.getSnowflakeNextIdStr();
         String serverUrl = daxPayDemoProperties.getServerUrl();
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/entity/AliPayConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/entity/AliPayConfig.java
index a94d0709..df2ed13a 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/entity/AliPayConfig.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/entity/AliPayConfig.java
@@ -19,6 +19,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 支付宝支付配置
@@ -138,6 +139,14 @@ public class AliPayConfig extends MpBaseEntity implements EntityBaseFunction<Ali
     @DbColumn(comment = "备注")
     private String remark;
 
+    public Boolean getAllocation() {
+        return Objects.equals(allocation,true);
+    }
+
+    public Boolean getEnable() {
+        return Objects.equals(enable,true);
+    }
+
     @Override
     public AliPayConfigDto toDto() {
         return AlipayConvert.CONVERT.convert(this);
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/entity/WeChatPayConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/entity/WeChatPayConfig.java
index b3c90b9d..b013f521 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/entity/WeChatPayConfig.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/entity/WeChatPayConfig.java
@@ -20,6 +20,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 微信支付配置
@@ -117,6 +118,15 @@ public class WeChatPayConfig extends MpBaseEntity implements EntityBaseFunction<
     @DbColumn(comment = "备注")
     private String remark;
 
+    public Boolean getAllocation() {
+        return Objects.equals(allocation,true);
+    }
+
+    public Boolean getEnable() {
+        return Objects.equals(enable,true);
+    }
+
+
     @Override
     public WeChatPayConfigDto toDto() {
         return WeChatConvert.CONVERT.convert(this);