From ccdc5690f7f4705611a2f57a7cf45da352b6e7e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 17:51:58 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 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 4e5b1ce..1e20546 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -17,6 +17,7 @@
<result property="vipId" column="vip_id" />
<result property="freeConsume" column="free_consume" />
<result property="hisConsume" column="his_consume" />
+ <result property="consume" column="consume" />
<result property="goodsCash" column="goods_cash" />
<result property="projNum" column="proj_num" />
<result property="numberOfPeople" column="number_of_people" />
@@ -50,6 +51,7 @@
<result property="goodsNo" column="goodsNo" />
<result property="goodsName" column="goodsName" />
<result property="payMethod" column="pay_method" />
+ <result property="cateName" column="cateName" />
</resultMap>
@@ -64,7 +66,7 @@
d.level_name,
c.vip_name,
e.name as pro_name,
- (IFNULL(a.goods_cash,0)) as zk_total,
+ b.ZK_TOTAL as zk_total,
a.goods_cash,
a.his_consume,
a.free_consume,
@@ -74,9 +76,11 @@
a.number_of_people,
a.proj_num,
a.proj_time,
- i.name as module_subName,
- h.SHOP_NAME shop_name,
- a.order_type
+ i.name as cateName,
+ h.shop_short_name shop_name,
+ a.order_type,
+ a.achieveType,
+ j.pay_method
from
achieve_new a
left join sys_order b on a.order_id=b.id
@@ -88,6 +92,7 @@
LEFT JOIN sys_shop_info h ON a.SHOP_ID = h.ID
LEFT JOIN shopping_goods_category i ON e.cate_id = i.id
left join sys_proj_services l on a.service_order_id=l.id
+ left join sys_order_item j on a.order_item_id=j.ID
<where>
<if test="record!=null">
<if
@@ -721,6 +726,9 @@
<if test="record.t9 != null and record.t9 != '' ">
t9 = #{record.t9},
</if>
+ <if test="record.payMethod != null and record.payMethod != '' ">
+ pay_method = #{record.payMethod},
+ </if>
</set>
WHERE id=#{record.id}
</update>
@@ -906,7 +914,18 @@
<select id="selectUserAchieveByTime" resultType="com.matrix.system.app.vo.UserAchieveVo">
select
sale_id id,
- sum(goods_cash) orderCash,
+ (select ifnull(sum(case b.pay_method when '现金' then goods_cash else 0 end),0)
+ from achieve_new a
+ inner join sys_order_item b on a.order_item_id=b.ID
+ where a.beault_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'))
+ ) orderCash,
+ (select ifnull(sum(case b.pay_method when '划扣' then goods_cash else 0 end),0)
+ from achieve_new a
+ inner join sys_order_item b on a.order_item_id=b.ID
+ where a.beault_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'))
+ ) cash,
sum(case order_type when '订单' then proj_percentage else 0 end) cardUse,
sum(IFNULL(his_consume, 0)) hisConsume,
sum(IFNULL(free_consume, 0)) freeConsume,
@@ -1051,4 +1070,12 @@
group by a.shop_id
order by amount desc, a.shop_id
</select>
+
+ <select id="selectAchieveByServiceOrderId" resultMap="AchieveNewMap">
+ select * from achieve_new where service_order_id=#{serviceOrderId}
+ </select>
+
+ <select id="selectAchieveForOrder" resultMap="AchieveNewMap">
+ select * from achieve_new where order_type='订单'
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1