From d69ee0edbb5df260ac6b872357b88499d7914610 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 09:08:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/resources/mapping/TOrderMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/resources/mapping/TOrderMapper.xml b/manage/src/main/resources/mapping/TOrderMapper.xml
index d1a16f5..0675f48 100644
--- a/manage/src/main/resources/mapping/TOrderMapper.xml
+++ b/manage/src/main/resources/mapping/TOrderMapper.xml
@@ -51,7 +51,7 @@
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 +60,7 @@
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
--
Gitblit v1.7.1