Merge branch 'developer' into alpha

姜友瑶

2022-05-05 c41e8d372cdabbe1fd5973c9322e38a40bfa1a39

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

@@ -61,6 +61,7 @@
        <result property="country" column="country" />
        <result property="sessionKey" column="session_key" />
        <result property="userIsAuthorize" column="user_is_authorize" />
        <result property="validFlag" column="valid_flag" />

        <!-- 扩展属性 -->
        <result property="staffName" column="STAFF_NAME"/>
@@ -124,6 +125,7 @@
        <result property="country" column="country" />
        <result property="sessionKey" column="session_key" />
        <result property="userIsAuthorize" column="user_is_authorize" />
        <result property="validFlag" column="valid_flag" />

        <!-- 扩展属性 -->
        <result property="staffName" column="STAFF_NAME"/>
@@ -536,6 +538,9 @@
            </if>
            <if test="avatarUrl != null and avatarUrl != '' ">
                avatar_url  = #{avatarUrl},
            </if>
            <if test="validFlag != null and validFlag != '' ">
                valid_flag  = #{validFlag},
            </if>


@@ -1461,7 +1466,7 @@
               c.LEVEL_NAME vipLevel,
               a.POINT_ALL integral,
               e.shop_short_name shopName,
               sum(IFNULL(b.gift_money, 0) + IFNULL(b.real_money, 0)) totalBalance,
               sum(IFNULL(b.real_money, 0)) totalBalance,
               sum(IFNULL(b.gift_money, 0)) giftBalance,
               (select sum(IFNULL(d.goods_cash, 0) + IFNULL(d.proj_cash, 0) + IFNULL(d.card_cash, 0)) from achieve_new d where d.vip_id=a.id) totalShopping
        from sys_vip_info a