From 664184af3e070dee665ee736caffa0297804975f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 18 Mar 2025 11:46:02 +0800
Subject: [PATCH] perf(mall): 移除会员利润计算中的异步执行

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminRunVipController.java |   77 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminRunVipController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminRunVipController.java
index e9ca8cc..737d0fb 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminRunVipController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminRunVipController.java
@@ -1,15 +1,19 @@
 package cc.mrbird.febs.mall.controller;
 
+import cc.mrbird.febs.common.annotation.ControllerEndpoint;
 import cc.mrbird.febs.common.controller.BaseController;
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.mall.entity.RunVip;
+import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.MallMemberMapper;
 import cc.mrbird.febs.mall.service.IAdminRunVipService;
+import cc.mrbird.febs.mall.service.ISystemService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotNull;
 import java.util.Map;
 
 @Slf4j
@@ -20,10 +24,65 @@
 public class AdminRunVipController extends BaseController{
 
     private final IAdminRunVipService iAdminRunVipService;
+    private final MallMemberMapper mallMemberMapper;
+    private final ISystemService systemService;
+
+//    @PostMapping(value = "/bonusSystemSetting")
+//    @ControllerEndpoint(operation = "碳积分-系统设置", exceptionMessage = "操作失败")
+//    public FebsResponse bonusSystemSetting(@RequestBody Map<String, Object> map) {
+//        systemService.bonusSystemSetting(map);
+//        return new FebsResponse().success().message("设置成功");
+//    }
+
+    @GetMapping(value = "/allMoneyType")
+    public FebsResponse allMoneyType() {
+        return new FebsResponse().success().data(iAdminRunVipService.allMoneyType());
+    }
+
+    @GetMapping(value = "/allVipList")
+    public FebsResponse allVipList() {
+        return new FebsResponse().success().data(iAdminRunVipService.list());
+    }
+
+    @PostMapping("vipLevelSetUpdate")
+    public FebsResponse vipLevelSetUpdate(MallMember member) {
+        mallMemberMapper.updateVipLevelTimeAndLevel(member.getId(),member.getVipLevelTime(),member.getLevel());
+        return new FebsResponse().success().message("操作成功");
+    }
+
+    @GetMapping("/sellList")
+    public FebsResponse sellList(MallMemberWithdraw mallMemberWithdraw, QueryRequest request) {
+        Map<String, Object> data = getDataTable(iAdminRunVipService.sellList(mallMemberWithdraw,request));
+        return new FebsResponse().success().data(data);
+    }
+
+    @GetMapping("sellAgree/{state}/{id}")
+    @ControllerEndpoint(operation = "碳币提现", exceptionMessage = "操作失败")
+    public FebsResponse sellAgree(@NotNull(message = "{required}") @PathVariable Integer state, @NotNull(message = "{required}") @PathVariable Long id) {
+        return iAdminRunVipService.sellAgree(state,id);
+    }
+
+    @GetMapping("/buyList")
+    public FebsResponse buyList(MallCharge mallCharge, QueryRequest request) {
+        Map<String, Object> data = getDataTable(iAdminRunVipService.buyList(mallCharge,request));
+        return new FebsResponse().success().data(data);
+    }
+
+    @GetMapping("chargeAgree/{state}/{id}")
+    @ControllerEndpoint(operation = "会员购买会员", exceptionMessage = "操作失败")
+    public FebsResponse chargeAgree(@NotNull(message = "{required}") @PathVariable Integer state, @NotNull(message = "{required}") @PathVariable Long id) {
+        return iAdminRunVipService.chargeAgree(state,id);
+    }
 
     @GetMapping("/list")
     public FebsResponse list(RunVip runVip,QueryRequest request) {
         Map<String, Object> data = getDataTable(iAdminRunVipService.runVipListInPage(runVip,request));
+        return new FebsResponse().success().data(data);
+    }
+
+    @GetMapping("/nodeList")
+    public FebsResponse nodeList(RunNodeSet runNodeSet, QueryRequest request) {
+        Map<String, Object> data = getDataTable(iAdminRunVipService.nodeListInPage(runNodeSet,request));
         return new FebsResponse().success().data(data);
     }
 
@@ -37,6 +96,22 @@
         return new FebsResponse().success().message("操作成功");
     }
 
+    @PostMapping(value = "/nodeAddOrEdit")
+    public FebsResponse nodeAddOrEdit(@RequestBody RunNodeSet config) {
+        if (config.getId() == null) {
+            iAdminRunVipService.addRunNodeSet(config);
+        } else {
+            iAdminRunVipService.editRunNodeSet(config);
+        }
+        return new FebsResponse().success().message("操作成功");
+    }
+
+    @GetMapping(value = "/nodeDel/{id}")
+    public FebsResponse nodeDel(@PathVariable("id") Long id) {
+        iAdminRunVipService.deleteNodeById(id);
+        return new FebsResponse().success().message("操作成功");
+    }
+
     @GetMapping(value = "/del/{id}")
     public FebsResponse del(@PathVariable("id") Long id) {
         iAdminRunVipService.getBaseMapper().deleteById(id);

--
Gitblit v1.9.1