From 11f85fe70c469c74c046843bd4f055726267e3ee Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 22:38:57 +0800
Subject: [PATCH] modify

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 9feaaf5..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,9 +68,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()).multiply(new BigDecimal(40));
-                jhyOrderItemsVo.setAllPrice(multiply);
-                jhyOrderItemsVo.setAllScore(multiplyScore);
+                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