From 4eb7bd043cc1fe6bf0cdf44f8c045698c0e9e21b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 20 Jan 2025 11:34:01 +0800
Subject: [PATCH] refactor(mall): 确认收货功能
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 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 a91c4db..f56336a 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -2,21 +2,16 @@
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;
@@ -82,15 +77,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");
- }
+// 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");
}
--
Gitblit v1.9.1