From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 05 Apr 2021 22:48:14 +0800
Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
index 78a0c37..d6f7f20 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
@@ -7,6 +7,7 @@
<resultMap type="com.matrix.system.shopXcx.bean.ShopActivities" id="ShopActivitiesMap">
<id property="id" column="id" />
<result property="actName" column="act_name" />
+ <result property="actCode" column="act_code" />
<result property="actType" column="act_type" />
<result property="actBeginTime" column="act_begin_time" />
<result property="actEndTime" column="act_end_time" />
@@ -47,6 +48,7 @@
<resultMap type="com.matrix.system.shopXcx.bean.ShopActivities" id="ShopActivitiesSimpleMap">
<id property="id" column="id" />
<result property="actName" column="act_name" />
+ <result property="actCode" column="act_code" />
<result property="actType" column="act_type" />
<result property="actBeginTime" column="act_begin_time" />
<result property="actEndTime" column="act_end_time" />
@@ -386,4 +388,24 @@
</if>
</if>
</select>
+
+ <select id="findActivitiesList" resultType="com.matrix.system.activity.vo.ActivitiesListVo">
+ SELECT
+ *
+ FROM
+ shop_activities a
+ <where>
+ a.company_id=#{record.companyId}
+ <if test="record.hdzt != null and record.hdzt != ''">
+ and a.act_status=#{record.hdzt}
+ </if>
+ <if test="record.hdmc != null and record.hdmc != ''">
+ and a.act_name like concat('%',#{record.hdmc},'%')
+ </if>
+ </where>
+ <if test="record.sort !=null">
+ order by
+ a.${record.sort} ${record.order}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1