From 113f3a5d3b843fba68ce50a3ba3255c66ca1e15f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 17 Jan 2023 20:13:57 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 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 f7d55db..0a2e412 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -1,10 +1,10 @@
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.OrderListDto;
-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.ApiMallSubsidyAmountInfoVo;
+import cc.mrbird.febs.mall.vo.MallMemberVo;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import io.swagger.annotations.Api;
@@ -17,7 +17,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
/**
@@ -27,6 +26,7 @@
@Slf4j
@Validated
@RestController
+@CrossOrigin("*")
@RequiredArgsConstructor
@RequestMapping(value = "/api/order")
@Api(value = "ApiMallOrderController", tags = "订单接口类")
@@ -52,10 +52,10 @@
@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("支付成功");
}
@@ -78,4 +78,54 @@
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 = "/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 = "查看银行卡是否签约", notes = "查看银行卡是否签约")
+ @PostMapping(value = "/bangCardSign")
+ public FebsResponse bangCardSign(@RequestBody BangCardSignDto bangCardSignDto) {
+ return mallOrderInfoService.bangCardSign(bangCardSignDto);
+ }
+
+ @ApiOperation(value = "获取订单补贴信息", notes = "获取订单补贴信息")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiMallSubsidyAmountInfoVo.class)
+ })
+ @GetMapping(value = "/subsidyAmountInfo")
+ public FebsResponse subsidyAmountInfo() {
+ return mallOrderInfoService.subsidyAmountInfo();
+ }
+
}
--
Gitblit v1.9.1