个人中心会员相关

cash-api/market-server/src/main/java/com/czg/controller/user/UMemberController.java

@@ -1,10 +1,8 @@
 package com.czg.controller.user;
 
-import com.czg.market.dto.MemberOrderDTO;
-import com.czg.market.entity.MemberOrder;
-import com.czg.market.entity.MkShopConsumeDiscountRecord;
-import com.czg.market.service.MkShopConsumeDiscountRecordService;
 import com.czg.market.service.TbMemberConfigService;
+import com.czg.market.vo.MemberDetailVO;
+import com.czg.market.vo.MemberListVO;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import com.czg.utils.ServletUtil;
@@ -12,8 +10,10 @@ import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
- * 新客立减相关
+ * 会员相关
  *
  * @author Administrator
  */
@@ -23,4 +23,22 @@ public class UMemberController {
     @Resource
     private TbMemberConfigService memberConfigService;
 
+    /**
+     * 获取所有已开通的会员
+     * @return 列表
+     */
+    @GetMapping("/list")
+    public CzgResult<List<MemberListVO>> getMemberList() {
+        return CzgResult.success(memberConfigService.getMemberList(StpKit.USER.getLoginIdAsLong()));
+    }
+
+    /**
+     * 获取会员信息详情
+     * @param shopId 店铺id
+     */
+    @GetMapping("/detail")
+    public CzgResult<MemberDetailVO> getDetail(@RequestParam Long shopId) {
+        return CzgResult.success(memberConfigService.getUserDetail(StpKit.USER.getLoginIdAsLong(), shopId));
+    }
+
 }