From 3aef471b170a703b501ddb4d9d2a12791d07ff28 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 15 四月 2026 20:06:56 +0800
Subject: [PATCH] 代码生成

---
 server/admin/src/main/java/com/doumee/api/business/MemberController.java |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 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..16544ac 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,9 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.Member;
+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 +87,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 +96,26 @@
     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));
+    }
 }

--
Gitblit v1.9.3