Merge branch 'score_shop' into api_score_meger

jyy

2021-09-17 c5e6a16b70b5d119428fd621bfc2871a94c89d30

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

@@ -621,8 +621,10 @@
      group by b.id) t
   </select>

    <!-- 美度不显示赠送金额 IFNULL(sum(IFNULL(gift_money, 0)),0)+-->
    <select id="selectVipCardTotalMoney" resultType="java.lang.Double">
            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  IFNULL(sum(IFNULL(real_money, 0)),0)  from money_card_use where vip_id=#{vipId}  and `status` ='有效'
    </select>