[feat]增加app轮播接口，增加app会员接口

ruoyi-admin/src/main/java/org/dromara/app/AppArticleController.java

@@ -0,0 +1,31 @@
+package org.dromara.app;
+
+import com.wzj.soopin.content.domain.bo.ArticleBO;
+import com.wzj.soopin.content.domain.vo.ArticleVO;
+import com.wzj.soopin.content.service.IArticleService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/app/article")
+@Tag(name = "内容管理")
+@RequiredArgsConstructor
+public class AppArticleController {
+
+    private final IArticleService service;
+    @Tag(name = "轮播列表")
+    @PostMapping("/carousel")
+    public R<List<ArticleVO>> carousel(@RequestBody ArticleBO bo) {
+        bo.setType(1);//轮播图
+        bo.setCategoryId(1l);
+        List<ArticleVO> articleList = service.selectVoList( bo.toWrapper());
+        return R.ok(articleList);
+    }
+}

ruoyi-admin/src/main/java/org/dromara/app/AppCarouselController.java

@@ -1,4 +0,0 @@
-package org.dromara.app;
-
-public class AppCarouselController {
-}

ruoyi-admin/src/main/java/org/dromara/app/AppMemberController.java

@@ -0,0 +1,60 @@
+package org.dromara.app;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wzj.soopin.member.convert.MemberAccountChangeRecordConvert;
+import com.wzj.soopin.member.convert.MemberAccountConvert;
+import com.wzj.soopin.member.convert.MemberConvert;
+import com.wzj.soopin.member.domain.bo.MemberAccountChangeRecordBO;
+import com.wzj.soopin.member.domain.po.MemberAccountChangeRecord;
+import com.wzj.soopin.member.domain.vo.MemberAccountChangeRecordVO;
+import com.wzj.soopin.member.domain.vo.MemberAccountVO;
+import com.wzj.soopin.member.domain.vo.MemberVO;
+import com.wzj.soopin.member.service.IMemberAccountChangeRecordService;
+import com.wzj.soopin.member.service.IMemberAccountService;
+import com.wzj.soopin.member.service.IMemberService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/app/member")
+@Tag(name = "会员管理")
+@RequiredArgsConstructor
+public class AppMemberController {
+
+    private final IMemberService service;
+
+    private final MemberConvert convert;
+
+    private final MemberAccountConvert accountConvert;
+
+    private final IMemberAccountService accountService;
+
+    private final IMemberAccountChangeRecordService accountChangeRecordService;
+
+    private final MemberAccountChangeRecordConvert accountChangeRecordConvert;
+
+
+
+    @Tag(name ="获取会员账户信息详细信息")
+    @GetMapping(value = "/member/{id}")
+    public R<MemberVO> getInfo(@PathVariable("id") Long id) {
+        return R.ok(convert.toVO(service.getById(id)));
+    }
+
+    @Tag(name ="获取会员账户表详细信息")
+    @GetMapping(value = "/account/{memberId}")
+    public R<MemberAccountVO> accountInfo(@PathVariable("memberId") Long memberId) {
+        return R.ok(accountConvert.toVO(accountService.getById(memberId)));
+    }
+
+    @Tag(name = "查询账单")
+    @PostMapping("/changeRecord/list")
+    public R<Page<MemberAccountChangeRecordVO>> list(@RequestBody MemberAccountChangeRecordBO bo,
+                                                     @RequestBody  Page<MemberAccountChangeRecord> page) {
+        Page<MemberAccountChangeRecord> memberPage = accountChangeRecordService.page(page,bo.toWrapper());
+        return R.ok(accountChangeRecordConvert.toVO(memberPage));
+    }
+}

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java

@@ -52,9 +52,9 @@ public class MemberAccountController  {
     }
 
     @Tag(name ="获取会员账户表详细信息")
-    @GetMapping(value = "/{memberId}")
-    public R<MemberAccountVO> getInfo(@PathVariable("memberId") Long memberId) {
-        return R.ok(convert.toVO(service.getById(memberId)));
+    @GetMapping(value = "/{id}")
+    public R<MemberAccountVO> getInfo(@PathVariable("id") Long id) {
+        return R.ok(convert.toVO(service.getById(id)));
     }
 
     @Tag(name ="新增会员账户表")