From 3b598f6d6b008db9e28ab446f4a21d98dcea382d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Feb 2024 20:58:00 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java |   76 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 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 b8c5e06..a91c4db 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,21 @@
 
 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.MallInvoiceMapper;
 import cc.mrbird.febs.mall.mapper.MallOrderRefundMapper;
 import cc.mrbird.febs.mall.service.IAdminMallOrderService;
+import cc.mrbird.febs.mall.service.MallInvoiceService;
 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;
@@ -21,12 +31,16 @@
 public class ViewMallOrderController extends BaseController {
 
     private final IAdminMallOrderService adminMallOrderService;
+    private final MallInvoiceMapper mallInvoiceMapper;
 
     private final MallOrderRefundMapper mallOrderRefundMapper;
+
+    private final MallExpressInfoMapper mallExpressInfoMapper;
 
     public static long idFromMember;
 
     public static long idFromRefund;
+    private final RedisUtils redisUtils;
 
     /**
      * 订单列表
@@ -68,6 +82,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");
     }
@@ -215,4 +238,57 @@
         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");
+    }
+
+    /**
+     * 发票列表-详情
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("invoiceDetail/{id}")
+    @RequiresPermissions("invoiceDetail:view")
+    public String invoiceDetail(@PathVariable long id, Model model) {
+        String existToken = redisUtils.getString("ADMIN_INVOICE_ID");
+        if (StrUtil.isNotBlank(existToken)) {
+            Object o = redisUtils.get(existToken);
+            if (ObjectUtil.isNotEmpty(o)) {
+                redisUtils.del(existToken);
+            }
+        }
+        redisUtils.set("ADMIN_INVOICE_ID", id, -1);
+        AdminInvoiceDetailVo data = mallInvoiceMapper.getAdminInvoiceDetailVoById(id);
+        model.addAttribute("invoiceDetail", data);
+        return FebsUtil.view("modules/order/invoiceDetail");
+    }
+
 }

--
Gitblit v1.9.1