From c8638bb17163cc95e9063c358eb92cada1474102 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 12 六月 2023 09:00:05 +0800
Subject: [PATCH] 用户端代码
---
src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java b/src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java
index 50ec3ef..c72b4de 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java
@@ -396,13 +396,7 @@
double v = ((double) tUserFeeSetting.getFee()) / 100;
BigDecimal multiply = price.getPrice().multiply(new BigDecimal(v));
BigDecimal subtract = price.getPrice().subtract(multiply);
- priceInfo.setCarrierCost(subtract);
- priceInfo.setSalesProfit(new BigDecimal(commission));
- priceInfo.setMargin(multiply);
}else {
- priceInfo.setMargin(new BigDecimal(0));
- priceInfo.setSalesProfit(new BigDecimal(commission));
- priceInfo.setCarrierCost(price.getPrice());
}
priceInfos.add(priceInfo);
break;
@@ -412,11 +406,8 @@
}else {
for (TPrice price : prices) {
PriceInfo priceInfo = new PriceInfo();
- priceInfo.setCarrierCost(price.getPrice());
priceInfo.setCustomerCost(price.getPrice());
priceInfo.setName(price.getType());
- priceInfo.setSalesProfit(new BigDecimal(0));
- priceInfo.setMargin(new BigDecimal(0));
priceInfos.add(priceInfo);
}
}
--
Gitblit v1.7.1