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/resources/mapper/shop/JhyOrderMapper.xml | 2 +-
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 8 ++++----
2 files changed, 5 insertions(+), 5 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);
}
}
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index 220d98e..f6aaa45 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -14,7 +14,7 @@
a.remark remark,
b.nick_name name,
b.mobile_phone mobilePhone,
- (select ifnull(sum(price*weight*40),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ (select ifnull(sum(score),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
(select ifnull(sum(weight),0) from xzx_jhy_order_items where order_id = a.id) totalWeight,
d.username username
FROM
--
Gitblit v1.9.1