From 54a084af6bfc0eb1737bec9c962e4067d6cd1b3a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 22:22:35 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index dc97abe..858f0ce 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -68,7 +68,11 @@
for(JhyOrderItems jhyOrderItems : jhyOrderItemsList){
JhyOrderItemsVo jhyOrderItemsVo = BeanUtil.copyProperties(jhyOrderItems, JhyOrderItemsVo.class);
BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(40));
- jhyOrderItemsVo.setAllPrice(multiply);
+ BigDecimal multiplyScore = jhyOrderItemsVo.getPrice()
+ .multiply(jhyOrderItemsVo.getWeight()==null?BigDecimal.ZERO :jhyOrderItemsVo.getWeight())
+ .multiply(new BigDecimal(40));
+ jhyOrderItemsVo.setPrice(multiply);
+ jhyOrderItemsVo.setAllPrice(multiplyScore);
jhyOrderItemsVolist.add(jhyOrderItemsVo);
}
}
--
Gitblit v1.9.1