From fe413d0c995f74c25240e3cb8b69a2d50581d9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Fri, 12 Apr 2024 09:47:53 +0800 Subject: [PATCH] 123 --- .../web/controller/cai/InnerController.java | 25 --------- .../controller/cai/app/IndexController.java | 6 +- .../cai/test/TestPayController.java | 55 ------------------- .../service/impl/ConsumeLogServiceImpl.java | 10 ++-- 4 files changed, 9 insertions(+), 87 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/InnerController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/test/TestPayController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/InnerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/InnerController.java deleted file mode 100644 index 3fd0fd20..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/InnerController.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.ruoyi.web.controller.cai; - -import cn.dev33.satoken.annotation.SaIgnore; -import com.ruoyi.cai.domain.AgreementSetting; -import com.ruoyi.cai.service.AgreementSettingService; -import com.ruoyi.common.core.domain.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/api/inner") -@SaIgnore -public class InnerController { - - @Autowired - private AgreementSettingService agreementSettingService; - - @GetMapping("/agreement") - public R report(){ - AgreementSetting agreementSetting = agreementSettingService.getAgreementSetting(); - return R.ok(agreementSetting); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java index efa6f0ab..a5c61d7b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java @@ -54,7 +54,7 @@ public class IndexController { private SystemConfigManager systemConfigManager; @GetMapping("/config") - @Operation(summary = "获取APP系统核心参数(无需鉴权可访问)") + @Operation(summary = "获取APP系统核心参数") @Log(title = "获取APP系统核心参数", businessType = BusinessType.OTHER, isSaveDb = false) @SaIgnore public R config(){ @@ -88,13 +88,13 @@ public class IndexController { return R.ok(home); } - @GetMapping("/anchor/test/page") + /*@GetMapping("/anchor/test/page") @Operation(summary = "主播测试接口",hidden = true) @Log(title = "主播测试接口", businessType = BusinessType.OTHER, isSaveDb = false) public R> anchorTestPage(PageQuery page, AnchorListQuery query){ Page res = anchorService.pageApp(page,query); return R.ok(res.getRecords()); - } + }*/ @GetMapping("/user/page") @Operation(summary = "首页用户搜索接口-分页") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/test/TestPayController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/test/TestPayController.java deleted file mode 100644 index 8ae21ed8..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/test/TestPayController.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.ruoyi.web.controller.cai.test; - -import com.ruoyi.cai.domain.RechargeOrder; -import com.ruoyi.cai.domain.VipOrder; -import com.ruoyi.cai.dto.app.query.order.AddRechargeOrderDto; -import com.ruoyi.cai.dto.app.query.order.AddVipOrderDto; -import com.ruoyi.cai.pay.PayManager; -import com.ruoyi.cai.service.RechargeOrderService; -import com.ruoyi.cai.service.VipOrderService; -import com.ruoyi.common.core.domain.R; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/cai/test/pay") -@Tag(name = "测试接口，正式环境取消") -public class TestPayController { - - @Autowired - private VipOrderService vipOrderService; - @Autowired - private RechargeOrderService rechargeOrderService; - @Autowired - private PayManager payManager; - - @GetMapping("/vip") - @Operation(hidden = true) - public R vip(Long memberPriceId, Long userId){ - AddVipOrderDto addVipOrderDto = new AddVipOrderDto(); - addVipOrderDto.setUserId(userId); - addVipOrderDto.setMemberPriceId(memberPriceId); - VipOrder vipOrder = vipOrderService.addVipOrder(addVipOrderDto); - payManager.callBack(vipOrder.getOrderNo()); - return R.ok(); - } - - @GetMapping("/recharge") - @Operation(hidden = true) - public R recharge(Long goodId, Long userId){ - AddRechargeOrderDto dto = new AddRechargeOrderDto(); - dto.setUserId(userId); - dto.setGoodId(goodId); - RechargeOrder order = rechargeOrderService.addRechargeOrder(dto); - payManager.callBack(order.getOrderNo()); - return R.ok(); - } -} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java index 3fd82102..79090538 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java @@ -119,16 +119,18 @@ public class ConsumeLogServiceImpl extends ServiceImpl