From e8f8d89a4248cd4d0a7138cc2e5a36ea9b136699 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 11 Feb 2025 17:03:01 +0800 Subject: [PATCH] feat(mall): 添加订单一键发货和取消发货功能 --- src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 81 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 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 f66e037..e588d9c 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java @@ -7,6 +7,7 @@ import cc.mrbird.febs.mall.entity.MallMemberPayment; import cc.mrbird.febs.mall.service.*; import cc.mrbird.febs.mall.vo.*; +import cc.mrbird.febs.vip.service.IMallVipBenefitsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.Map; /** * @author wzy @@ -33,6 +35,7 @@ private final IMallMemberWithdrawService mallMemberWithdrawService; private final IApiMallMemberWalletService walletService; private final IApiMallAgentService iApiMallAgentService; + private final IMallVipBenefitsService mallVipBenefitsService; /** * 小程序接收用户数据,更新用户信息 @@ -202,6 +205,15 @@ 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() { @@ -226,6 +238,13 @@ 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) @@ -233,6 +252,15 @@ @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 = "优惠卷详情") @@ -244,4 +272,57 @@ return memberService.couponDetails(id); } + + @ApiOperation(value = "登录事件", notes = "登录事件") + @GetMapping(value = "/birthdayEvent") + public FebsResponse birthdayEvent() { + Map<String, Object> birthdayEvent = mallVipBenefitsService.birthdayEvent(); + return new FebsResponse().success().data(birthdayEvent); + } + + @ApiOperation(value = "登录事件", notes = "登录事件") + @GetMapping(value = "/loginEvent") + public FebsResponse loginEvent() { + Map<String, Object> loginEvent = memberService.loginEvent(); + return new FebsResponse().success().data(loginEvent); + } + + @ApiOperation(value = "店铺列表") + @ApiResponses({ + @ApiResponse(code = 200, message = "success", response = MallStoreVo.class) + }) + @PostMapping(value = "/storeList") + public FebsResponse storeList(@RequestBody MallStoreDto mallStoreDto) { + return memberService.storeList(mallStoreDto); + } + + @ApiOperation(value = "店铺机器列表") + @ApiResponses({ + @ApiResponse(code = 200, message = "success", response = MallStoreItemVo.class) + }) + @PostMapping(value = "/storeItemList") + public FebsResponse storeItemList(@RequestBody MallStoreItemDto mallStoreItemDto) { + return memberService.storeItemList(mallStoreItemDto); + } + + @ApiOperation(value = "绑定用户") + @PostMapping(value = "/bindStoreMember") + public FebsResponse bindStoreMember(@RequestBody @Validated BindStoreMemberDto bindStoreMemberDto) { + return memberService.bindStoreMember(bindStoreMemberDto); + } + + @ApiOperation(value = "绑定列表") + @ApiResponses({ + @ApiResponse(code = 200, message = "success", response = MallStoreMemberVo.class) + }) + @PostMapping(value = "/bindList") + public FebsResponse bindList() { + return memberService.bindList(); + } + + @ApiOperation(value = "获取检测结果") + @PostMapping(value = "/bindResult") + public FebsResponse bindResult(@RequestBody @Validated BindResultDto bindResultDto) { + return memberService.bindResult(bindResultDto); + } } -- Gitblit v1.9.1