init

ruoyi-admin/src/main/resources/application-dev.yml

@@ -174,5 +174,5 @@ agora:
   key: 627b8e17b0c616c1346cba2d87e10251
   secret: c47628fe2538
 yunxin:
-  app-key: 627b8e17b0c616c1346cba2d87e10251
+  app-key: 748496374b04344194c68b53e411e09c
-  app-secret: c47628fe2538
+  app-secret: 77c09917d2de

ruoyi-admin/src/main/resources/application-prod.yml

@@ -177,5 +177,5 @@ agora:
   key: key
   secret: secret
 yunxin:
-  app-key: 627b8e17b0c616c1346cba2d87e10251
+  app-key: 748496374b04344194c68b53e411e09c
-  app-secret: c47628fe2538
+  app-secret: 77c09917d2de

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java

@@ -39,17 +39,17 @@ public class ConsumeController {
     @PostMapping("/give/guard")
     @Operation(summary = "赠送主播守护")
     @Log(title = "赠送主播守护", businessType = BusinessType.OTHER, isSaveDb = true)
-    public R<Boolean> giveGuard(@RequestBody GiveGuardReq query){
+    public R<Void> giveGuard(@RequestBody GiveGuardReq query){
         GuardConsumerResp resp = consumerManager.sendGuard(query);
-        return R.ok(resp.isSuccess());
+        return R.ok();
     }
 
     @PostMapping("/give/gift")
     @Operation(summary = "赠送主播礼物")
     @Log(title = "赠送主播礼物", businessType = BusinessType.OTHER, isSaveDb = true)
-    public R<Boolean> giveGift(@RequestBody GiveGiftReq query){
+    public R<Void> giveGift(@RequestBody GiveGiftReq query){
         GiftConsumerResp resp = consumerManager.sendGift(query);
-        return R.ok(resp.isSuccess());
+        return R.ok();
     }
 
     @PostMapping("/order/vip/create")

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java

@@ -7,6 +7,7 @@ import com.ruoyi.cai.domain.ReportCate;
 import com.ruoyi.cai.domain.WithdrawExchange;
 import com.ruoyi.cai.dto.app.vo.AgreementDTO;
 import com.ruoyi.cai.dto.app.vo.GiftVo;
+import com.ruoyi.cai.dto.app.vo.setting.SettingGoodsVo;
 import com.ruoyi.cai.service.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.R;
@@ -40,11 +41,13 @@ public class SettingAppController {
     @GetMapping("/goods")
     @Operation(summary = "充值配置")
     @Log(title = "充值配置", businessType = BusinessType.OTHER, isSaveDb = false)
-    public R<List<Goods>> goods(){
+    public R<SettingGoodsVo> goods(){
+        SettingGoodsVo vo = new SettingGoodsVo();
         List<Goods> list = goodsService.list(Wrappers.lambdaQuery(Goods.class)
                 .eq(Goods::getStatus,0)
                 .orderByAsc(Goods::getPrice));
-        return R.ok(list);
+        vo.setGoods(list);
+        return R.ok(vo);
     }
 
     @GetMapping("/withdraw")

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/setting/SettingGoodsVo.java

@@ -0,0 +1,19 @@
+package com.ruoyi.cai.dto.app.vo.setting;
+
+import com.ruoyi.cai.domain.Goods;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SettingGoodsVo {
+    @Schema(description = "是否显示支付宝支付 1-显示 0-隐藏")
+    private Integer hasAlipayPay = 1;
+    @Schema(description = "是否显示支付宝支付 1-显示 0-隐藏")
+    private Integer hasWechatPay = 1;
+    @Schema(description = "支付宝是否放在第一个 1-是 0-否")
+    private Integer alipayFirst = 1;
+    @Schema(description = "支付设置")
+    private List<Goods> goods;
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java

@@ -51,7 +51,7 @@ public class MybatisPlusConfig {
         // 设置最大单页限制数量，默认 500 条，-1 不受限制
         paginationInnerInterceptor.setMaxLimit(-1L);
         // 分页合理化
-        paginationInnerInterceptor.setOverflow(true);
+        paginationInnerInterceptor.setOverflow(false);
         return paginationInnerInterceptor;
     }