From c8df15c5d52874b0cb1b53e27091ce1cc4cd6634 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 25 Sep 2021 10:51:32 +0800
Subject: [PATCH] add overtime job
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index b26eb4c..9ef0804 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -1,17 +1,21 @@
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.MallMember;
-import cc.mrbird.febs.mall.service.IBackMallMemberService;
+import cc.mrbird.febs.mall.entity.MallOrderRefund;
+import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.validation.constraints.NotNull;
import java.util.Map;
@Slf4j
@@ -21,7 +25,7 @@
@RequestMapping(value = "/admin/mallMember")
public class AdminMallMemberController extends BaseController {
- private final IBackMallMemberService mallMemberService;
+ private final IAdminMallMemberService mallMemberService;
/**
* 会员列表
@@ -34,4 +38,42 @@
Map<String, Object> data = getDataTable(mallMemberService.getMallMemberList(mallMember, request));
return new FebsResponse().success().data(data);
}
+
+ /**
+ * 会员列表---禁止
+ * @param id
+ * @return
+ */
+ @GetMapping("closeAccount/{id}")
+ @ControllerEndpoint(operation = "会员列表---禁止", exceptionMessage = "禁止失败")
+ public FebsResponse closeAccount(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.closeAccount(id);
+ }
+
+ /**
+ * 会员列表---开启
+ * @param id
+ * @return
+ */
+ @GetMapping("openAccount/{id}")
+ @ControllerEndpoint(operation = "会员列表---开启", exceptionMessage = "开启失败")
+ public FebsResponse openAccount(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.openAccount(id);
+ }
+
+ /**
+ * 会员列表-资金流水
+ */
+ @GetMapping("/moneyFlow")
+ public FebsResponse moneyFlow(QueryRequest request, MallMember mallMember, Integer parentId) {
+ if(parentId==null){
+ ViewMallMemberController.idFromMoneyFlow=0;
+ }
+ mallMember.setId(ViewMallOrderController.idFromRefund);
+ Map<String, Object> dataTable = getDataTable(mallMemberService.moneyFlow(request, mallMember));
+ return new FebsResponse().success().data(dataTable);
+ }
+
+
+
}
--
Gitblit v1.9.1