refactor(mall): 重构活动订单核销接口并添加取消订单功能

Administrator

7 days ago e12b33379eccfeead532f677a99c7f9e41e34a0d

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

@@ -10,6 +10,7 @@
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.common.utils.excl.ExcelSheetPO;
import cc.mrbird.febs.common.utils.excl.ExcelUtil;
@@ -20,6 +21,8 @@
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import cc.mrbird.febs.mall.service.IApiMallTeamLeaderService;
import cc.mrbird.febs.mall.service.MallInvoiceService;
import cc.mrbird.febs.mall.vo.AdminAddAddressTreeVo;
import cc.mrbird.febs.mall.vo.AdminMallOrderRefundAddressVo;
import cc.mrbird.febs.pay.model.OrderStateDto;
@@ -64,6 +67,9 @@
    private final MallTeamLeaderMapper mallTeamLeaderMapper;
    private final MallMemberMapper mallMemberMapper;
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    private final RedisUtils redisUtils;

    private final IApiMallTeamLeaderService apiMallTeamLeaderService;



@@ -181,6 +187,16 @@
    @ControllerEndpoint(operation = "订单退款-拒绝", exceptionMessage = "操作失败")
    public FebsResponse disagreeRefund(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.disagreeRefund(id);
    }

    /**
     * 退款操作
     * @return
     */
    @PostMapping(value = "/refundOperation")
    @ControllerEndpoint(operation = "订单退款", exceptionMessage = "操作失败")
    public FebsResponse refundOperation(ApiLeaderRefundOrderDto apiLeaderRefundOrderDto) {
        return apiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
    }

    /**
@@ -533,7 +549,7 @@
        }

        String fileName = file.getOriginalFilename();
        String dirPath = "/home/javaweb/webresource/qianAYi/";
        String dirPath = "/home/javaweb/webresource/blnka/";

        File saveFile = new File(new File(dirPath).getAbsolutePath() + File.separator + fileName);
        if (!saveFile.exists()) {
@@ -639,10 +655,64 @@
        if (parentId == null) {
            ViewMallOrderController.orderIdsStr = "";
        }
        long[] longs = StrUtil.splitToLong(ViewMallOrderController.orderIdsStr, ',');
        String existToken = redisUtils.getString("ADMIN_GOODS_CNT");
        long[] longs = StrUtil.splitToLong(existToken, ',');
        mallOrderItem.setOrderIdsStr(longs);
        Map<String, Object> data = getDataTable(adminMallOrderService.goodsStatistics(mallOrderItem,request));
        return new FebsResponse().success().data(data);
    }


    private final MallInvoiceService mallInvoiceService;
    /**
     * 发票列表
     * @param mallInvoiceDto
     * @param request
     * @return
     */
    @GetMapping("invoiceList")
    public FebsResponse invoiceList(AdminMallInvoiceDto mallInvoiceDto, QueryRequest request) {
        Map<String, Object> data = getDataTable(mallInvoiceService.getInvoiceList(mallInvoiceDto, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 发票列表-订单子表
     */
    @GetMapping(value = "/invoiceItemList")
    public FebsResponse invoiceItemList() {
        return new FebsResponse().success().data(mallInvoiceService.invoiceItemList());
    }

    /**
     * 发票列表-上传发票
     */
    @PostMapping("addInvoiceUrl")
    @ControllerEndpoint(operation = " 发票列表-上传发票", exceptionMessage = "操作失败")
    public FebsResponse addInvoiceUrl(@Valid MallInvoice mallInvoice) {
        return mallInvoiceService.addInvoiceUrl(mallInvoice);
    }

    /**
     * 发票列表-更新抬头
     * @param id
     * @return
     */
    @GetMapping("updateInvoiceDetail/{id}")
    @ControllerEndpoint(operation = "发票列表-更新抬头", exceptionMessage = "操作失败")
    public FebsResponse updateInvoiceDetail(@NotNull(message = "{required}") @PathVariable Long id) {
        return mallInvoiceService.updateInvoiceDetail(id);
    }

    /**
     * 发票列表-更新订单状态
     * @param id
     * @return
     */
    @GetMapping("updateOrderDetail/{id}")
    @ControllerEndpoint(operation = "发票列表-更新订单状态", exceptionMessage = "操作失败")
    public FebsResponse updateOrderDetail(@NotNull(message = "{required}") @PathVariable Long id) {
        return mallInvoiceService.updateOrderDetail(id);
    }

}