From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml | 26 ++++++++++++++++++++++----
1 files changed, 22 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..d828613 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>
<!-- 批量删除 -->
@@ -618,13 +621,28 @@
group by b.id) t
</select>
+ <!-- 美度不显示赠送金额 IFNULL(sum(IFNULL(gift_money, 0)),0)+-->
<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(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>
+
+ <update id="saveInTimeReceiptWare">
+ <foreach collection="storeReceiptWares" item="wares" separator=";">
+ UPDATE money_card_use
+ <set>
+ <if test="wares.containsKey('createBy')">
+ order_item_id = if(#{wares.createBy}='',NULL,#{wares.createBy}),
+ </if>
+
+ </set>
+ WHERE id = #{wares.id}
+ </foreach>
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1