From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 09 Oct 2022 21:41:13 +0800
Subject: [PATCH] Merge branch 'score_shop'
---
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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 b03d791..d828613 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml
@@ -20,6 +20,7 @@
<result property="isVipCar" column="is_vip_car"/>
<result property="remark" column="remark"/>
<result property="cardName" column="card_name"/>
+ <result property="orderId" column="orderId"/>
<!-- 对应会员信息 -->
<association property="vipInfo" javaType="SysVipInfo"
@@ -139,6 +140,9 @@
</if>
</set>
WHERE id=#{id}
+ </update>
+ <update id="updateId">
+ update money_card_use set id=#{newId} where id=#{id}
</update>
@@ -366,6 +370,7 @@
select
a.id,
a.order_item_id,
+ d.id AS orderId,
a.use_total,
a.last_count,
a.real_money,
@@ -380,7 +385,10 @@
a.remark,
a.card_name
from money_card_use a
- where vip_id = #{record.vipId}
+ left join shopping_goods b on a.goods_id=b.id
+ left join sys_order_item c on a.ORDER_ITEM_ID=c.id
+ left join sys_order d on c.ORDER_ID=d.id
+ where a.vip_id = #{record.vipId}
<if test="record!=null">
<if test="record.orderItemId != null and record.orderItemId !='' ">
and a.order_item_id = #{record.orderItemId}
@@ -420,7 +428,9 @@
select count(*)
from money_card_use a
left join shopping_goods b on a.goods_id=b.id
- where vip_id = #{record.vipId}
+ left join sys_order_item c on a.ORDER_ITEM_ID=c.id
+ left join sys_order d on c.ORDER_ID=d.id
+ where a.vip_id = #{record.vipId}
<if test="record!=null">
<if test="record.orderItemId != null and record.orderItemId !='' ">
and a.order_item_id = #{record.orderItemId}
@@ -517,9 +527,9 @@
and c.shop_id =#{shopId}
</if>
<if test="vipQueryKey != null and vipQueryKey != '' ">
- and e.VIP_NAME like concat('%',#{vipQueryKey},'%')
- or (e.VIP_NO like concat('%',#{vipQueryKey},'%')
- or e.PHONE like concat('%',#{vipQueryKey},'%')
+ and c.VIP_NAME like concat('%',#{vipQueryKey},'%')
+ or (c.VIP_NO like concat('%',#{vipQueryKey},'%')
+ or c.PHONE like concat('%',#{vipQueryKey},'%')
)
</if>
<if test="goodsName != null and goodsName != '' ">
@@ -611,9 +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>
+ <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='有效'
+ </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