From 02b38bb7c08d68fffc6af25e4ba00a456d96e94e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 16:22:54 +0800
Subject: [PATCH] modify
---
gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java | 3 +++
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java
index d446436..ccecebb 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java
@@ -5,7 +5,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.persistence.Column;
import javax.persistence.Table;
+import javax.persistence.Transient;
import java.math.BigDecimal;
@Data
@@ -36,6 +38,7 @@
@ApiModelProperty(value="类型")
private Long itemType;
+ @Transient
@ApiModelProperty(value = "单位")
private String itemUnit;
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
index ab9f48c..1ae3967 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -170,7 +170,7 @@
JhyOrderItems orderItem = jhyOrderItemsMapper.selectByPrimaryKey(item.getId());
BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(new BigDecimal(item.getWeight()));
orderItem.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
- orderItem.setWeight(new BigDecimal(item.getWeight()));
+ orderItem.setWeight(StrUtil.isNotBlank(item.getWeight()) ? new BigDecimal(item.getWeight()) : BigDecimal.ZERO);
jhyOrderItemsMapper.updateByPrimaryKey(orderItem);
totalScore = totalScore.add(total);
--
Gitblit v1.9.1