From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 147 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 143 insertions(+), 4 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 215b2cd..6aeac21 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -4,22 +4,30 @@
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.common.tree.MatrixTree;
import cc.mrbird.febs.mall.dto.*;
-import cc.mrbird.febs.mall.entity.AppVersion;
-import cc.mrbird.febs.mall.entity.MallMember;
-import cc.mrbird.febs.mall.entity.MallNewsInfo;
-import cc.mrbird.febs.mall.entity.MallShopApply;
+import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo;
+import cc.mrbird.febs.mall.vo.AdminMoneyFlowListVo;
+import cc.mrbird.febs.mall.vo.ChargeListExportVo;
+import cc.mrbird.febs.system.entity.Dept;
+import com.alibaba.excel.EasyExcel;
+
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.List;
import java.util.Map;
@@ -83,6 +91,30 @@
return mallMemberService.openAccount(id);
}
+ /**
+ * 会员列表---禁止
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("insideWithYes/{id}")
+ @ControllerEndpoint(operation = "会员列表---禁止", exceptionMessage = "禁止失败")
+ public FebsResponse insideWithYes(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.insideWithType(id,1);
+ }
+
+ /**
+ * 会员列表---开启
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("insideWithNo/{id}")
+ @ControllerEndpoint(operation = "会员列表---开启", exceptionMessage = "开启失败")
+ public FebsResponse insideWithNo(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.insideWithType(id,2);
+ }
+
@GetMapping("changeIdentityYes/{type}/{id}")
public FebsResponse changeIdentityYes(@PathVariable("type") Integer type, @PathVariable("id") Long id) {
mallMemberService.changeIdentity(type, id, 1);
@@ -99,6 +131,7 @@
* 会员列表-资金流水
*/
@GetMapping("/moneyFlow")
+ @RequiresPermissions("moneyFlow:update")
public FebsResponse moneyFlow(QueryRequest request, MallMember mallMember, Integer parentId) {
if (parentId == null) {
ViewMallMemberController.idFromMoneyFlow = 0;
@@ -115,6 +148,16 @@
@ControllerEndpoint(operation = "会员列表-系统拨付", exceptionMessage = "操作失败")
public FebsResponse updateSystemPay(@Valid MallSystemPayDto mallSystemPayDto) {
return mallMemberService.updateSystemPay(mallSystemPayDto);
+ }
+
+ /**
+ * 会员列表-系统拨付绿色凭证
+ */
+ @PostMapping("updateVoucher")
+ @ControllerEndpoint(operation = "会员列表-系统拨付绿色凭证", exceptionMessage = "操作失败")
+ public FebsResponse updateVoucher(@Valid MallSystemPayDto mallSystemPayDto) {
+// return mallMemberService.updateSystemPay(mallSystemPayDto);
+ return mallMemberService.updateVoucher(mallSystemPayDto);
}
/**
@@ -349,6 +392,13 @@
return new FebsResponse().success().message("操作成功");
}
+ @PostMapping("updateShopApply")
+ @ControllerEndpoint(operation = "商户申请编辑", exceptionMessage = "操作失败")
+ public FebsResponse updateShopApply(@Valid MallShopApply apply) {
+ mallMemberService.updateShopApply(apply);
+ return new FebsResponse().success();
+ }
+
@PostMapping("/refererIdUpdate")
@ControllerEndpoint(operation = "修改推荐人", exceptionMessage = "修改失败")
public FebsResponse refererIdUpdate(MallMember member) {
@@ -364,8 +414,97 @@
registerDto.setPassword("a123456");
registerDto.setInviteId(member.getInviteId());
registerDto.setName(member.getName());
+ registerDto.setSex(member.getSex());
apiMallMemberService.register(registerDto);
return new FebsResponse().success();
}
+ /**
+ * 创世释放记录-列表
+ * @param roleReleaseDto
+ * @param request
+ * @return
+ */
+ @GetMapping("gerRoleRelease")
+ public FebsResponse gerRoleRelease(AdminRoleReleaseDto roleReleaseDto, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.gerRoleReleaseList(roleReleaseDto, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 创世释放记录-全部记录
+ */
+ @GetMapping("/roleReleaseChild")
+ public FebsResponse roleReleaseChild(QueryRequest request, MallScoreRecord mallScoreRecord, Integer parentId) {
+ if (parentId == null) {
+ ViewMallMemberController.idFromScoreRoleRelease = 0;
+ }
+ mallScoreRecord.setId(ViewMallMemberController.idFromScoreRoleRelease);
+ Map<String, Object> dataTable = getDataTable(mallMemberService.roleReleaseChild(request, mallScoreRecord));
+ return new FebsResponse().success().data(dataTable);
+ }
+
+ /**
+ * 业绩释放记录-列表
+ * @param roleReleaseDto
+ * @param request
+ * @return
+ */
+ @GetMapping("gerAchieveRelease")
+ public FebsResponse gerAchieveRelease(AdminRoleReleaseDto roleReleaseDto, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.gerAchieveReleaseList(roleReleaseDto, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 业绩释放记录-全部记录
+ */
+ @GetMapping("/achieveReleaseChild")
+ public FebsResponse achieveReleaseChild(QueryRequest request, MallScoreAchieveRelease mallScoreAchieveRelease, Integer parentId) {
+ if (parentId == null) {
+ ViewMallMemberController.idFromScoreAchieveRelease = 0;
+ }
+ mallScoreAchieveRelease.setId(ViewMallMemberController.idFromScoreAchieveRelease);
+ Map<String, Object> dataTable = getDataTable(mallMemberService.achieveReleaseChild(request, mallScoreAchieveRelease));
+ return new FebsResponse().success().data(dataTable);
+ }
+
+ @GetMapping(value = "/matrixTree")
+ public FebsResponse matrixTree() {
+ MatrixTree instance = MatrixTree.getInstance();
+ return null;
+ }
+
+ @GetMapping(value = "/chargeList/excel")
+ public void exportChargeList(MoneyChargeListDto moneyChargeListDto, HttpServletResponse response) throws IOException {
+ List<ChargeListExportVo> list = this.mallMemberService.findChargeListForExcel(moneyChargeListDto);
+
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ String fileName= URLEncoder.encode("提现列表","UTF-8").replaceAll("\\+","%20");
+ response.setHeader("Content-disposition","attachment;filename*=utf-8''"+fileName+".xlsx");
+ EasyExcel.write(response.getOutputStream(),ChargeListExportVo.class).sheet("提现列表").doWrite(list);
+ }
+
+ @GetMapping("teamList")
+ public FebsResponse teamList(MallMember mallMember, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.findTeamList(mallMember, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ @GetMapping(value = "/moneyFlow/excel")
+ public void exportMoneyFlow(MoneyFlowListDto moneyFlowListDto, HttpServletResponse response) throws IOException {
+ QueryRequest request = new QueryRequest();
+ request.setPageNum(1);
+ request.setPageSize(999999999);
+
+ List<AdminMoneyFlowListVo> list = this.mallMemberService.getMoneyFlowListInPage(moneyFlowListDto, request).getRecords();
+
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ String fileName= URLEncoder.encode("资金明细表","UTF-8").replaceAll("\\+","%20");
+ response.setHeader("Content-disposition","attachment;filename*=utf-8''"+fileName+".xlsx");
+ EasyExcel.write(response.getOutputStream(),AdminMoneyFlowListVo.class).sheet("资金明细表").doWrite(list);
+ }
+
}
--
Gitblit v1.9.1