java/zhihuishenqu.git

			@@ -128,6 +128,7 @@
			cbco.receiving_region,
			cbco.receiving_address,
			su.phone,
			su.nick_name as nickName,
			cbc.`name` as commodityName,
			cbcs.`images` as commodityImages,
			cbcs.`name` as specsName
			@@ -170,6 +171,9 @@
			</if>
			<if test="dto.payType != null">
			and cbco.pay_type = #{dto.payType}
			</if>
			<if test="dto.isApplets != null and dto.isApplets == 1">
			and cbco.status in (2,3,4)
			</if>
			<if test="dto.payNo != null and dto.payNo != ''">
			and cbco.pay_no = #{dto.payNo}
			@@ -267,5 +271,16 @@
			order by cbco.create_at desc
			</select>

			<select id="queryTeamIdByUserId" resultType="com.panzhihua.common.model.vos.common.ComBatteryActivityTeamVo">
			select id as teamId,create_at as teamEndTime from com_battery_commodity_order_collage_team
			where activity_id = #{activityId} and user_id = #{userId} and status = 1
			</select>

			<select id="queryTeamIdByUserIdBargain" resultType="com.panzhihua.common.model.vos.common.ComBatteryActivityTeamVo">
			select cbcob.id as teamId,cbcob.create_at as teamEndTime from com_battery_commodity_order_bargain as cbcob
			left join com_battery_commodity_order as cbco on cbco.id = cbcob.order_id
			where cbcob.user_id = #{userId} and cbcob.activity_id = #{activityId} and cbco.bargain_status = 1
			</select>

			</mapper>