From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/admin/src/main/java/com/doumee/api/business/MemberController.java | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/MemberController.java b/server/admin/src/main/java/com/doumee/api/business/MemberController.java
index ded2490..b87ce4b 100644
--- a/server/admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -8,6 +8,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.dto.ChangeStatusDTO;
+import com.doumee.dao.dto.MemberListQueryDTO;
+import com.doumee.dao.vo.MemberDetailVO;
+import com.doumee.dao.vo.MemberListVO;
import com.doumee.service.business.MemberService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.Api;
@@ -84,23 +88,6 @@
@RequiresPermissions("business:member:exportExcel")
public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response) {
List<Member> memberList = memberService.findPage(pageWrap).getRecords();
- if(CollectionUtils.isNotEmpty(memberList)){
- for (Member m:memberList) {
- m.setAmountYuan(Objects.nonNull(m.getAmount())&&m.getAmount()> Constants.ZERO? new BigDecimal(m.getAmount()+"").divide(new BigDecimal("100"),2,BigDecimal.ROUND_UP):BigDecimal.ZERO);
- List<String> identityInfo = new ArrayList<>();
- if(Constants.equalsInteger(m.getWorkerIdentity(),Constants.TWO)){
- identityInfo.add("宸ヤ汉");
- }
- if(Constants.equalsInteger(m.getDriverIdentity(),Constants.TWO)){
- identityInfo.add("鍙告満");
- }
- if(Constants.equalsInteger(m.getChefIdentity(),Constants.TWO)){
- identityInfo.add("渚涢");
- }
- m.setIdentityApplyInfo(StringUtils.join(identityInfo,","));
- m.setIdentityInfo("鍙戝崟鏂�" + (StringUtils.isNotBlank(m.getIdentityApplyInfo())?" | 鎺ュ崟鏂�":""));
- }
- }
ExcelExporter.build(Member.class).export(memberList, "浼氬憳淇℃伅琛�", response);
}
@@ -110,4 +97,40 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(memberService.findById(id));
}
+
+ @ApiOperation("浼氬憳鍒楄〃鍒嗛〉鏌ヨ")
+ @PostMapping("/list/page")
+ @RequiresPermissions("business:member:query")
+ public ApiResponse<PageData<MemberListVO>> findMemberListPage(@RequestBody PageWrap<MemberListQueryDTO> pageWrap) {
+ return ApiResponse.success(memberService.findMemberListPage(pageWrap));
+ }
+
+ @ApiOperation("浼氬憳鍒楄〃瀵煎嚭Excel")
+ @PostMapping("/list/exportExcel")
+ @RequiresPermissions("business:member:exportExcel")
+ public void exportMemberListExcel(@RequestBody PageWrap<MemberListQueryDTO> pageWrap, HttpServletResponse response) {
+ List<MemberListVO> list = memberService.findMemberListPage(pageWrap).getRecords();
+ ExcelExporter.build(MemberListVO.class).export(list, "浼氬憳鍒楄〃", response);
+ }
+
+ @ApiOperation("浼氬憳璇︽儏鏌ヨ")
+ @GetMapping("/detail/{id}")
+ @RequiresPermissions("business:member:query")
+ public ApiResponse<MemberDetailVO> findMemberDetail(@PathVariable Integer id) {
+ return ApiResponse.success(memberService.findMemberDetail(id));
+ }
+
+ @ApiOperation("淇敼浼氬憳鐘舵��")
+ @PostMapping("/updateStatus")
+ @RequiresPermissions("business:member:update")
+ public ApiResponse updateStatus(@RequestBody ChangeStatusDTO dto) {
+ if (dto.getId() == null || dto.getStatus() == null || (dto.getStatus() != 0 && dto.getStatus() != 1)) {
+ return ApiResponse.failed("鍙傛暟閿欒锛岀姸鎬侊細0=鍚敤锛�1=绂佺敤");
+ }
+ Member member = new Member();
+ member.setId(dto.getId());
+ member.setStatus(dto.getStatus());
+ memberService.updateById(member);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.9.3