From 0e5aaeba97021c289485a652ec6af0bb37f92af7 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 30 Nov 2021 20:29:46 +0800
Subject: [PATCH] fix 40 to 50
---
gc-user/src/main/resources/mapper/user/AccountMapper.xml | 2 +-
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 2 +-
gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java | 4 ++--
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
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 4ef021c..41d1839 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(40)));
+ item.setPrice(item.getPrice().multiply(BigDecimal.valueOf(50)));
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(40)).multiply(weight);
+ BigDecimal total = orderItems.getPrice().multiply(BigDecimal.valueOf(50)).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 e594674..671a7db 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(40));
+ BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(50));
jhyOrderItemsVo.setPrice(multiply);
jhyOrderItemsVo.setAllPrice(new BigDecimal(StrUtil.isEmpty(jhyOrderItemsVo.getScore())?"0":jhyOrderItemsVo.getScore()).setScale( 2, BigDecimal.ROUND_DOWN ));
}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
index cfaf04e..1478a9f 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
@@ -15,10 +15,10 @@
@ApiModelProperty(value="标题")
private String title;
- @ApiModelProperty(value="单价（积分）= 价格*40")
+ @ApiModelProperty(value="单价（积分）= 价格*50")
private BigDecimal price;
- @ApiModelProperty(value="总积分= 价格*重量*40")
+ @ApiModelProperty(value="总积分= 价格*重量*50")
private BigDecimal allPrice;
@ApiModelProperty(value="图片")
diff --git a/gc-user/src/main/resources/mapper/user/AccountMapper.xml b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
index a417c05..bff7cb9 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/ 40) from xzx_jhy_order_items where b.id = order_id) amount
+ (select sum(score/ 50) 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