From bf765893039bc7968b8160a70bda778526dca98c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 15:28:19 +0800
Subject: [PATCH] 定时任务

---
 manage/src/main/resources/mapping/TOrderMapper.xml |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/manage/src/main/resources/mapping/TOrderMapper.xml b/manage/src/main/resources/mapping/TOrderMapper.xml
index fc53659..3c6903d 100644
--- a/manage/src/main/resources/mapping/TOrderMapper.xml
+++ b/manage/src/main/resources/mapping/TOrderMapper.xml
@@ -9,7 +9,6 @@
         <result column="userId" property="userId" />
         <result column="optometryId" property="optometryId" />
         <result column="storeId" property="storeId" />
-        <result column="modelId" property="modelId" />
         <result column="color" property="color" />
         <result column="series" property="series" />
         <result column="rLens" property="rLens" />
@@ -46,12 +45,12 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, code, userId, optometryId, storeId, modelId, color, series, rLens, lLens, `type`, refractiveIndex, createTime, updateTime, createBy,
+        id, code, userId, optometryId, storeId, color, series, rLens, lLens, `type`, refractiveIndex, createTime, updateTime, createBy,
             updateBy, isDelete, sysId, couponId, itemsId, remark, isMail, mailName, mailPhone, mailAddress, orderMoney, couponMoney, payMoney,
             isMachining, machiningCode, isAccounting, accountingName, accountingTime,phone, realName, age, gender,payTypeName
     </sql>
     <select id="getOrderDetailById" resultType="com.jilongda.manage.vo.TOrderVO">
-        select  o.id, o.code, o.userId, o.optometryId, o.storeId, o.modelId, o.color, o.series, o.rLens, o.lLens, o.`type`, o.refractiveIndex, o.createTime, o.updateTime, o.createBy,
+        select  o.id, o.code, o.userId, o.optometryId, o.storeId, o.color, o.series, o.rLens, o.lLens, o.`type`, o.refractiveIndex, o.createTime, o.updateTime, o.createBy,
                 o.updateBy, o.isDelete, o.sysId, o.couponId, o.itemsId, o.remark, o.isMail, o.mailName, o.mailPhone, o.mailAddress, o.orderMoney, o.couponMoney, o.payMoney,
                 o.isMachining, o.machiningCode, o.isAccounting, o.accountingName, o.accountingTime,o.phone, o.realName, o.age, o.gender,o.payTypeName,
                 su.nick_name AS staffName,s.name AS storeName,tc.name AS couponName
@@ -60,6 +59,37 @@
         left join t_store s on s.id = o.storeId
         left join t_coupon_receive tcr on tcr.id = o.couponId
         left join t_coupon tc on tc.id = tcr.couponId
+        where o.id = #{orderId} and o.isDelete = 0
     </select>
-
+    <select id="pageList" resultType="com.jilongda.manage.model.TOrder">
+        select * from t_order
+        where 1=1
+        <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+            and createTime between #{query.startTime} and #{query.endTime}
+        </if>
+          <if test="query.startMoney != null ">
+            and orderMoney between #{query.startMoney} and #{query.endMoney}
+        </if>
+        <if test="query.realName != null and query.realName != ''">
+            and `name` like concat('%',#{query.realName},'%')
+        </if>
+        <if test="query.storeId != null">
+            and storeId = #{query.storeId}
+        </if>
+        <if test="query.sysId != null">
+            and sysId = #{query.sysId}
+        </if>
+        <if test="query.userIds != null and query.userIds.size()>0">
+            AND userId IN
+            <foreach collection="query.userIds" close=")" open="(" item="id" separator=",">
+                #{id}
+            </foreach>
+        </if>
+          <if test="query.orderIds != null and query.orderIds.size()>0">
+            AND id IN
+            <foreach collection="query.orderIds" close=")" open="(" item="id" separator=",">
+                #{id}
+            </foreach>
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.7.1