From e971ea090aa1f320f3c3f78c3a2a8d50f16dd4d0 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Fri, 15 Jan 2021 23:38:19 +0800 Subject: [PATCH] 小程序预约接口修改 --- zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 52 insertions(+), 5 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 2509e3e..d1e4b85 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml @@ -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> @@ -961,7 +963,7 @@ <select id="selectShopConsumeAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo"> select - b.shop_short_name, + 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 @@ -970,17 +972,62 @@ <if test="record.companyId != null"> and a.company_id=#{record.companyId} </if> - <if test='record.t1 == "1" and record.orderTime != null'> + <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.orderTime != null'> + <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.orderTime != null'> + <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> \ No newline at end of file -- Gitblit v1.9.1