Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

Helius

2021-09-24 fc8453995e0332ff313dacc27d081568caa0975f

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

@@ -1,20 +1,23 @@
package cc.mrbird.febs.mall.controller;

import cc.mrbird.febs.common.annotation.ControllerEndpoint;
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.DeliverGoodsDto;
import cc.mrbird.febs.mall.dto.MallOrderInfoDto;
import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.dto.MallOrderRefundDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.MallOrderRefundOperationMapper;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.Map;

@Slf4j
@@ -27,7 +30,7 @@
    private final IAdminMallOrderService adminMallOrderService;

    /**
     * 商品列表
     * 订单列表
     * @param mallOrderInfo
     * @param request
     * @return
@@ -38,6 +41,76 @@
        return new FebsResponse().success().data(data);
    }

    /**
     * 订单列表-发货
     */
    @PostMapping("deliverGoods")
    @ControllerEndpoint(operation = "订单列表-发货", exceptionMessage = "操作失败")
    public FebsResponse deliverGoods(@Valid DeliverGoodsDto deliverGoodsDto) {
        return adminMallOrderService.deliverGoods(deliverGoodsDto);
    }

    /**
     * 订单退款-列表
     * @param mallOrderRefundDto
     * @param request
     * @return
     */
    @GetMapping("refundList")
    public FebsResponse getRefundList(MallOrderRefundDto mallOrderRefundDto, QueryRequest request) {
        Map<String, Object> data = getDataTable(adminMallOrderService.getRefundListInPage(mallOrderRefundDto, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 订单退款-详情
     */
    @GetMapping("/seeRefund")
    public FebsResponse seeRefund(QueryRequest request, MallOrderRefund mallOrderRefund,Integer parentId) {
        if(parentId==null){
            ViewMallOrderController.idFromRefund=0;
        }
        mallOrderRefund.setId(ViewMallOrderController.idFromRefund);
        Map<String, Object> dataTable = getDataTable(adminMallOrderService.seeRefund(request, mallOrderRefund));
        return new FebsResponse().success().data(dataTable);
    }

    /**
     * 订单退款-同意
     * @param id
     * @return
     */
    @GetMapping("agreeRefund/{id}")
    @ControllerEndpoint(operation = "订单退款-同意", exceptionMessage = "操作失败")
    public FebsResponse agreeRefund(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.agreeRefund(id);
    }

    /**
     * 订单退款-拒绝
     * @param id
     * @return
     */
    @GetMapping("disagreeRefund/{id}")
    @ControllerEndpoint(operation = "订单退款-拒绝", exceptionMessage = "操作失败")
    public FebsResponse disagreeRefund(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.disagreeRefund(id);
    }

    /**
     * 订单退款-退款确认
     * @param id
     * @return
     */
    @GetMapping("refundConfirm/{id}")
    @ControllerEndpoint(operation = "订单退款-退款确认", exceptionMessage = "操作失败")
    public FebsResponse refundConfirm(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.refundConfirm(id);
    }