From 0b5de677b94b3283870bb404144a047325861f32 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 28 Jun 2021 21:54:02 +0800 Subject: [PATCH] 20210628 集物员审核 --- gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 4 +++- 1 files changed, 3 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 eb18721..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,9 @@ 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)); + 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