From ff1be70b35a043a42ef7471c3ed9f10a9a736db0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 一月 2025 14:33:04 +0800
Subject: [PATCH] bug修改
---
manage/src/main/resources/mapping/TOrderMapper.xml | 90 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/manage/src/main/resources/mapping/TOrderMapper.xml b/manage/src/main/resources/mapping/TOrderMapper.xml
index 90dfe9b..750e168 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" />
@@ -37,11 +36,96 @@
<result column="isAccounting" property="isAccounting" />
<result column="accountingName" property="accountingName" />
<result column="accountingTime" property="accountingTime" />
+ <result column="phone" property="phone" />
+ <result column="realName" property="realName" />
+ <result column="age" property="age" />
+ <result column="gender" property="gender" />
+ <result column="payTypeName" property="payTypeName" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, code, userId, optometryId, storeId, modelId, 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
+ 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.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
+ from t_order o
+ left join sec_user su on o.sysId = su.id
+ 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 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
+ from t_order o
+ left join t_order_goods tog on o.id = tog.orderId
+ where 1=1
+ <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+ and o.createTime between #{query.startTime} and #{query.endTime}
+ </if>
+ <if test="query.startMoney != null ">
+ and o.orderMoney between #{query.startMoney} and #{query.endMoney}
+ </if>
+ <if test="query.realName != null and query.realName != ''">
+ and o.realName like concat('%',#{query.realName},'%')
+ </if>
+ <if test="query.wxName != null and query.wxName != ''">
+ and o.`name` like concat('%',#{query.wxName},'%')
+ </if>
+ <if test="query.phone != null and query.phone != ''">
+ and o.phone like concat('%',#{query.phone},'%')
+ </if>
+ <if test="query.brandFrame != null and query.brandFrame != ''">
+ and tog.brandName = #{query.brandFrame}
+ </if>
+ <if test="query.modelName != null and query.modelName != ''">
+ and tog.modelName = #{query.modelName}
+ </if>
+ <if test="query.color != null and query.color != ''">
+ and tog.color = #{query.color}
+ </if>
+ <if test="query.brandLens != null and query.brandLens != ''">
+ and tog.brandName = #{query.brandLens}
+ </if>
+ <if test="query.series != null and query.series != ''">
+ and tog.seriesName = #{query.series}
+ </if>
+ <if test="query.type != null">
+ and tog.type = #{query.type}
+ </if>
+ <if test="query.refractiveIndex != null and query.refractiveIndex != ''">
+ and tog.refractiveIndex = #{query.refractiveIndex}
+ </if>
+ <if test="query.storeId != null">
+ and o.storeId = #{query.storeId}
+ </if>
+ <if test="query.sysId != null">
+ and o.sysId = #{query.sysId}
+ </if>
+ <if test="query.userId != null">
+ and o.userId = #{query.userId}
+ </if>
+ <if test="query.userIds != null and query.userIds.size()>0">
+ AND o.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 o.id IN
+ <foreach collection="query.orderIds" close=")" open="(" item="id" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ group by o.id
+ order by o.createTime desc
+ </select>
</mapper>
--
Gitblit v1.7.1