From 08aa2024f664d2c7e7eb60a25922a07d60aca2f2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 19 Jan 2024 15:37:32 +0800
Subject: [PATCH] fapiao

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java |   71 +++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
index 635b5e5..7ee1dda 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -2,11 +2,19 @@
 
 import cc.mrbird.febs.common.controller.BaseController;
 import cc.mrbird.febs.common.entity.FebsConstant;
+import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.mall.entity.MallExpressInfo;
 import cc.mrbird.febs.mall.entity.MallOrderRefund;
+import cc.mrbird.febs.mall.mapper.MallExpressInfoMapper;
 import cc.mrbird.febs.mall.mapper.MallOrderRefundMapper;
 import cc.mrbird.febs.mall.service.IAdminMallOrderService;
 import cc.mrbird.febs.mall.vo.*;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
@@ -24,9 +32,22 @@
 
     private final MallOrderRefundMapper mallOrderRefundMapper;
 
+    private final MallExpressInfoMapper mallExpressInfoMapper;
+
     public static long idFromMember;
 
     public static long idFromRefund;
+    private final RedisUtils redisUtils;
+
+    /**
+     * 订单列表
+     * @return
+     */
+    @GetMapping("orderRefundList")
+    @RequiresPermissions("orderRefundList:view")
+    public String orderRefundList() {
+        return FebsUtil.view("modules/order/orderRefundList");
+    }
 
     /**
      * 订单列表
@@ -39,6 +60,16 @@
     }
 
     /**
+     * 评论列表
+     * @return
+     */
+    @GetMapping("commentList")
+    @RequiresPermissions("commentList:view")
+    public String commentList() {
+        return FebsUtil.view("modules/order/commentList");
+    }
+
+    /**
      * 订单-发货
      * @param id
      * @param model
@@ -48,6 +79,15 @@
     @RequiresPermissions("deliverGoods:update")
     public String deliverGoods(@PathVariable long id, Model model) {
         AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id);
+        data.setExpressCom("极兔快递");
+        MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id);
+        if(ObjectUtil.isNotEmpty(mallExpressInfo)){
+            data.setExpressNo(mallExpressInfo.getExpressNo());
+            data.setExpressCom(mallExpressInfo.getExpressCom());
+        }else{
+            data.setExpressCom("极兔快递");
+            data.setExpressNo("JT");
+        }
         model.addAttribute("deliverInfo", data);
         return FebsUtil.view("modules/order/deliverGoods");
     }
@@ -195,4 +235,35 @@
         return FebsUtil.view("modules/order/refundPayInfo");
     }
 
+    /**
+     * 订单列表-统计商品份数
+     * @return
+     */
+    public static String orderIdsStr;
+    @GetMapping("/goodsStatistics/{statistics}")
+    @RequiresPermissions("goodsStatistics:update")
+    public String goodsStatistics(@PathVariable String statistics, Model model) {
+
+        String existToken = redisUtils.getString("ADMIN_GOODS_CNT");
+        if (StrUtil.isNotBlank(existToken)) {
+            Object o = redisUtils.get(existToken);
+            if (ObjectUtil.isNotEmpty(o)) {
+                redisUtils.del(existToken);
+            }
+        }
+        redisUtils.set("ADMIN_GOODS_CNT", statistics, -1);
+        return FebsUtil.view("modules/order/goodsStatistics");
+    }
+
+
+    /**
+     * 发票列表
+     * @return
+     */
+    @GetMapping("invoiceList")
+    @RequiresPermissions("invoiceList:view")
+    public String invoiceList() {
+        return FebsUtil.view("modules/order/invoiceList");
+    }
+
 }

--
Gitblit v1.9.1