From 9ea97b97f4f478c1cc79f062593274d9eabf07f3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jul 2021 10:59:13 +0800
Subject: [PATCH] 20210630 积分拨付

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 e073a68..7acfb5e 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
@@ -73,11 +73,11 @@
             for(JhyOrderItems jhyOrderItems : jhyOrderItemsList){
                 JhyOrderItemsVo jhyOrderItemsVo = BeanUtil.copyProperties(jhyOrderItems, JhyOrderItemsVo.class);
                 BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(40));
-                BigDecimal multiplyScore = jhyOrderItemsVo.getPrice()
-                        .multiply(jhyOrderItemsVo.getWeight()==null?BigDecimal.ZERO :jhyOrderItemsVo.getWeight())
-                        .multiply(new BigDecimal(40));
+//                BigDecimal multiplyScore = jhyOrderItemsVo.getPrice()
+//                        .multiply(jhyOrderItemsVo.getWeight()==null?BigDecimal.ZERO :jhyOrderItemsVo.getWeight())
+//                        .multiply(new BigDecimal(40));
                 jhyOrderItemsVo.setPrice(multiply);
-                jhyOrderItemsVo.setAllPrice(multiplyScore);
+                jhyOrderItemsVo.setAllPrice(new BigDecimal(StrUtil.isEmpty(jhyOrderItemsVo.getScore())?"0":jhyOrderItemsVo.getScore()).setScale( 2, BigDecimal.ROUND_DOWN ));
                 jhyOrderItemsVolist.add(jhyOrderItemsVo);
             }
         }

--
Gitblit v1.9.1