From e8f8d89a4248cd4d0a7138cc2e5a36ea9b136699 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 11 Feb 2025 17:03:01 +0800
Subject: [PATCH] feat(mall): 添加订单一键发货和取消发货功能

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java |   98 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index 4265f7a..efb8e51 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -2,14 +2,10 @@
 
 import cc.mrbird.febs.common.annotation.ControllerEndpoint;
 import cc.mrbird.febs.common.controller.BaseController;
-import cc.mrbird.febs.common.entity.DeptTree;
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
 import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
 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;
@@ -18,17 +14,15 @@
 import cc.mrbird.febs.common.utils.excl.ResponseHeadUtil;
 import cc.mrbird.febs.mall.dto.*;
 import cc.mrbird.febs.mall.entity.*;
-import cc.mrbird.febs.mall.mapper.*;
-import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.mall.mapper.MallMemberMapper;
+import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.mall.mapper.MallTeamLeaderMapper;
 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;
 import cc.mrbird.febs.pay.service.IXcxPayService;
-import cc.mrbird.febs.pay.util.WechatConfigure;
-import cc.mrbird.febs.system.entity.Dept;
-import cc.mrbird.febs.system.entity.User;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -44,7 +38,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Date;
@@ -139,6 +135,30 @@
     }
 
     /**
+     * 订单列表-取消发货
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("cancelDeliver/{id}")
+    @ControllerEndpoint(operation = "订单列表-取消发货", exceptionMessage = "操作失败")
+    public FebsResponse cancelDeliver(@NotNull(message = "{required}") @PathVariable Long id) {
+        return adminMallOrderService.cancelDeliver(id);
+    }
+
+    /**
+     * 订单列表-一键发货
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("deliverPdfGoods/{id}")
+    @ControllerEndpoint(operation = "订单列表-一键发货", exceptionMessage = "操作失败")
+    public FebsResponse deliverPdfGoods(@NotNull(message = "{required}") @PathVariable Long id) {
+        return adminMallOrderService.deliverPdfGoods(id);
+    }
+
+    /**
      * 订单退款-列表
      *
      * @param mallOrderRefundDto
@@ -195,6 +215,7 @@
     @PostMapping(value = "/refundOperation")
     @ControllerEndpoint(operation = "订单退款", exceptionMessage = "操作失败")
     public FebsResponse refundOperation(ApiLeaderRefundOrderDto apiLeaderRefundOrderDto) {
+        apiLeaderRefundOrderDto.setAgreeType(2);
         return apiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
     }
 
@@ -661,4 +682,57 @@
         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);
+    }
+
 }

--
Gitblit v1.9.1