From d0c47393cbf57134bd539c7cc0804c9c4cddef85 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 17:31:53 +0800
Subject: [PATCH] 20210707
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java | 3 +++
gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml | 2 ++
gc-user/src/main/resources/mapper/user/OrderMapper.xml | 4 ++--
3 files changed, 7 insertions(+), 2 deletions(-)
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 f48ec66..cfaf04e 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
@@ -36,6 +36,9 @@
@ApiModelProperty(value="台数")
private String recycleTai;
+ @ApiModelProperty(value="KG数")
+ private String recycleKg;
+
@ApiModelProperty(value="类型")
private Long itemType;
}
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml
index 422caad..6a075a8 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml
@@ -15,6 +15,8 @@
a.*
,IFNULL(case when d.item_unit = '台' then a.weight
else 0 end, 0) recycleTai
+ ,IFNULL(case when d.item_unit = 'kg' then a.weight
+ else 0 end, 0) recycleKg
FROM
xzx_jhy_order_items a
left join xzx_sys_environmental_info d on a.item_type = d.id
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index 76dbbc7..b0b9877 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -601,11 +601,11 @@
</select>
<select id="selectJHYListByOrderId" resultType="com.xzx.gc.user.vo.CategaryVo">
+
SELECT
a.title title
FROM
xzx_jhy_order_items a
- WHERE
- and a.order_no = #{orderId}
+ WHERE a.order_id = (select b.id from xzx_jhy_order b where b.order_no = #{orderId})
</select>
</mapper>
--
Gitblit v1.9.1