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/xcxShop/ShopDeliveryInfoDao.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml
index fecc71b..0a9cbab 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml
@@ -65,6 +65,7 @@
logistics_status,
delivery_time,
pick_up_status,
+ receive_id,
shop_id
</sql>
@@ -87,6 +88,7 @@
#{item.logisticsStatus},
#{item.deliveryTime},
#{item.pickUpStatus},
+ #{item.receiveId},
#{item.shopId}
</sql>
@@ -239,6 +241,9 @@
<if test="record.orderId != null ">
order_id = #{record.orderId},
</if>
+ <if test="record.receiveId != null ">
+ receive_id = #{record.receiveId},
+ </if>
<if test="record.userId != null and record.userId != '' ">
user_id = #{record.userId},
</if>
--
Gitblit v1.9.1