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/ApiMallOrderController.java | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
index 9d7ef92..7bfe863 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -1,18 +1,21 @@
package cc.mrbird.febs.mall.controller;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.mall.dto.AddOrderDto;
-import cc.mrbird.febs.mall.dto.PayOrderDto;
+import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
+import cc.mrbird.febs.mall.vo.OrderDetailVo;
+import cc.mrbird.febs.mall.vo.OrderListVo;
+import cc.mrbird.febs.pay.service.IXcxPayService;
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 java.util.HashMap;
-import java.util.List;
import java.util.Map;
/**
@@ -28,6 +31,15 @@
public class ApiMallOrderController {
private final IApiMallOrderInfoService mallOrderInfoService;
+ private final IXcxPayService iXcxPayService;
+
+
+ @ApiOperation(value = "创建订单--验证收货地址是否在配送范围内 true | false", notes = "创建订单--验证收货地址是否在配送范围内")
+ @PostMapping(value = "/createOrderVerify")
+ public FebsResponse createOrderVerify(@RequestBody ApiCreateOrderVerifyDto apiCreateOrderVerifyDto) {
+ Boolean verifyState = mallOrderInfoService.createOrderVerify(apiCreateOrderVerifyDto);
+ return new FebsResponse().success().data(verifyState);
+ }
@ApiOperation(value = "创建订单", notes = "创建订单")
@PostMapping(value = "/createOrder")
@@ -47,12 +59,89 @@
@ApiOperation(value = "支付订单", notes = "支付订单")
@PostMapping(value = "/payOrder")
public FebsResponse payOrder(@RequestBody PayOrderDto payOrderDto) {
- String result = mallOrderInfoService.payOrder(payOrderDto);
+ Map<String, Object> result = mallOrderInfoService.payOrder(payOrderDto);
Map<String, Object> map = new HashMap<>();
- map.put("orderNo", result);
+ map.put("order", result);
map.put("type", payOrderDto.getType());
return new FebsResponse().success().data(map).message("支付成功");
}
+ @ApiOperation(value = "订单列表", notes = "订单列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = OrderListVo.class)
+ })
+ @PostMapping(value = "/orderList")
+ public FebsResponse orderList(@RequestBody OrderListDto orderListDto) {
+ return new FebsResponse().success().data(mallOrderInfoService.findOrderList(orderListDto));
+ }
+
+ @ApiOperation(value = "订单详情", notes = "订单详情")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = OrderDetailVo.class)
+ })
+ @GetMapping(value = "/orderDetails/{id}")
+ public FebsResponse orderDetails(@PathVariable("id") Long id) {
+ return new FebsResponse().success().data(mallOrderInfoService.findOrderDetailsById(id));
+ }
+
+ @ApiOperation(value = "确认收货", notes = "确认收货")
+ @PostMapping(value = "/confirm/{id}")
+ public FebsResponse confirm(@PathVariable("id") Long id) {
+ mallOrderInfoService.confirmOrder(id);
+ return new FebsResponse().success().message("确认成功");
+ }
+
+ @ApiOperation(value = "删除订单", notes = "删除订单")
+ @PostMapping(value = "/delOrder/{id}")
+ public FebsResponse delOrder(@PathVariable("id") Long id) {
+ mallOrderInfoService.delOrder(id);
+ return new FebsResponse().success().message("删除成功");
+ }
+
+ @ApiOperation(value = "用户退款", notes = "用户退款")
+ @PostMapping(value = "/refundOrder/{id}")
+ public FebsResponse refundOrder(@PathVariable("id") Long id) {
+ return mallOrderInfoService.refundOrder(id);
+ }
+
+ @ApiOperation(value = "用户退款--提交退款申请", notes = "用户退款--提交退款申请")
+ @PostMapping(value = "/applyRefundOrder")
+ public FebsResponse applyRefundOrder(@RequestBody ApplyRefundOrderDto applyRefundOrderDto) {
+ return mallOrderInfoService.applyRefundOrder(applyRefundOrderDto);
+ }
+
+ @ApiOperation(value = "用户退款--取消退款申请", notes = "用户退款--取消退款申请")
+ @PostMapping(value = "/cancelRefundOrder/{id}")
+ public FebsResponse cancelRefundOrder(@PathVariable("id") Long id) {
+ return mallOrderInfoService.cancelRefundOrder(id);
+ }
+
+ @ApiOperation(value = "提交退款申请", notes = "提交退款申请")
+ @PostMapping(value = "/applyRefund")
+ public FebsResponse applyRefund(@RequestBody AddRefundDto addRefundDto) {
+ mallOrderInfoService.applyRefund(addRefundDto);
+ return new FebsResponse().success().message("提交成功");
+ }
+
+ @ApiOperation(value = "提交退款物流信息", notes = "提交退款物流信息")
+ @PostMapping(value = "/refundExpress")
+ public FebsResponse refundExpress(@RequestBody RefundExpressDto refundExpressDto) {
+ mallOrderInfoService.refundExpress(refundExpressDto);
+ return new FebsResponse().success().message("提交成功");
+ }
+
+ @ApiOperation(value = "评价", notes = "评价")
+ @PostMapping(value = "/goodsComment")
+ public FebsResponse goodsComment(@RequestBody ApiAddCommentDtos addCommentDtos) {
+ mallOrderInfoService.goodsComment(addCommentDtos);
+ return new FebsResponse().success().message("评价成功");
+ }
+
+ @ApiOperation(value = "获取微信订阅TemplateId")
+ @GetMapping(value = "/getTemplateId")
+ public FebsResponse getTemplateId() {
+ return new FebsResponse().success().data(iXcxPayService.getTemplateId());
+ }
+
}
--
Gitblit v1.9.1