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

xiaoyong931011

2021-07-16 17a07481c3292e6fcbc7fff3dcbeb8ae817c178c

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

@@ -252,8 +252,8 @@
            a.order_no orderNo,
            a.score scoreReward,
            a.amount amountReward,
            a.nick_name nickname,
            a.mobile_phone phone,
            c.nick_name nickname,
            c.mobile_phone phone,
            (select sum(score) from xzx_jhy_order_items where b.id = order_id) score,
            (select sum(score/ 40) from xzx_jhy_order_items where b.id = order_id) amount
        FROM
@@ -262,6 +262,7 @@
                LEFT JOIN xzx_user_info c on a.user_id = c.user_id
        WHERE
            a.head_user_id = #{userId}
        order by b.CREATED_TIME desc
    </select>