From 17734e7a3dac3df9e3c2c46876fc67334a3cfa4b Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Fri, 24 Feb 2023 14:53:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=81=94=E6=94=AF=E4=BB=98-=E4=BA=91?=
 =?UTF-8?q?=E9=97=AA=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/enums/PaymentMethodEnum.java       |  5 +++
 .../dto/payment/UnionPaymentSetting.java      | 35 +++++++++++++++++++
 .../system/entity/enums/SettingEnum.java      |  3 +-
 .../other/ElasticsearchController.java        | 10 ++++++
 .../setting/SettingManagerController.java     |  5 +++
 5 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 framework/src/main/java/cn/lili/modules/system/entity/dto/payment/UnionPaymentSetting.java

diff --git a/framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentMethodEnum.java b/framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentMethodEnum.java
index d06b6121..fe8b6973 100644
--- a/framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentMethodEnum.java
+++ b/framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentMethodEnum.java
@@ -16,6 +16,11 @@ public enum PaymentMethodEnum {
      * 支付宝
      */
     ALIPAY("aliPayPlugin", "支付宝"),
+
+    /**
+     * 银联-云闪付
+     */
+    UNIONPAY("unionPayPlugin", "银联-云闪付"),
     /**
      * 余额支付
      */
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/UnionPaymentSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/UnionPaymentSetting.java
new file mode 100644
index 00000000..ba3e47b2
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/UnionPaymentSetting.java
@@ -0,0 +1,35 @@
+package cn.lili.modules.system.entity.dto.payment;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+/**
+ * 银联-云闪付支付设置
+ *
+ * @author Bulbasaur
+ * @since 2023-02-17
+ */
+@Data
+@Accessors(chain = true)
+public class UnionPaymentSetting {
+
+    /**
+     * 商户号
+     */
+    private String unionPayMachId;
+    /**
+     * 密钥
+     */
+    private String unionPayKey;
+    /**
+     * 请求地址
+     */
+    private String unionPayServerUrl;
+    /**
+     * 交易请求地址
+     */
+    private String unionPayDomain;
+    /**
+     * 应用ID
+     */
+    private String unionPayAppId;
+}
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
index b7fc730a..0ec08b9e 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
@@ -46,8 +46,7 @@ public enum SettingEnum {
     //微信支付设置
     WECHAT_PAYMENT,
     //银联支付设置
-    UNION_PAYMENT,
-
+    UNIONPAY_PAYMENT,
     //热词设置
     HOT_WORDS
 }
diff --git a/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java b/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
index 89d878b3..34f33c48 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
@@ -2,10 +2,12 @@ package cn.lili.controller.other;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.payment.service.CorporateBankService;
 import cn.lili.modules.search.service.EsGoodsIndexService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,6 +25,14 @@ import java.util.Map;
 @RequestMapping("/manager/other/elasticsearch")
 public class ElasticsearchController {
 
+    @Autowired
+    private CorporateBankService corporateBankService;
+
+    @PostMapping
+    public ResultMessage<String> corporateBankInit(int i) {
+        corporateBankService.init(i);
+        return ResultUtil.success();
+    }
     @Autowired
     private EsGoodsIndexService esGoodsIndexService;
 
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
index 7c6b8133..b7063459 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
@@ -13,6 +13,7 @@ import cn.lili.modules.system.entity.dto.connect.QQConnectSetting;
 import cn.lili.modules.system.entity.dto.connect.WechatConnectSetting;
 import cn.lili.modules.system.entity.dto.payment.AlipayPaymentSetting;
 import cn.lili.modules.system.entity.dto.payment.PaymentSupportSetting;
+import cn.lili.modules.system.entity.dto.payment.UnionPaymentSetting;
 import cn.lili.modules.system.entity.dto.payment.WechatPaymentSetting;
 import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportForm;
 import cn.lili.modules.system.entity.enums.SettingEnum;
@@ -171,6 +172,10 @@ public class SettingManagerController {
                 return setting == null ?
                         ResultUtil.data(new AlipayPaymentSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), AlipayPaymentSetting.class));
+            case UNIONPAY_PAYMENT:
+                return setting == null ?
+                        ResultUtil.data(new UnionPaymentSetting()) :
+                        ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), UnionPaymentSetting.class));
             case WECHAT_CONNECT:
                 return setting == null ?
                         ResultUtil.data(new WechatConnectSetting()) :