From aadc703bb390b7d4f1c18d6791020defa0238019 Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Sat, 1 Jun 2024 11:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E6=8E=A5=E5=8F=A3(?=
 =?UTF-8?q?=E6=97=A0=E9=9C=80=E6=9D=83=E9=99=90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/PaymentController.java  | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java b/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java
index f7a03dd..7f9f4ce 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java
@@ -1,6 +1,8 @@
 package com.gxwebsoft.common.system.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.gxwebsoft.common.core.utils.RedisUtil;
 import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.system.entity.Merchant;
@@ -16,10 +18,12 @@ import com.gxwebsoft.common.core.annotation.OperationLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 支付方式控制器
@@ -38,16 +42,25 @@ public class PaymentController extends BaseController {
 
     @ApiOperation("选择支付方式")
     @GetMapping("/select")
-    public ApiResult<PageResult<Payment>> select(PaymentParam param) {
+    public ApiResult<?> select(PaymentParam param) {
+      String key = "SelectPayment:".concat(getTenantId().toString());
+      final String string = redisUtil.get(key);
+      final List<Payment> paymentList = JSONObject.parseArray(string, Payment.class);
+      if (!CollectionUtils.isEmpty(paymentList)) {
+        return success(paymentList);
+      }
       // 使用关联查询
-      final PageResult<Payment> result = paymentService.pageRel(param);
-      result.getList().forEach(d -> {
-        d.setApiKey(null);
-        d.setApiclientCert(null);
-        d.setApiclientKey(null);
-        d.setMerchantSerialNumber(null);
-      });
-      return success(result);
+      final List<Payment> list = paymentService.list(new LambdaUpdateWrapper<Payment>().eq(Payment::getStatus, true));
+      if (!CollectionUtils.isEmpty(list)) {
+        list.forEach(d -> {
+          d.setApiKey(null);
+          d.setApiclientCert(null);
+          d.setApiclientKey(null);
+          d.setMerchantSerialNumber(null);
+        });
+      }
+      redisUtil.set(key,list,1L, TimeUnit.DAYS);
+      return success(list);
     }
 
     @PreAuthorize("hasAuthority('sys:payment:list')")