Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 0649fb5e05730a8f8bf15b0fe019a7227361f1af

 zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml

@@ -619,7 +619,7 @@
   </select>

    <select id="selectVipCardTotalMoney" resultType="java.lang.Double">
            SELECT TRUNCATE( SUM(gift_money)+SUM(real_money) ,2 ) from money_card_use where vip_id=#{vipId}  and `status` ='有效'
            SELECT  IFNULL(sum(IFNULL(gift_money, 0)),0)+ IFNULL(sum(IFNULL(real_money, 0)),0)  from money_card_use where vip_id=#{vipId}  and `status` ='有效'
    </select>