From 583fc7b7ed2ab5961c50e24e779262f168b9d55f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 15:46:39 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index 295413f..a925e17 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -65,7 +65,6 @@
create_time,
update_by,
update_time,
- id,
proj_use_id,
surplus_count,
is_over,
@@ -82,7 +81,6 @@
now(),
#{updateBy},
now(),
- #{id},
#{projUseId},
#{surplusCount},
#{isOver},
@@ -728,13 +726,16 @@
a.type,
a.SOURCE,
e.ORDER_NO,
- a.remark
+ a.remark,
+ s.SHOP_NAME
from sys_proj_use a
left join shopping_goods b on a.proj_id = b.id
left join sys_vip_info c on c.ID = a.VIP_ID
+ left join sys_shop_info s on c.SHOP_ID=s.id
left join sys_order_item d on d.id = a.ORDER_ITEM_ID
left join sys_order e on e.id = d.ORDER_ID
left join shopping_goods_category f on f.id = b.cate_id
+
<where>
@@ -854,10 +855,11 @@
group by b.id) t
</select>
- <select id="selectHasValidProjUse" resultMap="SysProjUseMap">
- select * from sys_proj_use
- where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d') and STATUS='有效'
- </select>
+ <update id="updateInvalidProjUse" >
+ update sys_proj_use set STATUS='无效'
+ where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d')
+ and STATUS='有效'
+ </update>
<resultMap type="SysProjUse" id="TaoCanWithProjMap">
@@ -891,11 +893,14 @@
<collection property="taocanProjUse" ofType="com.matrix.system.hive.bean.SysProjUse">
<id property="id" column="proj_info_id" />
<result property="projName" column="proj_proj_name"/>
+ <result property="source" column="proj_source"/>
+ <result property="price" column="proj_price"/>
<result property="failTime" column="proj_FAIL_TIME"/>
<result property="surplusCount" column="proj_SURPLUS_COUNT"/>
<result property="timeLength" column="proj_time_length"/>
<result property="img" column="proj_img"/>
<result property="projId" column="proj_projId"/>
+ <result property="status" column="proj_status"/>
</collection>
</resultMap>
@@ -911,6 +916,9 @@
e.SURPLUS_COUNT proj_SURPLUS_COUNT,
e.id proj_info_id,
e.proj_id proj_projId,
+ e.source proj_source,
+ e.price proj_price,
+ e.status proj_status,
f.time_length proj_time_length,
f.img proj_img
from sys_proj_use a
@@ -921,7 +929,7 @@
left join shopping_goods f on e.proj_id=f.id
where 1=1 and a.type='套餐' and a.TAOCAN_ID IS NULL
<if test="record.queryKey != null and record.queryKey !='' ">
- and (instr(b.name, #{record.queryKey}) or instr(b.zjm, #{record.queryKey}) or instr(goods_no, #{record.queryKey}))
+ and (instr(b.name, #{record.queryKey}) or instr(b.zjm, #{record.queryKey}) or instr(b.goods_no, #{record.queryKey}))
</if>
<if test="record.isOver != null and record.isOver !='' ">
and a.IS_OVER = #{record.isOver}
@@ -934,4 +942,19 @@
</if>
</select>
+ <select id="selectTaocanCountForCourseAndInfinite" resultType="java.lang.Integer">
+ select count(1) from sys_proj_use
+ where taocan_id=#{taocanId} and vip_id=#{vipId}
+ </select>
+ <select id="selectUseCountByOrderItemId" resultType="java.lang.Integer">
+ SELECT count(*)
+ from sys_beautician_state a
+ LEFT JOIN sys_proj_use b on a.puse_id=b.ID
+ left join sys_proj_services c on a.SERVICES_ID=c.id
+ where b.ORDER_ITEM_ID=#{orderItemId}
+ and c.STATE !='预约取消';
+ </select>
+ <select id="selectByOrderItemId" resultType="com.matrix.system.hive.bean.SysProjUse">
+ select * from sys_proj_use where ORDER_ITEM_ID =#{orderItemId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1