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/MoneyCardUseDao.xml | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml index c74aeca..0d608c5 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml @@ -141,6 +141,9 @@ </set> WHERE id=#{id} </update> + <update id="updateId"> + update money_card_use set id=#{newId} where id=#{id} + </update> <!-- 批量删除 --> @@ -619,12 +622,12 @@ </select> <select id="selectVipCardTotalMoney" resultType="java.lang.Double"> - SELECT TRUNCATE( SUM(gift_money)+SUM(real_money) ,2 ) from money_card_use where vip_id=#{vipId} and `status` ='有效' + SELECT IFNULL(sum(IFNULL(gift_money, 0)),0)+ IFNULL(sum(IFNULL(real_money, 0)),0) from money_card_use where vip_id=#{vipId} and `status` ='有效' </select> - <select id="selectHasValidMoneyCardUse" resultMap="MoneyCardUseSimpleMap"> - select * from money_card_use + <update id="updateInvalidMoneyCardUse"> + update money_card_use set STATUS='无效' where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d') and STATUS='有效' - </select> + </update> </mapper> \ No newline at end of file -- Gitblit v1.9.1