From 98a6719dd25269351d1f5f37c94cd4b586d2bde0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 21:45:53 +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 | 4 ++--
gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java | 7 ++-----
3 files changed, 5 insertions(+), 8 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 9feaaf5..eb18721 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
@@ -69,8 +69,8 @@
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);
+ jhyOrderItemsVo.setPrice(multiply);
+ jhyOrderItemsVo.setAllPrice(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 4e27a57..5c1ebb8 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,14 +15,11 @@
@ApiModelProperty(value="标题")
private String title;
- @ApiModelProperty(value="价格（元）")
+ @ApiModelProperty(value="单价（积分）= 价格*40")
private BigDecimal price;
- @ApiModelProperty(value="单价（积分）= 价格*40")
- private BigDecimal allPrice;
-
@ApiModelProperty(value="总积分= 价格*重量*40")
- private BigDecimal allScore;
+ private BigDecimal allPrice;
@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 f129dc7..c29fbfb 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),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ (select ifnull(sum(price*weight*40),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
d.username username
FROM
xzx_jhy_order a
--
Gitblit v1.9.1