~jiangyouyao/beauty-erp.git

			@@ -10,13 +10,19 @@
			a.id id,
			b.nick_name nickName,
			a.receive_time reciveTime,
			a.state,
			c.cumulative_day cumulativeDay,
			c.award_type awardType,
			c.award_name awardName
			c.award_name awardName,
			c.coupon_name couponName,
			c.score_cnt scoreCnt,
			d.act_type actType,
			c.award_rule awardRule
			FROM
			activity_sign_receive_record a
			LEFT JOIN biz_user b ON a.open_id = b.open_id
			LEFT JOIN sys_vip_info b ON a.user_id = b.id
			LEFT JOIN activity_sign_award_set c ON a.award_id = c.id
			LEFT JOIN shop_activities d ON a.award_id = d.id
			<where>
			a.company_id = #{record.companyId}
			and a.activity_id = #{record.actId}
			@@ -76,4 +82,68 @@
			</if>
			</select>

			<select id="getSignAwardReceiveCount" resultType="int">
			SELECT
			count(a.id)
			FROM
			activity_sign_receive_record a
			LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
			where
			b.award_type = 1
			and a.company_id = #{companyId}
			and a.user_id = #{userId}

			</select>

			<select id="selectSignAwardList" resultType="com.matrix.system.shopXcx.api.vo.SignAwardListVo">
			SELECT
			a.id id,
			a.state state,
			1 total,
			a.receive_time receiveTime,
			b.award_way awardWay,
			b.introduce_img introduceImg,
			b.award_name awardName

			FROM
			activity_sign_receive_record a
			LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
			WHERE
			b.award_type = 1
			and a.company_id = #{record.companyId}
			and a.user_id = #{record.userId}
			<if test="record.sort !=null">
			order by
			a.${record.sort} ${record.order}
			</if>
			</select>

			<select id="selectSeeAwardTextVOById" resultType="com.matrix.system.shopXcx.api.vo.SeeAwardTextVo">
			SELECT
			a.id id,
			a.state state,
			a.consignee_phone consigneePhone,
			a.consignee_address consigneeAddress,
			a.consignee,
			a.receive_time receiveTime,
			a.write_off_code writeOffCode,
			1 total,
			b.wechat_img wechatImg,
			b.prize_address prizeAddress,
			b.operation_tip operationTip,
			b.prize_end_time prizeEndTime,
			b.prize_start_time prizeStartTime,
			b.award_way awardWay,
			b.introduce_img introduceImg,
			b.customer_phone customerPhone,
			b.award_name awardName
			FROM
			activity_sign_receive_record a
			LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
			WHERE
			a.id = #{record.awardId}
			and a.company_id = #{record.companyId}
			and a.user_id = #{record.userId}
			</select>

			</mapper>