Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-08-09 00a8e2f76d02cfc17ca9ff156aa97f85bae5897d

 gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml

@@ -10,5 +10,18 @@
        WHERE a.order_id=#{orderId}
    </select>

    <select id="selectJhyOrderItemListByOrderId" resultType="com.xzx.gc.shop.vo.JhyOrderItemsVo">
        SELECT
            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
        WHERE a.order_id=#{orderId}
    </select>


</mapper>