提交案例

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java

@@ -5,11 +5,16 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiBean.InfoBean;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.modules.apiBean.HanHaiBankBean;
+import org.jeecg.modules.apiBean.HanHaiWaterBean;
+import org.jeecg.modules.apiBean.MyReleasePageBean;
+import org.jeecg.modules.apiBean.PromotionPageBean;
+import org.jeecg.modules.apiservice.InfoApiService;
+import org.jeecg.modules.hanHaiBank.entity.HanHaiBank;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 @Api(tags="小程序-个人中心接口")
 @RestController
@@ -17,66 +22,62 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class InfoApiController {
 
+    //获取个人中心接口
+    @Resource
+    private InfoApiService infoApiService;
+
 
     //获取个人信息接口
     @ApiOperation(value="小程序-获取个人信息接口", notes="小程序-获取个人信息接口")
     @GetMapping("/getInfo")
     public Result<?> getInfo(@RequestHeader("X-Access-Token") String token)
     {
-        return Result.OK();
+        return infoApiService.getInfo(token);
     }
 
 
     //修改个人信息接口
     @ApiOperation(value="小程序-修改个人信息接口", notes="小程序-修改个人信息接口")
-    @GetMapping("/updateInfo")
-    public Result<?> updateInfo(@RequestHeader("X-Access-Token") String token, InfoBean bean)
+    @PostMapping("/updateInfo")
+    public Result<?> updateInfo(@RequestHeader("X-Access-Token") String token, HanHaiMember bean)
     {
-        return Result.OK();
+        return infoApiService.updateInfo(token,bean);
     }
 
 
     //添加银行卡
     @ApiOperation(value="小程序-添加银行卡", notes="小程序-添加银行卡")
     @GetMapping("/addBankCard")
-    public Result<?> addBankCard(@RequestHeader("X-Access-Token") String token)
+    public Result<?> addBankCard(@RequestHeader("X-Access-Token") String token, HanHaiBank bean)
     {
-        return Result.OK();
+        return infoApiService.addBankCard(token,bean);
     }
 
 
     //获取银行卡列表带分页
     @ApiOperation(value="小程序-获取银行卡列表带分页", notes="小程序-获取银行卡列表带分页")
     @GetMapping("/getBankCardPage")
-    public Result<?> getBankCardPage(@RequestHeader("X-Access-Token") String token)
+    public Result<?> getBankCardPage(@RequestHeader("X-Access-Token") String token, HanHaiBankBean bean)
     {
-        return Result.OK();
+        return infoApiService.getBankCardPage(token,bean);
     }
 
 
     //获取收益记录带分页
     @ApiOperation(value="小程序-获取收益记录带分页", notes="小程序-获取收益记录带分页")
     @GetMapping("/getIncomePage")
-    public Result<?> getIncomePage(@RequestHeader("X-Access-Token") String token)
+    public Result<?> getIncomePage(@RequestHeader("X-Access-Token") String token, HanHaiWaterBean bean)
     {
-        return Result.OK();
+        return infoApiService.getIncomePage(token,bean);
     }
 
 
-    //用户提现
-    @ApiOperation(value="小程序-用户提现", notes="小程序-用户提现")
-    @GetMapping("/withdraw")
-    public Result<?> withdraw(@RequestHeader("X-Access-Token") String token)
-    {
-        return Result.OK();
-    }
-
     //获取提现记录带分页
     @ApiOperation(value="小程序-获取提现记录带分页", notes="小程序-获取提现记录带分页")
     @GetMapping("/getWithdrawPage")
-    public Result<?> getWithdrawPage(@RequestHeader("X-Access-Token") String token)
+    public Result<?> getWithdrawPage(@RequestHeader("X-Access-Token") String token, HanHaiWaterBean bean)
     {
-        return Result.OK();
+        return infoApiService.getWithdrawPage(token,bean);
     }
 
 
@@ -85,7 +86,7 @@ public class InfoApiController {
     @GetMapping("/getCertification")
     public Result<?> getCertification(@RequestHeader("X-Access-Token") String token)
     {
-        return Result.OK();
+        return infoApiService.getCertification(token);
     }
 
     //获取企业认证信息
@@ -93,59 +94,74 @@ public class InfoApiController {
     @GetMapping("/getCompanyCertification")
     public Result<?> getCompanyCertification(@RequestHeader("X-Access-Token") String token)
     {
-        return Result.OK();
+        return infoApiService.getCompanyCertification(token);
     }
 
 
-    //个人认证提交
-    @ApiOperation(value="小程序-个人认证提交", notes="小程序-个人认证提交")
-    @GetMapping("/submitCertification")
-    public Result<?> submitCertification(@RequestHeader("X-Access-Token") String token)
-    {
-        return Result.OK();
-    }
-
-    //企业认证提交
-    @ApiOperation(value="小程序-企业认证提交", notes="小程序-企业认证提交")
-    @GetMapping("/submitCompanyCertification")
-    public Result<?> submitCompanyCertification(@RequestHeader("X-Access-Token") String token)
-    {
-        return Result.OK();
-    }
-
     //获取推广记录列表
     @ApiOperation(value="小程序-获取推广记录列表", notes="小程序-获取推广记录列表")
     @GetMapping("/getPromotionPage")
-    public Result<?> getPromotionPage(@RequestHeader("X-Access-Token") String token)
+    public Result<?> getPromotionPage(@RequestHeader("X-Access-Token") String token, PromotionPageBean bean)
     {
-        return Result.OK();
+        return infoApiService.getPromotionPage(token,bean);
     }
 
     //获取推广记录详情
     @ApiOperation(value="小程序-获取推广记录详情", notes="小程序-获取推广记录详情")
     @GetMapping("/getPromotionDetail")
-    public Result<?> getPromotionDetail(@RequestHeader("X-Access-Token") String token)
+    public Result<?> getPromotionDetail(@RequestHeader("X-Access-Token") String token,String id)
     {
-        return Result.OK();
+        return infoApiService.getPromotionDetail(token,id);
     }
 
 
     //获取我的发布列表
     @ApiOperation(value="小程序-获取我的发布列表", notes="小程序-获取我的发布列表")
     @GetMapping("/getMyReleasePage")
-    public Result<?> getMyReleasePage(@RequestHeader("X-Access-Token") String token)
+    public Result<?> getMyReleasePage(@RequestHeader("X-Access-Token") String token, MyReleasePageBean bean)
     {
-        return Result.OK();
+        return infoApiService.getMyReleasePage(token,bean);
     }
 
     //获取我的发布详情
     @ApiOperation(value="小程序-获取我的发布详情", notes="小程序-获取我的发布详情")
     @GetMapping("/getMyReleaseDetail")
-    public Result<?> getMyReleaseDetail(@RequestHeader("X-Access-Token") String token)
+    public Result<?> getMyReleaseDetail(@RequestHeader("X-Access-Token") String token,String id)
+    {
+        return infoApiService.getMyReleaseDetail(token,id);
+    }
+
+
+    //用户提现
+    @ApiOperation(value="小程序-用户提现", notes="小程序-用户提现")
+    @GetMapping("/withdraw")
+    public Result<?> withdraw(@RequestHeader("X-Access-Token") String token)
     {
         return Result.OK();
     }
 
 
 
+
+
+    //个人认证提交
+    @ApiOperation(value="小程序-个人认证提交", notes="小程序-个人认证提交")
+    @GetMapping("/submitCertification")
+    public Result<?> submitCertification(@RequestHeader("X-Access-Token") String token)
+    {
+        return Result.OK();
+    }
+
+    //企业认证提交
+    @ApiOperation(value="小程序-企业认证提交", notes="小程序-企业认证提交")
+    @GetMapping("/submitCompanyCertification")
+    public Result<?> submitCompanyCertification(@RequestHeader("X-Access-Token") String token)
+    {
+        return Result.OK();
+    }
+
+
+
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HanHaiBankBean.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HanHaiBankBean {
+
+    /**显示条数*/
+    @ApiModelProperty(value = "显示条数" )
+    private Integer pageSize;
+    /**当前页*/
+    @ApiModelProperty(value = "当前页" )
+    private Integer pageNo;
+
+    public HanHaiBankBean() {
+        this.pageNo = 1;
+        this.pageSize = 1000;
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HanHaiWaterBean.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HanHaiWaterBean {
+
+
+    /**显示条数*/
+    @ApiModelProperty(value = "显示条数" )
+    private Integer pageSize;
+    /**当前页*/
+    @ApiModelProperty(value = "当前页" )
+    private Integer pageNo;
+
+    public HanHaiWaterBean() {
+        this.pageNo = 1;
+        this.pageSize = 1000;
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/InfoBean.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.apiBean;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class InfoBean {
-
-    //昵称
-    @ApiModelProperty(value = "昵称" )
-    private String nickname;
-    //头像
-    @ApiModelProperty(value = "头像" )
-    private String avatarUrl;
-    //电话
-    @ApiModelProperty(value = "电话" )
-    private String phone;
-
-}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/MyReleasePageBean.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MyReleasePageBean {
+
+
+
+    /**显示条数*/
+    @ApiModelProperty(value = "显示条数" )
+    private Integer pageSize;
+    /**当前页*/
+    @ApiModelProperty(value = "当前页" )
+    private Integer pageNo;
+
+    public MyReleasePageBean() {
+        this.pageNo = 1;
+        this.pageSize = 1000;
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PromotionPageBean.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PromotionPageBean {
+
+
+
+    /**显示条数*/
+    @ApiModelProperty(value = "显示条数" )
+    private Integer pageSize;
+    /**当前页*/
+    @ApiModelProperty(value = "当前页" )
+    private Integer pageNo;
+
+    public PromotionPageBean() {
+        this.pageNo = 1;
+        this.pageSize = 1000;
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java

@@ -1,7 +1,12 @@
 package org.jeecg.modules.apiservice;
 
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiBean.InfoBean;
+import org.jeecg.modules.apiBean.HanHaiBankBean;
+import org.jeecg.modules.apiBean.HanHaiWaterBean;
+import org.jeecg.modules.apiBean.MyReleasePageBean;
+import org.jeecg.modules.apiBean.PromotionPageBean;
+import org.jeecg.modules.hanHaiBank.entity.HanHaiBank;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 
 public interface InfoApiService {
 
@@ -9,7 +14,16 @@ public interface InfoApiService {
     Result<?> getInfo(String token);
 
     //修改个人信息接口
-    Result<?> updateInfo(String token, InfoBean bean);
+    Result<?> updateInfo(String token, HanHaiMember bean);
+
+    //添加银行卡
+    Result<?> addBankCard(String token, HanHaiBank bean);
+
+    //获取银行卡列表带分页
+    Result<?> getBankCardPage(String token, HanHaiBankBean bean);
+
+
+
 
     //个人认证提交
     Result<?> submitCertification(String token);
@@ -24,28 +38,26 @@ public interface InfoApiService {
     Result<?> getCompanyCertification(String token);
 
     //获取我的发布列表
-    Result<?> getMyReleasePage(String token);
+    Result<?> getMyReleasePage(String token, MyReleasePageBean bean);
 
     //获取我的发布详情
-    Result<?> getMyReleaseDetail(String token);
+    Result<?> getMyReleaseDetail(String token,String id);
 
     //获取推广记录列表
-    Result<?> getPromotionPage(String token);
+    Result<?> getPromotionPage(String token, PromotionPageBean bean);
 
     //获取推广记录详情
-    Result<?> getPromotionDetail(String token);
+    Result<?> getPromotionDetail(String token,String id);
 
     //获取提现记录带分页
-    Result<?> getWithdrawPage(String token);
+    Result<?> getWithdrawPage(String token, HanHaiWaterBean bean);
 
     //获取收益记录带分页
-    Result<?> getIncomePage(String token);
+    Result<?> getIncomePage(String token,HanHaiWaterBean bean);
+
+
 
-    //获取银行卡列表带分页
-    Result<?> getBankCardPage(String token);
 
-    //添加银行卡
-    Result<?> addBankCard(String token);
 
     //用户提现
     Result<?> withdraw(String token);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java

@@ -1,101 +1,215 @@
 package org.jeecg.modules.apiservice.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiBean.InfoBean;
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.apiBean.HanHaiBankBean;
+import org.jeecg.modules.apiBean.HanHaiWaterBean;
+import org.jeecg.modules.apiBean.MyReleasePageBean;
+import org.jeecg.modules.apiBean.PromotionPageBean;
 import org.jeecg.modules.apiservice.InfoApiService;
+import org.jeecg.modules.atPerformer.entity.AtPerformer;
+import org.jeecg.modules.atPerformer.service.IAtPerformerService;
+import org.jeecg.modules.atPromotion.entity.AtPromotion;
+import org.jeecg.modules.atPromotion.service.IAtPromotionService;
+import org.jeecg.modules.atTrends.entity.AtTrends;
+import org.jeecg.modules.atTrends.service.IAtTrendsService;
+import org.jeecg.modules.hanHaiBank.entity.HanHaiBank;
+import org.jeecg.modules.hanHaiBank.service.IHanHaiBankService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.hanHaiRealEnterprise.entity.HanHaiRealEnterprise;
+import org.jeecg.modules.hanHaiRealEnterprise.service.IHanHaiRealEnterpriseService;
+import org.jeecg.modules.hanHaiRealName.entity.HanHaiRealName;
+import org.jeecg.modules.hanHaiRealName.service.IHanHaiRealNameService;
+import org.jeecg.modules.hanHaiWater.entity.HanHaiWater;
+import org.jeecg.modules.hanHaiWater.service.IHanHaiWaterService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 @Service
 public class InfoApiServiceImpl implements InfoApiService {
 
+    //缓存记录
+    @Resource
+    private RedisUtil redisUtil;
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //获取个人信息接口
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //获取个人认证信息
+    @Resource
+    private IHanHaiRealNameService hanHaiRealNameService;
+    //获取企业认证信息
+    @Resource
+    private IHanHaiRealEnterpriseService hanHaiRealEnterpriseService;
+    //获取流水信息
+    @Resource
+    private IHanHaiWaterService hanHaiWaterService;
+    //获取推广记录信息
+    @Resource
+    private IAtPromotionService atPromotionService;
+    //获取银行卡信息
+    @Resource
+    private IHanHaiBankService hanHaiBankService;
+    //获取动态帖子
+    @Resource
+    private IAtTrendsService atTrendsService;
+
+
 
     //获取个人信息接口
     @Override
     public Result<?> getInfo(String token){
-        return Result.OK();
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        return Result.OK("查询成功", hanHaiMember);
     }
 
     //修改个人信息接口
     @Override
-    public Result<?> updateInfo(String token, InfoBean bean){
+    public Result<?> updateInfo(String token, HanHaiMember bean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        bean.setId(hanHaiMember.getId());
+        hanHaiMemberService.updateById(bean);
+        return Result.OK("修改成功");
+    }
+
+
+    //添加银行卡
+    @Override
+    public Result<?> addBankCard(String token, HanHaiBank bean){
         return Result.OK();
     }
 
+
+
+    //获取银行卡列表带分页
+    @Override
+    public Result<?> getBankCardPage(String token, HanHaiBankBean bean){
+        return Result.OK();
+    }
+
+
+    //获取收益记录带分页
+    @Override
+    public Result<?> getIncomePage(String token, HanHaiWaterBean bean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        Page<HanHaiWater> page = new Page<HanHaiWater>(bean.getPageNo(), bean.getPageSize());
+        Page<HanHaiWater> pageList = hanHaiWaterService
+                .lambdaQuery()
+                .eq(HanHaiWater::getUserId,hanHaiMember.getId())
+                .orderByDesc(HanHaiWater::getCreateTime)
+                .page(page);
+        return Result.OK("收益记录",pageList);
+    }
+
+    //获取提现记录带分页
+    @Override
+    public Result<?> getWithdrawPage(String token, HanHaiWaterBean bean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        Page<HanHaiWater> page = new Page<HanHaiWater>(bean.getPageNo(), bean.getPageSize());
+        Page<HanHaiWater> pageList = hanHaiWaterService
+                .lambdaQuery()
+                .eq(HanHaiWater::getUserId,hanHaiMember.getId())
+                .orderByDesc(HanHaiWater::getCreateTime)
+                .page(page);
+        return Result.OK("提现记录",pageList);
+    }
+
+
     //个人认证提交
     @Override
     public Result<?> submitCertification(String token){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
         return Result.OK();
     }
 
     //企业认证提交
     @Override
     public Result<?> submitCompanyCertification(String token){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
         return Result.OK();
     }
 
     //获取个人认证信息
     @Override
     public Result<?> getCertification(String token){
-        return Result.OK();
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        HanHaiRealName one = hanHaiRealNameService
+                .lambdaQuery()
+                .eq(HanHaiRealName::getUserId, hanHaiMember.getId())
+                .one();
+        return Result.OK("个人认证信息", one);
     }
 
     //获取企业认证信息
     @Override
     public Result<?> getCompanyCertification(String token){
-        return Result.OK();
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        List<HanHaiRealEnterprise> list = hanHaiRealEnterpriseService
+                .lambdaQuery()
+                .list();
+        return Result.OK("企业信息");
     }
 
     //获取我的发布列表
     @Override
-    public Result<?> getMyReleasePage(String token){
-        return Result.OK();
+    public Result<?> getMyReleasePage(String token,MyReleasePageBean bean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        Page<AtTrends> page = new Page<AtTrends>(bean.getPageNo(), bean.getPageSize());
+        atTrendsService.lambdaQuery()
+                .eq(AtTrends::getUserId,hanHaiMember.getId())
+                .orderByDesc(AtTrends::getCreateTime)
+                .page(page);
+        return Result.OK("我的发布", page);
     }
 
     //获取我的发布详情
     @Override
-    public Result<?> getMyReleaseDetail(String token){
-        return Result.OK();
+    public Result<?> getMyReleaseDetail(String token,String id){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        AtTrends one = atTrendsService.lambdaQuery()
+                .eq(AtTrends::getId, id)
+                .one();
+        return Result.OK("发布详情", one);
     }
 
     //获取推广记录列表
     @Override
-    public Result<?> getPromotionPage(String token){
-        return Result.OK();
+    public Result<?> getPromotionPage(String token, PromotionPageBean bean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        Page<AtPromotion> page = new Page<AtPromotion>(bean.getPageNo(), bean.getPageSize());
+        Page<AtPromotion> page1 = atPromotionService.lambdaQuery()
+                .orderByDesc(AtPromotion::getCreateTime)
+                .page(page);
+        return Result.OK("推广记录",page1);
     }
 
     //获取推广记录详情
     @Override
-    public Result<?> getPromotionDetail(String token){
-        return Result.OK();
+    public Result<?> getPromotionDetail(String token,String id){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        AtPromotion one = atPromotionService.lambdaQuery()
+                .eq(AtPromotion::getId, id)
+                .one();
+        return Result.OK("推广记录详情", one);
     }
 
-    //获取提现记录带分页
-    @Override
-    public Result<?> getWithdrawPage(String token){
-        return Result.OK();
-    }
 
-    //获取收益记录带分页
-    @Override
-    public Result<?> getIncomePage(String token){
-        return Result.OK();
-    }
 
-    //获取银行卡列表带分页
-    @Override
-    public Result<?> getBankCardPage(String token){
-        return Result.OK();
-    }
 
-    //添加银行卡
-    @Override
-    public Result<?> addBankCard(String token){
-        return Result.OK();
-    }
+
+
 
     //用户提现
     @Override
     public Result<?> withdraw(String token){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
         return Result.OK();
     }