blame | history | patch | commit | commitdiff | ignore whitespace
KKSU
2025-01-08 d175d1a66a53a46f182316680afd8a9bf6314ea0 
 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,18 +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;


@@ -45,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;


@@ -196,6 +191,7 @@


    @PostMapping(value = "/refundOperation")


    @ControllerEndpoint(operation = "订单退款", exceptionMessage = "操作失败")


    public FebsResponse refundOperation(ApiLeaderRefundOrderDto apiLeaderRefundOrderDto) {


        apiLeaderRefundOrderDto.setAgreeType(2);


        return apiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);


    }




@@ -704,4 +700,15 @@


        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);


    }




}