From 844e37605b65a2a3d95b466d663d91ac8584350c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Dec 2020 21:28:17 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into api
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index e0e4c58..ebe9c0b 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -48,6 +48,8 @@
<result property="meiliao" column="meiliao" />
<result property="zkTotal" column="zk_total" />
+ <result property="arriveCnt" column="arrive_cnt" />
+
</resultMap>
@@ -840,4 +842,101 @@
where 1=1
<include refid="where_sql"></include>
</select>
+
+
+ <select id="selectVipConsumeStatisticsList" resultMap="AchieveNewMap">
+ select
+ a.VIP_NAME,
+ a.PHONE t9,
+ GROUP_CONCAT(DISTINCT e.su_name) meiliao,
+ d.cnt arrive_cnt,
+ sum(b.buyConsume) goods_cash,
+ sum(b.freeConsume) free_consume,
+ sum(b.hisConsume) his_consume
+ from sys_vip_info a
+ inner join (
+ select vip_id,datatime, sum(a.free_consume) freeConsume, sum(a.his_consume) hisConsume, sum(IFNULL(goods_cash, 0) + IFNULL(card_cash, 0)) buyConsume from achieve_new a group by vip_id
+ ) b on a.ID = b.vip_id
+ inner join (
+ select vip_id, count(1) cnt from (
+ select vip_id, date_format(datatime, '%Y-%m-%d')
+ from achieve_new
+ group by date_format(datatime, '%Y-%m-%d'), vip_id
+ ) c group by vip_id
+ ) d on a.ID=d.vip_id
+
+ left join sys_users e on find_in_set(e.su_id, a.BEATUY_ID)
+ where 1=1
+ <if test="record.vipName != null and record.vipName !=''">
+ and (a.vip_name like CONCAT(CONCAT('%', #{record.vipName}), '%') or a.vip_no=#{record.vipName} or a.phone = #{record.vipName})
+ </if>
+ <if test="record.shopId != null">
+ and a.shop_id=#{record.shopId}
+ </if>
+ <if test="record.beginTime != null and record.endTime!=null">
+ and date_format(b.datatime, '%Y-%m-%d') between #{record.beginTime} and #{record.endTime}
+ </if>
+
+ <if test="record.beaultId != null and record.beaultId!=''">
+ and FIND_IN_SET(#{record.beaultId}, a.BEATUY_ID)
+ </if>
+ group by a.PHONE
+ <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
+ <if test="pageVo.sort !=null and pageVo.order !=null">
+ order by
+ ${pageVo.sort} ${pageVo.order}
+ </if>
+ <if test="pageVo.offset >=0 and pageVo.limit >0">
+ limit
+ #{pageVo.offset},#{pageVo.limit}
+ </if>
+ </if>
+ </select>
+
+ <select id="selectVipConsumeStatisticsTotal" resultType="java.lang.Integer">
+ select count(1)
+ from sys_vip_info a
+ inner join (
+ select vip_id,datatime, sum(a.free_consume) freeConsume, sum(a.his_consume) hisConsume, sum(IFNULL(goods_cash, 0) + IFNULL(card_cash, 0)) buyConsume from achieve_new a group by vip_id
+ ) b on a.ID = b.vip_id
+ inner join (
+ select vip_id, count(1) cnt from (
+ select vip_id, date_format(datatime, '%Y-%m-%d')
+ from achieve_new
+ group by date_format(datatime, '%Y-%m-%d'), vip_id
+ ) c group by vip_id
+ ) d on a.ID=d.vip_id
+
+ left join sys_users e on find_in_set(e.su_id, a.BEATUY_ID)
+ where 1=1
+ <if test="record.vipName != null and record.vipName !=''">
+ and (a.vip_name like CONCAT(CONCAT('%', #{record.vipName}), '%') or a.vip_no=#{record.vipName} or a.phone = #{record.vipName})
+ </if>
+ <if test="record.shopId != null">
+ and a.shop_id=#{record.shopId}
+ </if>
+ <if test="record.beginTime != null and record.endTime!=null">
+ and date_format(b.datatime, '%Y-%m-%d') between #{record.beginTime} and #{record.endTime}
+ </if>
+
+ <if test="record.beaultId != null and record.beaultId!=''">
+ and FIND_IN_SET(#{record.beaultId}, a.BEATUY_ID)
+ </if>
+ </select>
+
+
+ <select id="selectUserAchieveByTime" resultType="com.matrix.system.app.vo.UserAchieveVo">
+ select
+ sale_id id,
+ sum(IFNULL(proj_cash,0) + IFNULL(goods_cash,0) + IFNULL(card_cash,0) + IFNULL(consume, 0) + IFNULL(b.arrears, 0)) orderCash,
+ sum(IFNULL(proj_cash,0) + IFNULL(goods_cash,0) + IFNULL(card_cash,0) + IFNULL(b.arrears, 0)) cash,
+ sum(IFNULL(consume, 0)) cardUse,
+ sum(IFNULL(his_consume, 0)) hisConsume,
+ sum(IFNULL(free_consume, 0)) freeConsume,
+ sum(IFNULL(proj_percentage, 0)) projCommission
+ from achieve_new a
+ left join sys_order b on a.sale_id=b.STAFF_ID and (date_format(b.ORDER_TIME, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(b.ORDER_TIME, '%Y-%m-%d'))
+ where sale_id=#{userId}
+ and (date_format(datatime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(datatime, '%Y-%m-%d'))
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1