From fced9fc9ee879552238a1c83f884c7fa61ba6c07 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 15:14:22 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java | 6 ++++++
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 6 ++++++
gc-order/src/main/resources/mapper/order/SysEnvironmentalInfoMapper.xml | 5 +++++
3 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
index e78d6b7..af6ac72 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
@@ -69,4 +69,10 @@
@ApiModelProperty(value = "集物员电话")
private String jhyPhone;
+
+ @ApiModelProperty(value = "回收/台")
+ private String recycleTai;
+
+ @ApiModelProperty(value = "回收/kg")
+ private String recycleKg;
}
\ No newline at end of file
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index 7e52764..e796b6d 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -16,11 +16,17 @@
,date_format(a.receiving_time, '%Y-%m-%d %H:%i') receivingTime
,CONCAT(a.reserve_date, ' ', a.reserve_time) reserveTime
,GROUP_CONCAT(b.title) items
+ ,sum(b.score) recycleScore
+ ,IFNULL(SUM(case when d.item_unit = '台' then b.weight
+ else 0 end), 0) recycleTai
+ ,IFNULL(SUM(case when d.item_unit = 'kg' then b.weight
+ else 0 end), 0) recycleKg
,c.username jhyName
,c.mobile jhyPhone
from xzx_jhy_order a
inner join xzx_jhy_order_items b on a.id=b.order_id
left join xzx_jhy_info c on a.jhy_id=c.user_id
+ left join xzx_sys_environmental_info d on b.item_type = d.id
<where>
<if test="record.type == 1">
and a.user_id=#{record.userId}
diff --git a/gc-order/src/main/resources/mapper/order/SysEnvironmentalInfoMapper.xml b/gc-order/src/main/resources/mapper/order/SysEnvironmentalInfoMapper.xml
new file mode 100644
index 0000000..b3f96a6
--- /dev/null
+++ b/gc-order/src/main/resources/mapper/order/SysEnvironmentalInfoMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xzx.gc.order.mapper.SysEnvironmentalInfoMapper">
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1