20210707

xiaoyong931011

2021-07-07 d0c47393cbf57134bd539c7cc0804c9c4cddef85

20210707

 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;
}

 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

 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>