From 7fe6d026bcc8f993ce76437d01607e591cc671fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 17:20:02 +0800
Subject: [PATCH] 重写课包支付和排课逻辑
---
cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
index c8a40a9..13b2455 100644
--- a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
@@ -5,55 +5,55 @@
<select id="queryGoodsListOfSearch" resultType="java.util.Map">
SELECT id,
- `name`,
- `cover`,
- `type`,
- date_format(startTime ,'%Y-%m-%d') as startTime,
- date_format(endTime ,'%Y-%m-%d') as endTime,
- useScope,
- userPopulation,
- quantityIssued,
- pickUpQuantity,
- `sort`,
- shelves
+ `name`,
+ `cover`,
+ `type`,
+ date_format(startTime ,'%Y-%m-%d') as startTime,
+ date_format(endTime ,'%Y-%m-%d') as endTime,
+ useScope,
+ userPopulation,
+ quantityIssued,
+ pickUpQuantity,
+ `sort`,
+ shelves
from t_points_merchandise
<where>
- <if test="name != null">
- and `name` like concat('%', #{name}, '%')
- </if>
- <if test="type != null">
- and `type` = #{type}
- </if>
- <if test="redemptionMethod != null">
- and redemptionMethod = #{redemptionMethod}
- </if>
- <if test="userPopulation != null">
- and userPopulation = #{userPopulation}
- </if>
- <if test="state != null">
- and `state` = #{state}
- </if>
- and `type` != 3
+ <if test="name != null">
+ and `name` like concat('%', #{name}, '%')
+ </if>
+ <if test="type != null">
+ and `type` = #{type}
+ </if>
+ <if test="redemptionMethod != null">
+ and redemptionMethod = #{redemptionMethod}
+ </if>
+ <if test="userPopulation != null">
+ and userPopulation = #{userPopulation}
+ </if>
+ <if test="state != null">
+ and `state` = #{state}
+ </if>
+ and `type` != 3
</where>
order by insertTime desc
</select>
<select id="queryGoodsListOfSearchAudit" resultType="java.util.Map">
SELECT id,
- `name`,
- `cover`,
- `type`,
- date_format(startTime ,'%Y-%m-%d') as startTime,
- date_format(endTime ,'%Y-%m-%d') as endTime,
- useScope,
- userPopulation,
- quantityIssued,
- pickUpQuantity,
- `sort`,
- shelves,
+ `name`,
+ `cover`,
+ `type`,
+ date_format(startTime ,'%Y-%m-%d') as startTime,
+ date_format(endTime ,'%Y-%m-%d') as endTime,
+ useScope,
+ userPopulation,
+ quantityIssued,
+ pickUpQuantity,
+ `sort`,
+ shelves,
status
from t_points_merchandise
- where type =3 and `status` !=1
+ where type =3 and `status` !=1
<if test="name != null">
and `name` like concat('%', #{name}, '%')
</if>
@@ -90,7 +90,7 @@
where 1=1
<if test="query.objType == 1">
- and status =1
+ and status =1
</if>
<if test="query.name != null">
and `name` like concat('%', #{query.name}, '%')
@@ -110,7 +110,7 @@
and `type` = 3
order by sort desc
</select>
- <select id="changeState" >
+ <select id="changeState">
update t_points_merchandise set
shelves = #{state}
<where>
--
Gitblit v1.7.1