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

xiaoyong931011

2021-07-15 8aaf0cc9486d6ba0f0a6124017d7877ada577723

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

 gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java

@@ -122,7 +122,7 @@
        userHeadDetailsMapper.insert(userHeadDetails);

        userHeadRelate.setAmount(userHeadRelate.getAmount().add(totalReturnCoin));
        userHeadRelate.setScore(userHeadDetails.getScore().add(totalReturnScore));
        userHeadRelate.setScore(userHeadRelate.getScore().add(totalReturnScore));
        userHeadRelateMapper.updateByPrimaryKey(userHeadRelate);

        accountInfo.setAccountId(accountInfo.getAccountId());

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

@@ -17,5 +17,6 @@
         inner join xzx_user_info d on b.user_id = d.user_id
        where head_user_id=#{userId}
        group by a.order_no, d.nick_name, a.score, a.amount, b.receiving_time
        order by b.receiving_time desc
    </select>
</mapper>

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

@@ -28,5 +28,6 @@
        from xzx_user_head_relate a
                 inner join xzx_user_info b on a.user_id=b.user_id
        where a.head_user_id=#{userId}
        order by a.id desc
    </select>
</mapper>