From 00a8e2f76d02cfc17ca9ff156aa97f85bae5897d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 09 Aug 2021 16:50:55 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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

--
Gitblit v1.9.1