From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml | 91 +++++++++++++++++----------------------------
1 files changed, 35 insertions(+), 56 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml
index 9f60550..6d8b000 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml
@@ -3,61 +3,40 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.matrix.system.activity.dao.ActivitySignAwardSetDao">
- <!-- 定义ActivitySignAwardSet 的复杂关联map -->
- <resultMap type="com.matrix.system.activity.entity.ActivitySignAwardSet" id="ActivitySignAwardSetMap">
- <id property="id" column="id" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="awardType" column="award_type" />
- <result property="awardRule" column="award_rule" />
- <result property="cumulativeDay" column="cumulative_day" />
- <result property="awardName" column="award_name" />
- <result property="introduceImg" column="introduce_img" />
- <result property="introduceTip" column="introduce_tip" />
- <result property="awardInventoryCnt" column="award_inventory_cnt" />
- <result property="awardDistributeCnt" column="award_distribute_cnt" />
- <result property="awardWay" column="award_way" />
- <result property="operationTip" column="operation_tip" />
- <result property="prizeAddress" column="prize_address" />
- <result property="prizeStartTime" column="prize_start_time" />
- <result property="prizeEndTime" column="prize_end_time" />
- <result property="wechatImg" column="wechat_img" />
- <result property="scoreCnt" column="score_cnt" />
- <result property="couponId" column="coupon_id" />
- <result property="goodsId" column="goods_id" />
- <result property="activityId" column="activity_id" />
- <result property="companyId" column="company_id" />
- </resultMap>
-
-
- <!-- 定义ActivitySignAwardSet 的简单map ，本map不添加其他的关联属性 -->
- <resultMap type="com.matrix.system.activity.entity.ActivitySignAwardSet" id="ActivitySignAwardSetSimpleMap">
- <id property="id" column="id" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="awardType" column="award_type" />
- <result property="awardRule" column="award_rule" />
- <result property="cumulativeDay" column="cumulative_day" />
- <result property="awardName" column="award_name" />
- <result property="introduceImg" column="introduce_img" />
- <result property="introduceTip" column="introduce_tip" />
- <result property="awardInventoryCnt" column="award_inventory_cnt" />
- <result property="awardDistributeCnt" column="award_distribute_cnt" />
- <result property="awardType" column="award_type" />
- <result property="operationTip" column="operation_tip" />
- <result property="prizeAddress" column="prize_address" />
- <result property="prizeStartTime" column="prize_start_time" />
- <result property="prizeEndTime" column="prize_end_time" />
- <result property="wechatImg" column="wechat_img" />
- <result property="scoreCnt" column="score_cnt" />
- <result property="couponId" column="coupon_id" />
- <result property="goodsId" column="goods_id" />
- <result property="activityId" column="activity_id" />
- <result property="companyId" column="company_id" />
- </resultMap>
+
+ <select id="selectListByActIDAndCompanyId" resultType="com.matrix.system.shopXcx.api.vo.ActivitySignAwardSetVo">
+ SELECT
+ *
+ FROM
+ activity_sign_award_set a
+ where
+ a.activity_id = #{actId}
+ and a.company_id = #{companyId}
+ and a.award_state = #{awardState}
+ </select>
+
+ <select id="selectListByActIDAndCompanyIdAndAwardType" resultType="com.matrix.system.shopXcx.api.vo.ActivitySignAwardSetVo">
+ SELECT
+ *
+ FROM
+ activity_sign_award_set a
+ where
+ a.activity_id = #{actId}
+ and a.company_id = #{companyId}
+ and a.award_state = #{awardState}
+ and a.award_rule = #{awardRule}
+ </select>
+
+ <select id="selectActivitySignAwardSetByActIDAndCompanyIdAndAwardType" resultType="com.matrix.system.activity.entity.ActivitySignAwardSet">
+ SELECT
+ *
+ FROM
+ activity_sign_award_set a
+ where
+ a.activity_id = #{actId}
+ and a.company_id = #{companyId}
+ and a.award_state = #{awardState}
+ and a.award_rule = #{awardRule}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1