From c0cae0a68ec2d917a9fad1f093a16b6d1d16af3c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Mar 2023 13:41:37 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 14 ++++++++++++++
1 files changed, 14 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 6a55b29..a06281f 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,15 @@
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.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.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -23,6 +27,8 @@
private final IAdminMallOrderService adminMallOrderService;
private final MallOrderRefundMapper mallOrderRefundMapper;
+
+ private final MallExpressInfoMapper mallExpressInfoMapper;
public static long idFromMember;
@@ -68,6 +74,14 @@
@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("中通快递");
+ }
model.addAttribute("deliverInfo", data);
return FebsUtil.view("modules/order/deliverGoods");
}
--
Gitblit v1.9.1