From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距,和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index 9e9eed3..7bdfec4 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -63,7 +63,8 @@
 		beatuyName,
 		pay_time,
 		company_id,
-		orderType
+		orderType,
+        is_has_refund
 		)
 		VALUES (
 		#{id},
@@ -86,7 +87,8 @@
 		#{beatuyName},
 		#{payTime},
 		#{companyId},
-		#{orderType}
+		#{orderType},
+		#{isHasRefund}
 		)
 	</insert>
 
@@ -143,10 +145,12 @@
             <if test="cashPay != null and cashPay  !='' ">
                 cash_Pay = #{cashPay},
             </if>
-
             <if test="payTime != null  ">
                 pay_time = #{payTime},
             </if>
+            <if test="isHasRefund != null  ">
+                is_has_refund = #{isHasRefund},
+            </if>
 
         </set>
         WHERE id=#{id}

--
Gitblit v1.9.1