20210707

xiaoyong931011

2021-07-07 f8ef6985d839a560f22ea816284181fdc52b7f6a

20210707

 gc-user/src/main/resources/mapper/user/OrderMapper.xml

@@ -401,9 +401,9 @@
                        '1' type,
                        ifnull(sum(d.money), 0) money,
                        '0' score,
                        a.address address,
                        CONCAT(a.address_area, a.address) address,
                        ifnull(sum(d.weight), 0) weight,
                        e.NAME NAME,
                        e.NAME name,
                        a.create_time createTime
                    FROM
                        xzx_order_info a
@@ -423,13 +423,14 @@
                        '2' type,
                        '0' money,
                        ifnull(sum(d.score), 0) score,
                        a.address address,
                        CONCAT(a.area, a.address) address,
                        ifnull(sum(d.weight), 0) weight,
                        a.username NAME,
                        e.username name,
                        a.CREATED_TIME createTime
                    FROM
                        xzx_jhy_order a
                            LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
                            LEFT JOIN xzx_jhy_info e ON a.jhy_id = e.user_id
                    WHERE
                        a.user_id = #{userId}
                    and a.status = 3