fix

Helius

2024-02-21 3b598f6d6b008db9e28ab446f4a21d98dcea382d

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java

@@ -1,12 +1,11 @@
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.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;
@@ -17,7 +16,6 @@
import org.springframework.web.bind.annotation.*;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
@@ -33,6 +31,19 @@
public class ApiMallOrderController {

    private final IApiMallOrderInfoService mallOrderInfoService;
    private final IXcxPayService iXcxPayService;

    @ApiOperation(value = "创建订单--验证是否允许创建", notes = "创建订单--验证是否允许创建")
    @PostMapping(value = "/createOrderVerify")
    public FebsResponse createOrderVerify(@RequestBody ApiCreateOrderVerifyDto apiCreateOrderVerifyDto) {
        return mallOrderInfoService.createOrderVerify(apiCreateOrderVerifyDto);
    }

    @ApiOperation(value = "选择优惠卷", notes = "选择优惠卷")
    @PostMapping(value = "/chooseCoupon")
    public FebsResponse chooseCoupon(@RequestBody ApiChooseCouponDto chooseCouponDto) {
        return mallOrderInfoService.chooseCoupon(chooseCouponDto);
    }

    @ApiOperation(value = "创建订单", notes = "创建订单")
    @PostMapping(value = "/createOrder")
@@ -52,10 +63,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 +89,63 @@
        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());
    }

}