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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 5de2f61..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
@@ -176,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();
@@ -558,7 +557,8 @@
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();
--
Gitblit v1.7.1