From c619972c50577bb699be6ee099b5e2741882fabb Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 27 Dec 2023 16:15:59 +0800
Subject: [PATCH] 直推奖励，冻结的用户，则直推奖励销毁，用户未冻结才能领取成功
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallAppController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallAppController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallAppController.java
index 2049bfc..189e114 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallAppController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallAppController.java
@@ -13,6 +13,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+
@Slf4j
@CrossOrigin("*")
@RequiredArgsConstructor
@@ -28,7 +30,7 @@
@ApiResponse(code = 200, message = "success", response = ApiMallAppMemberInfoVo.class)
})
@PostMapping(value = "/appMemberInfo")
- public FebsResponse appMemberInfo(@RequestBody ApiMallAppMemberInfoDto apiMallAppMemberInfoDto) {
+ public FebsResponse appMemberInfo(@RequestBody @Valid ApiMallAppMemberInfoDto apiMallAppMemberInfoDto) {
return mallAppService.appMemberInfo(apiMallAppMemberInfoDto);
}
@@ -50,9 +52,58 @@
return mallAppService.findMallGoodsListNoPage(queryDto);
}
- @ApiOperation(value = "创建订单", notes = "创建订单")
+ @ApiOperation(value = "会员结算", notes = "会员结算")
@PostMapping(value = "/createAppOrder")
public FebsResponse createAppOrder(@RequestBody ApiAddOrderDto addOrderDto) {
return mallAppService.createAppOrder(addOrderDto);
}
+
+ @ApiOperation(value = "普通结算", notes = "普通结算")
+ @PostMapping(value = "/normalInsure")
+ public FebsResponse normalInsure(@RequestBody ApiNormalInsureDto normalInsureDto) {
+ return mallAppService.normalInsure(normalInsureDto);
+ }
+
+ @ApiOperation(value = "挂单", notes = "挂单")
+ @PostMapping(value = "/registAppOrder")
+ public FebsResponse registAppOrder(@RequestBody ApiRegistAppOrderDto registAppOrderDto) {
+ return mallAppService.registAppOrder(registAppOrderDto);
+ }
+
+ @ApiOperation(value = "取单列表", notes = "取单列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiGetOrderListVo.class)
+ })
+ @PostMapping(value = "/getOrderList")
+ public FebsResponse getOrderList(@RequestBody ApiGetOrderListDto orderListDto) {
+ return mallAppService.getOrderList(orderListDto);
+ }
+
+ @ApiOperation(value = "取单", notes = "取单")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiGetOrderListVo.class)
+ })
+ @PostMapping(value = "/getOrder")
+ public FebsResponse getOrder(@RequestBody ApiGetOrderDto apiGetOrderDto) {
+ return mallAppService.getOrder(apiGetOrderDto);
+ }
+
+ @ApiOperation(value = "取单-删除", notes = "取单-删除")
+ @PostMapping(value = "/getOrderCancel")
+ public FebsResponse getOrderCancel(@RequestBody ApiGetOrderDto apiGetOrderDto) {
+ return mallAppService.getOrderCancel(apiGetOrderDto);
+ }
+
+ @ApiOperation(value = "支付", notes = "支付")
+ @PostMapping(value = "/wxCodePay")
+ public FebsResponse wxCodePay(@RequestBody @Valid ApiWxCodePayDto wxCodePayDto) {
+ return mallAppService.wxCodePay(wxCodePayDto);
+ }
+
+ @ApiOperation(value = "取消订单", notes = "取消订单")
+ @PostMapping(value = "/cancelOrder/{id}")
+ public FebsResponse cancelOrder(@PathVariable("id") Long id) {
+ return mallAppService.cancelOrder(id);
+ }
+
}
--
Gitblit v1.9.1