From e640135969b8a79e7042bc11285c61026781202e Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 28 Nov 2024 15:32:56 +0800
Subject: [PATCH] refactor(mall): 修改订单默认快递公司为百世快递
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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..e844133 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -2,7 +2,6 @@
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;
@@ -11,12 +10,9 @@
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,14 +78,14 @@
@RequiresPermissions("deliverGoods:update")
public String deliverGoods(@PathVariable long id, Model model) {
AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id);
- data.setExpressCom("极兔快递");
+ 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("百世快递");
+// data.setExpressNo("JT");
}
model.addAttribute("deliverInfo", data);
return FebsUtil.view("modules/order/deliverGoods");
--
Gitblit v1.9.1