From f54f8a92c09a2cd76b3bbb796df680215b63ab8a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 21 Feb 2022 14:16:41 +0800
Subject: [PATCH] fix 50 to 40
---
gc-user/src/main/resources/mapper/user/AccountMapper.xml | 2 +-
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 2 +-
gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java | 3 ++-
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 4 ++--
gc-core/src/main/java/com/xzx/gc/common/constant/Constants.java | 1 +
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/common/constant/Constants.java b/gc-core/src/main/java/com/xzx/gc/common/constant/Constants.java
index b236390..f3ef14e 100644
--- a/gc-core/src/main/java/com/xzx/gc/common/constant/Constants.java
+++ b/gc-core/src/main/java/com/xzx/gc/common/constant/Constants.java
@@ -221,5 +221,6 @@
public static final String ADDRESS_TYPE_SHOP = "商铺";
public static final String ADDRESS_TYPE_HOME = "住宅";
+ public static final Integer PRICE_SCORE_EXCHANGE = 40;
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java b/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java
index 2b5923d..b9e8a1f 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java
@@ -5,6 +5,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.xzx.gc.common.constant.CommonEnum;
+import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.entity.*;
import com.xzx.gc.order.mapper.*;
import lombok.extern.slf4j.Slf4j;
@@ -109,7 +110,7 @@
// 根据订单总积分， 1:40比例，换算成环保币，返对应百分比
if (StrUtil.isNotBlank(coinStr) && !"0".equals(coinStr)) {
BigDecimal coinRatio = new BigDecimal(coinStr).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_DOWN);
- BigDecimal totalCoin = totalScore.divide(new BigDecimal(50), 2, BigDecimal.ROUND_DOWN);
+ BigDecimal totalCoin = totalScore.divide(new BigDecimal(Constants.PRICE_SCORE_EXCHANGE), 2, BigDecimal.ROUND_DOWN);
BigDecimal returnCoin = totalCoin.multiply(coinRatio).setScale(2, BigDecimal.ROUND_DOWN);
totalReturnCoin = totalReturnCoin.add(returnCoin);
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 23681da..af7e9f8 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
@@ -156,7 +156,7 @@
BigDecimal total = BigDecimal.ZERO;
for (JhyOrderItems item : items) {
- item.setPrice(item.getPrice().multiply(BigDecimal.valueOf(50)));
+ item.setPrice(item.getPrice().multiply(BigDecimal.valueOf(Constants.PRICE_SCORE_EXCHANGE)));
total = total.add(StrUtil.isNotBlank(item.getScore()) ? new BigDecimal(item.getScore()) : BigDecimal.ZERO);
}
@@ -236,7 +236,7 @@
orderItems.setItemType(item.getId());
orderItems.setTitle(environmentalInfo.getTitle());
orderItems.setPrice(new BigDecimal(environmentalInfo.getPrice()));
- BigDecimal total = orderItems.getPrice().multiply(BigDecimal.valueOf(50)).multiply(weight);
+ BigDecimal total = orderItems.getPrice().multiply(BigDecimal.valueOf(Constants.PRICE_SCORE_EXCHANGE)).multiply(weight);
orderItems.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
orderItems.setWeight(weight);
jhyOrderItemsMapper.insert(orderItems);
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 671a7db..3ec5048 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
@@ -117,7 +117,7 @@
List<JhyOrderItemsVo> jhyOrderItemsList = jhyOrderItemsMapper.selectJhyOrderItemListByOrderId(id);
if(CollUtil.isNotEmpty(jhyOrderItemsList)){
for(JhyOrderItemsVo jhyOrderItemsVo : jhyOrderItemsList){
- BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(50));
+ BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(Constants.PRICE_SCORE_EXCHANGE));
jhyOrderItemsVo.setPrice(multiply);
jhyOrderItemsVo.setAllPrice(new BigDecimal(StrUtil.isEmpty(jhyOrderItemsVo.getScore())?"0":jhyOrderItemsVo.getScore()).setScale( 2, BigDecimal.ROUND_DOWN ));
}
diff --git a/gc-user/src/main/resources/mapper/user/AccountMapper.xml b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
index bff7cb9..a417c05 100644
--- a/gc-user/src/main/resources/mapper/user/AccountMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
@@ -255,7 +255,7 @@
c.nick_name nickname,
c.mobile_phone phone,
(select sum(score) from xzx_jhy_order_items where b.id = order_id) score,
- (select sum(score/ 50) from xzx_jhy_order_items where b.id = order_id) amount
+ (select sum(score/ 40) from xzx_jhy_order_items where b.id = order_id) amount
FROM
xzx_user_head_details a
LEFT JOIN xzx_jhy_order b ON a.order_no = b.order_no
--
Gitblit v1.9.1