From a6eec63efa145cf5211421dddb748ca4db303714 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 21:37:03 +0800
Subject: [PATCH] 20210628 集物员审核
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.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 | 5 ++++-
3 files changed, 7 insertions(+), 2 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 dc97abe..9feaaf5 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
@@ -68,7 +68,9 @@
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()).multiply(new BigDecimal(40));
jhyOrderItemsVo.setAllPrice(multiply);
+ jhyOrderItemsVo.setAllScore(multiplyScore);
jhyOrderItemsVolist.add(jhyOrderItemsVo);
}
}
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 472181d..255c24b 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
@@ -18,9 +18,12 @@
@ApiModelProperty(value="价格")
private BigDecimal price;
- @ApiModelProperty(value="总计")
+ @ApiModelProperty(value="总计= 价格*40")
private BigDecimal allPrice;
+ @ApiModelProperty(value="总积分= 价格*重量*40")
+ private BigDecimal allScore;
+
@ApiModelProperty(value="图片")
private String picture;
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index c502610..f129dc7 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)*40,0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ (select ifnull(sum(price),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
d.username username
FROM
xzx_jhy_order a
--
Gitblit v1.9.1