From 485b09d75ac79350392e234a62521050bf6374de Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 04 三月 2025 11:00:43 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index b208c39..4ff898f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -9,6 +9,7 @@
import com.ruoyi.account.api.feignClient.UserAddressClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserAddress;
+import com.ruoyi.common.core.constant.ExpressCompanyMap;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -175,7 +176,6 @@
Long days = jsonObject.getLong("days");
Order order = orderService.getById(orderId);
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
- order.setIsCommission(0);
order.setOrderStatus(OrderStatus.COMPLETED.getCode());
orderService.updateById(order);
return R.ok();
@@ -557,14 +557,15 @@
if (StringUtils.isNotEmpty(goodJson) && !"NULL".equals(goodJson)) {
Goods goods = JSONObject.parseObject(goodJson, Goods.class);
orderExport.setGoodsName(goods.getName());
- orderExport.setCostPrice(goods.getShopCost().add(goods.getOperatingCost()));
+ orderExport.setCompanyCostPrice(goods.getOperatingCost());
+ orderExport.setSupplierCostPrice(goods.getShopCost());
}
String expressJson = orderExport.getExpressJson();
if (StringUtils.isNotEmpty(expressJson) && !expressJson.equals("NULL")) {
JSONObject jsonObject = JSONObject.parseObject(expressJson);
orderExport.setExpressNum(jsonObject.getString("num"));
- orderExport.setExpressName(jsonObject.getString("com"));
+ orderExport.setExpressName(ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com")));
}
--
Gitblit v1.7.1