From 86f2368f146af23c9e16507f790752e79858a29f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 22 Feb 2024 22:34:31 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 205 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
index 775c46a..34088f0 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -1,21 +1,22 @@
package cc.mrbird.febs.mall.controller;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.mall.dto.ForgetPwdDto;
-import cc.mrbird.febs.mall.dto.ModifyMemberInfoDto;
-import cc.mrbird.febs.mall.dto.MoneyFlowDto;
-import cc.mrbird.febs.mall.dto.TeamListDto;
-import cc.mrbird.febs.mall.service.IApiMallMemberService;
-import cc.mrbird.febs.mall.vo.MallMemberVo;
-import cc.mrbird.febs.mall.vo.MoneyFlowVo;
-import cc.mrbird.febs.mall.vo.TeamListVo;
+import cc.mrbird.febs.mall.dto.*;
+import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.entity.MallMemberCoupon;
+import cc.mrbird.febs.mall.entity.MallMemberPayment;
+import cc.mrbird.febs.mall.service.*;
+import cc.mrbird.febs.mall.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* @author wzy
@@ -29,7 +30,19 @@
public class ApiMallMemberController {
private final IApiMallMemberService memberService;
+ private final IMallMemberWithdrawService mallMemberWithdrawService;
+ private final IApiMallMemberWalletService walletService;
+ private final IApiMallAgentService iApiMallAgentService;
+ /**
+ * 小程序接收用户数据，更新用户信息
+ */
+ @ApiOperation(value = "小程序接收用户数据", notes = "小程序接收用户数据")
+ @PostMapping(value = "/xcxSaveInfo")
+ public FebsResponse xcxSaveInfo(@RequestBody ApiXcxSaveInfoDto apiXcxSaveInfoDto){
+ return memberService.xcxSaveInfo(apiXcxSaveInfoDto);
+ }
+
@ApiOperation(value = "获取商城用户信息", notes = "获取商城用户信息")
@ApiResponses({
@ApiResponse(code = 200, message = "success", response = MallMemberVo.class)
@@ -59,18 +72,19 @@
@ApiOperation(value = "修改用户信息")
@PostMapping(value = "/modifyInfo")
- public FebsResponse modifyInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
+ public FebsResponse modifyInfo(@RequestBody ModifyMemberInfoDto modifyMemberInfoDto) {
return memberService.modifyMemberInfo(modifyMemberInfoDto);
}
@ApiOperation(value = "我的团队列表")
@ApiResponses({
- @ApiResponse(code = 200, message = "success", response = TeamListVo.class)
+ @ApiResponse(code = 200, message = "success", response = MyTeamVo.class)
})
@PostMapping(value = "/teamList")
public FebsResponse teamList(@RequestBody TeamListDto teamListDto) {
return memberService.teamList(teamListDto);
}
+
@ApiOperation(value = "资金流水列表")
@ApiResponses({
@@ -80,4 +94,185 @@
public FebsResponse moneyFlow(@RequestBody MoneyFlowDto moneyFlowDto) {
return memberService.moneyFlows(moneyFlowDto);
}
+
+ @ApiOperation(value = "转账")
+ @PostMapping(value = "/transfer")
+ public FebsResponse transfer(@RequestBody @Validated TransferDto transferDto) {
+ memberService.transfer(transferDto);
+ return new FebsResponse().success().message("转账成功");
+ }
+
+ @ApiOperation(value = "提现规则", notes = "提现规则")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = CashOutSettingVo.class)
+ })
+ @GetMapping(value = "/cashOutSetting")
+ public FebsResponse cashOutSetting() {
+ return new FebsResponse().success().data(memberService.cashOutSetting());
+ }
+
+ @ApiOperation(value = "提现")
+ @PostMapping(value = "/withdrawal")
+ public FebsResponse withdrawal(@RequestBody @Validated WithdrawalDto withdrawalDto) {
+ mallMemberWithdrawService.withdrawal(withdrawalDto);
+ return new FebsResponse().success().message("提交成功");
+ }
+
+ @ApiOperation(value = "设置收款方式")
+ @PostMapping(value = "/setPayment")
+ public FebsResponse setPayment(@RequestBody MallMemberPayment mallMemberPayment) {
+ memberService.setPayment(mallMemberPayment);
+ return new FebsResponse().success().message("设置成功");
+ }
+
+ @ApiOperation(value = "获取收款方式")
+ @GetMapping(value = "/findPayment")
+ public FebsResponse findPayment() {
+ return new FebsResponse().success().data(memberService.findMemberPayment());
+ }
+
+ @ApiOperation(value = "绑定手机号")
+ @PostMapping(value = "/bindPhone")
+ public FebsResponse bindPhone(@RequestBody AccountAndCodeDto accountAndCodeDto) {
+ memberService.bindPhone(accountAndCodeDto);
+ return new FebsResponse().success().message("绑定成功");
+ }
+
+ @ApiOperation(value = "可提现金额")
+ @GetMapping(value = "/canWithdrawal")
+ public FebsResponse canWithdrawal() {
+ return new FebsResponse().success().data(memberService.canMoney());
+ }
+
+ @ApiOperation(value = "用户消费排名")
+ @PostMapping(value = "/findRankList")
+ public FebsResponse findRankList(@RequestBody RankListDto rankListDto) {
+ return new FebsResponse().success().data(memberService.findRankList(rankListDto));
+ }
+
+ @ApiOperation(value = "根据邀请码或者手机号获取昵称")
+ @PostMapping(value = "/findMemberInfoByAccount/{phone}")
+ public FebsResponse findMemberInfoByAccount(@PathVariable("phone") String phone) {
+ MallMember account = memberService.findMemberInfoByAccount(phone);
+ if (account == null) {
+ return new FebsResponse().fail().message("用户不存在");
+ }
+
+ MallMemberVo member = new MallMemberVo();
+ member.setName(account.getName());
+ return new FebsResponse().success().data(member);
+ }
+
+ @ApiOperation(value = "佣金划转")
+ @PostMapping(value = "/commissionChange")
+ public FebsResponse commissionChange(@RequestBody @Validated CommissionChangeDto commissionChange) {
+ walletService.commissionChange(commissionChange);
+ return new FebsResponse().success();
+ }
+
+ @ApiOperation(value = "我的权益")
+ @ApiResponses(
+ @ApiResponse(code = 200, message = "success", response = MyCommissionVo.class)
+ )
+ @PostMapping(value = "/myCommission")
+ public FebsResponse myCommission() {
+ return new FebsResponse().success().data(memberService.myCommission());
+ }
+
+ @ApiOperation(value = "商铺申请是否存在")
+ @PostMapping(value = "/shopApplyIsExist")
+ public FebsResponse shopApplyIsExist() {
+ return null;
+ }
+
+ @ApiOperation(value = "充值余额")
+ @PostMapping(value = "/rechargeWallet")
+ public FebsResponse rechargeWallet(@RequestBody @Validated ApiRechargeWalletDto apiRechargeWalletDto) {
+ return memberService.rechargeWallet(apiRechargeWalletDto);
+ }
+
+ /**
+ * 申请代理
+ * @param apiAgentApplyDto
+ * @return
+ */
+ @ApiOperation(value = "申请代理")
+ @PostMapping(value = "/agentApply")
+ public FebsResponse agentApply(@RequestBody @Validated ApiAgentApplyDto apiAgentApplyDto) {
+ return iApiMallAgentService.agentApply(apiAgentApplyDto);
+ }
+
+ /**
+ * 绑定默认推荐人
+ */
+ @ApiOperation(value = "绑定默认推荐人")
+ @PostMapping(value = "/setInvite")
+ public FebsResponse setInvite(@RequestBody @Validated ApiSetInviteDto apiSetInviteDto) {
+ return memberService.setInvite(apiSetInviteDto);
+ }
+
+ @ApiOperation(value = "代理申请信息")
+ @GetMapping(value = "/agentApplyInfo")
+ public FebsResponse agentApplyInfo() {
+ return memberService.agentApplyInfo();
+ }
+
+ @ApiOperation(value = "合伙人权益")
+ @GetMapping(value = "/agentDetail")
+ public FebsResponse agentDetail() {
+ return memberService.agentDetail();
+ }
+
+ @ApiOperation(value = "活动公告")
+ @GetMapping(value = "/activityInfo")
+ public FebsResponse activityInfo() {
+ return memberService.activityInfo();
+ }
+
+ @ApiOperation(value = "通过邀请链接领取优惠卷")
+ @PostMapping(value = "/getCoupon")
+ public FebsResponse getCoupon(@RequestBody GetCouponDto getCouponDto) {
+ return memberService.getCoupon(getCouponDto);
+ }
+
+
+ @ApiOperation(value = "扫码推销员领取优惠卷")
+ @PostMapping(value = "/scanCoupon")
+ public FebsResponse scanCoupon(@RequestBody GetCouponDto getCouponDto) {
+ return memberService.scanCoupon(getCouponDto);
+ }
+
+ @ApiOperation(value = "优惠卷列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = MallMemberCouponVo.class)
+ })
+ @PostMapping(value = "/memberCoupon")
+ public FebsResponse memberCoupon(@RequestBody MallMemberCouponDto mallMemberCouponDto) {
+ return memberService.memberCoupon(mallMemberCouponDto);
+ }
+
+ @ApiOperation(value = "创建订单优惠卷列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = MallMemberCouponVo.class)
+ })
+ @PostMapping(value = "/memberPayCoupon")
+ public FebsResponse memberPayCoupon(@RequestBody MallMemberCouponDto mallMemberCouponDto) {
+ return memberService.memberPayCoupon(mallMemberCouponDto);
+ }
+
+ @ApiOperation(value = "优惠卷详情", notes = "优惠卷详情")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = MallMemberCouponVo.class)
+ })
+ @GetMapping(value = "/couponDetails/{id}")
+ public FebsResponse couponDetails(@PathVariable("id") Long id) {
+ return memberService.couponDetails(id);
+ }
+
+
+ @ApiOperation(value = "登录事件", notes = "登录事件")
+ @GetMapping(value = "/loginEvent")
+ public FebsResponse loginEvent() {
+ return new FebsResponse().success().data(memberService.loginEvent());
+ }
}
--
Gitblit v1.9.1