From c52d9b49a54c5e31ed05d74b672954d1dbb648b1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 18:01:38 +0800
Subject: [PATCH] 20220902

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 326cfa4..d7d431d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -66,6 +66,18 @@
     public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
         Page<AdminMallOrderInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
         IPage<AdminMallOrderInfoVo> adminMallOrderInfoVos = this.baseMapper.selectOrderListInPage(page, mallOrderInfo);
+//        List<AdminMallOrderInfoVo> records = adminMallOrderInfoVos.getRecords();
+//        if(CollUtil.isNotEmpty(records)){
+//            for(AdminMallOrderInfoVo adminMallOrderInfoVo : records){
+//                Long id = adminMallOrderInfoVo.getId();
+//                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectbyOrderId(id);
+//                StringBuffer stringBuffer = new StringBuffer();
+//                for(MallOrderItem mallOrderItem : mallOrderItemList){
+//                    stringBuffer.append(mallOrderItem.getGoodsName()+"*"+mallOrderItem.getCnt()+";");
+//                }
+//                adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
+//            }
+//        }
         return adminMallOrderInfoVos;
     }
 
@@ -421,6 +433,20 @@
     }
 
     @Override
+    public FebsResponse delOrder(Long id) {
+        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
+        if(ObjectUtil.isEmpty(mallOrderInfo)){
+            return new FebsResponse().fail().message("订单不存在,请刷新重试");
+        }
+        Integer status = mallOrderInfo.getStatus();
+        if(status != 7){
+            return new FebsResponse().fail().message("订单不是已取消状态");
+        }
+        mallOrderInfoMapper.deleteById(id);
+        return new FebsResponse().success();
+    }
+
+    @Override
     public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
         MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
         if (mallOrderInfo == null) {

--
Gitblit v1.9.1