From cd4f41c98dd9a071b3e2003e324b9fd61472c7f4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Jun 2021 16:40:53 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/resources/mapper/order/JhyOrderItemsMapper.xml | 4 +++-
gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java | 6 ++++++
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 5 +++--
3 files changed, 12 insertions(+), 3 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 6401db0..1818cbe 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
@@ -35,4 +37,8 @@
@ApiModelProperty(value="类型")
private Long itemType;
+
+ @Transient
+ @ApiModelProperty(value = "单位")
+ private transient 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..11f93bb 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
@@ -168,9 +168,10 @@
BigDecimal totalScore = BigDecimal.ZERO;
for (JhyOrderConfirmItemsDto item : confirmDto.getItems()) {
JhyOrderItems orderItem = jhyOrderItemsMapper.selectByPrimaryKey(item.getId());
- BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(new BigDecimal(item.getWeight()));
+ BigDecimal weight = StrUtil.isNotBlank(item.getWeight()) ? new BigDecimal(item.getWeight()) : BigDecimal.ZERO;
+ BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(weight);
orderItem.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
- orderItem.setWeight(new BigDecimal(item.getWeight()));
+ orderItem.setWeight(weight);
jhyOrderItemsMapper.updateByPrimaryKey(orderItem);
totalScore = totalScore.add(total);
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderItemsMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderItemsMapper.xml
index f8eb86f..df9edd4 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderItemsMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderItemsMapper.xml
@@ -3,6 +3,8 @@
<mapper namespace="com.xzx.gc.order.mapper.JhyOrderItemsMapper">
<select id="selectOrderItems" resultType="com.xzx.gc.entity.JhyOrderItems">
- select * from xzx_jhy_order_items where order_id=#{orderId}
+ select a.*, b.item_unit itemUnit from xzx_jhy_order_items a
+ left join xzx_sys_environmental_info b on a.item_type=b.id
+ where a.order_id=#{orderId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1