From 78bbc1dae1bb20acb51fd454adf53b3ab5ae97b3 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 23 Dec 2022 15:20:11 +0800 Subject: [PATCH] 20221221 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 2 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 fdc382f..3a6f67e 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java @@ -12,6 +12,7 @@ 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.MallExpressInfoMapper; import cc.mrbird.febs.mall.mapper.MallOrderRefundOperationMapper; import cc.mrbird.febs.mall.service.IAdminMallGoodsService; import cc.mrbird.febs.mall.service.IAdminMallOrderService; @@ -20,9 +21,11 @@ import cc.mrbird.febs.system.entity.Dept; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -45,6 +48,7 @@ public class AdminMallOrderController extends BaseController { private final IAdminMallOrderService adminMallOrderService; + private final MallExpressInfoMapper mallExpressInfoMapper; /** * 订单列表 @@ -78,6 +82,30 @@ @ControllerEndpoint(operation = "订单列表-取消订单", exceptionMessage = "操作失败") public FebsResponse cancelOrder(@NotNull(message = "{required}") @PathVariable Long id) { return adminMallOrderService.cancelOrder(id); + } + + /** + * 订单列表-自提订单 + * + * @param id + * @return + */ + @GetMapping("takeGoods/{id}") + @ControllerEndpoint(operation = "订单列表-自提订单", exceptionMessage = "操作失败") + public FebsResponse takeGoods(@NotNull(message = "{required}") @PathVariable Long id) { + return adminMallOrderService.takeGoods(id); + } + + /** + * 订单列表-删除订单 + * + * @param id + * @return + */ + @GetMapping("delOrder/{id}") + @ControllerEndpoint(operation = "订单列表-删除订单", exceptionMessage = "操作失败") + public FebsResponse delOrder(@NotNull(message = "{required}") @PathVariable Long id) { + return adminMallOrderService.delOrder(id); } /** @@ -266,8 +294,22 @@ } else { temp.add(""); } - - temp.add(item.getStatus()); + switch (item.getStatus()) { + case 2: + temp.add("待发货"); + break; + case 3: + temp.add("已发货"); + break; + default: + } + Long id = item.getId(); + MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id); + if(ObjectUtil.isNotNull(mallExpressInfo)){ + temp.add(mallExpressInfo.getExpressNo()); + temp.add(mallExpressInfo.getExpressCom()); + temp.add(mallExpressInfo.getExpressCode()); + } list.add(temp); } } @@ -387,4 +429,17 @@ return adminMallOrderService.showStateSwitchOff(id); } + /** + * 订单列表-资金流水 + */ + @GetMapping("/moneyFlow") + public FebsResponse moneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo, Integer parentId) { + if (parentId == null) { + ViewMallOrderController.seeOrderFlowByOrderId = 0; + } + mallOrderInfo.setId(ViewMallOrderController.seeOrderFlowByOrderId); + Map<String, Object> dataTable = getDataTable(adminMallOrderService.moneyFlow(request, mallOrderInfo)); + return new FebsResponse().success().data(dataTable); + } + } -- Gitblit v1.9.1