~jiangyouyao/beauty-erp.git

			@@ -50,7 +50,9 @@

			<result property="arriveCnt" column="arrive_cnt" />


			<result property="goodsNo" column="goodsNo" />
			<result property="goodsName" column="goodsName" />
			<result property="zkPrice" column="zkPrice" />

			</resultMap>

			@@ -873,12 +875,17 @@
			<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 test="record.beginTime != null">
			and date_format(b.datatime, '%Y-%m-%d') >= date_format(#{record.beginTime}, '%Y-%m-%d')
			</if>

			<if test="record.endTime!=null">
			and date_format(b.datatime, '%Y-%m-%d') >= date_format(#{record.endTime}, '%Y-%m-%d')
			</if>
			<if test="record.beaultId != null and record.beaultId!=''">
			and FIND_IN_SET(#{record.beaultId}, a.BEATUY_ID)
			</if>
			<if test='record.t1 == "on"'>
			and a.BEATUY_ID is not null
			</if>
			group by a.PHONE
			<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
			@@ -915,26 +922,112 @@
			<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 test="record.beginTime != null">
			and date_format(b.datatime, '%Y-%m-%d') >= date_format(#{record.beginTime}, '%Y-%m-%d')
			</if>

			<if test="record.endTime!=null">
			and date_format(b.datatime, '%Y-%m-%d') >= date_format(#{record.endTime}, '%Y-%m-%d')
			</if>
			<if test="record.beaultId != null and record.beaultId!=''">
			and FIND_IN_SET(#{record.beaultId}, a.BEATUY_ID)
			</if>
			<if test='record.t1 == "on"'>
			and a.BEATUY_ID is not null
			</if>
			</select>


			<select id="selectUserAchieveByTime" resultType="com.matrix.system.app.vo.UserAchieveVo">
			select
			sum(IFNULL(proj_cash,0) + IFNULL(goods_cash,0) + IFNULL(card_cash,0)) allCash,
			sum(card_cash) card,
			sum(proj_cash) project,
			sum(goods_cash) product,
			sum(consume) cardUse,
			sum(proj_percentage) projCommission
			from achieve_new
			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") >= #{startTime} or #{endTime} >= date_format(datatime, "%Y-%m-%d"))
			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>

			<select id="selectApiOrderItemAchieve" resultType="com.matrix.system.app.vo.OrderDetailAchieveItemVo">
			select
			b.su_name name,
			IFNULL(a.card_cash, 0) + IFNULL(a.proj_cash, 0) + IFNULL(a.goods_cash, 0) achieve
			from achieve_new a
			inner join sys_users b on (a.beault_id=b.su_id or a.sale_id = b.su_id)
			where a.order_item_id=#{itemId} and order_type = '订单'
			</select>

			<select id="selectShopConsumeAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">
			select
			b.shop_short_name name,
			b.SHOP_IMAG photo,
			sum(IFNULL(a.free_consume,0) + IFNULL(a.consume,0) + IFNULL(a.his_consume,0)) amount
			from achieve_new a
			left join sys_shop_info b on a.shop_id=b.ID
			<where>
			<if test="record.companyId != null">
			and a.company_id=#{record.companyId}
			</if>
			<if test='record.t1 == "1" and record.datatime != null'>
			and date_format(datatime, '%Y-%m-%d') = date_format(#{record.datatime}, '%Y-%m-%d')
			</if>
			<if test='record.t1 == "2" and record.datatime != null'>
			and date_format(datatime, '%Y-%m') = date_format(#{record.datatime}, '%Y-%m')
			</if>
			<if test='record.t1 == "3" and record.datatime != null'>
			and date_format(datatime, '%Y') = date_format(#{record.datatime}, '%Y')
			</if>
			</where>
			group by a.shop_id
			order by amount desc, a.shop_id
			</select>

			<select id="selectBeauticianConsumeAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">
			select
			b.su_name name,
			b.su_id id,
			sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume, 0) + IFNULL(a.consume, 0)) amount,
			c.shop_short_name shopName
			from achieve_new a
			inner join sys_users b on a.beault_id=b.su_id
			left join sys_shop_info c on a.shop_id=c.ID
			<where>
			a.order_type='服务单'
			<if test="record.companyId != null">
			and a.company_id=#{record.companyId}
			</if>
			<if test="record.shopId != null">
			and a.shop_id=#{record.shopId}
			</if>
			<if test='record.t1 == "1" and record.datatime != null'>
			and date_format(datatime, '%Y-%m-%d') = date_format(#{record.datatime}, '%Y-%m-%d')
			</if>
			<if test='record.t1 == "2" and record.datatime != null'>
			and date_format(datatime, '%Y-%m') = date_format(#{record.datatime}, '%Y-%m')
			</if>
			<if test='record.t1 == "3" and record.datatime != null'>
			and date_format(datatime, '%Y') = date_format(#{record.datatime}, '%Y')
			</if>
			</where>
			group by a.beault_id
			order by amount desc
			</select>

			<select id="selectOrderItemAchieveByOrderId" resultMap="AchieveNewMap">
			select
			a.*,
			b.code goodsNo,
			b.name goodsName,
			c.su_name meiliao,
			d.count*d.zk_price zk_total
			from achieve_new a
			left join shopping_goods b on a.shopping_goods_id=b.id
			left join sys_users c on a.beault_id=c.su_id
			left join sys_order_item d on a.order_item_id=d.id
			where a.order_id=#{orderId}
			</select>
			</mapper>