From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改

---
 cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
index 4601dee..bf457a0 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
@@ -1,6 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsh.activity.mapper.UserPointsMerchandiseMapper">
+    <update id="changeState">
+        update t_user_points_merchandise set
+        state = #{state}
+        <where>
+            <if test="ids != null and ids.size()>0">
+                AND t_user_points_merchandise.id IN
+                <foreach collection="ids" separator="," item="id" open="(" close=")">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
 
 
+    </update>
+
+
+    <select id="getAmount" resultType="com.dsh.activity.model.PointMerchandiseIncomeVo">
+        select t1.insertTime,t2.cash  from t_user_points_merchandise t1
+        left join t_points_merchandise t2 on t1.pointsMerchandiseId = t2.id
+        where t1.payStatus =2
+    </select>
+    <select id="getConsumeDetails" resultType="com.dsh.activity.entity.ConsumeDetail">
+
+        SELECT
+        CASE tm.type
+        WHEN 1 THEN '实体购买'
+        WHEN 2 THEN '课包购买'
+        WHEN 3 THEN '门票购买'
+        WHEN 4 THEN '优惠券购买'
+        END AS consumeName ,DATE_FORMAT(pm.insertTime, '%m-%d %H:%i')as `consumeTime`,2 as type,CONCAT('-',tm.cash) as
+        consumeAmount
+        FROM t_user_points_merchandise pm
+        LEFT JOIN t_points_merchandise tm ON tm.id = pm.pointsMerchandiseId
+        WHERE pm.pointsMerchandiseId IN(
+        SELECT id
+        FROM t_points_merchandise WHERE redemptionMethod IN (2,3)
+
+        )
+        <if test="null != monthStart and '' != monthStart and null != monthEnd and '' != monthEnd">
+            and DATE_FORMAT(pm.insertTime, '%Y-%m-%d %H:%i:%s') between #{monthStart} and #{monthEnd}
+        </if>
+        <if test="null != appUserId and '' != appUserId ">
+            and pm.userId = #{appUserId}
+        </if>
+
+
+    </select>
 </mapper>

--
Gitblit v1.7.1