From 473c4e9cf23f9e43ae2f93c4da79b2204e34c3f8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 09 Mar 2021 11:50:48 +0800
Subject: [PATCH] 解决微信回调报错问题
---
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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..c74aeca 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"
@@ -366,6 +367,7 @@
select
a.id,
a.order_item_id,
+ d.id AS orderId,
a.use_total,
a.last_count,
a.real_money,
@@ -380,7 +382,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 +425,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 +524,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 != '' ">
@@ -616,4 +623,8 @@
</select>
+ <select id="selectHasValidMoneyCardUse" resultMap="MoneyCardUseSimpleMap">
+ select * from money_card_use
+ where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d') and STATUS='有效'
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1