fanli-server.git

			@@ -65,7 +65,7 @@
			FROM (SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho
			LEFT JOIN (
			SELECT * FROM yeshi_ec_hongbao_v2 v2
			WHERE v2.`hb_uid`= ${uid} AND (v2.`hb_type` = 1 OR v2.`hb_type` = 2)
			WHERE v2.`hb_uid`= ${uid} and v2.hb_state!=4 AND (v2.`hb_type` = 1 OR v2.`hb_type` = 2)
			) hb ON hb.hb_id=ho.`ho_hongbao_id` <!-- 自购订单 -->
			LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
			WHERE hb.hb_id IS NOT NULL
			@@ -95,11 +95,11 @@
			FROM (SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho
			LEFT JOIN (
			SELECT * FROM yeshi_ec_hongbao_v2 v2
			WHERE v2.`hb_uid`= ${uid} AND v2.`hb_type` = 20
			WHERE v2.`hb_uid`= ${uid} AND v2.`hb_type` = 20 and v2.hb_state!=4
			) hb ON hb.hb_id=ho.`ho_hongbao_id` <!-- 分享订单 -->

			LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
			WHERE hb.hb_id IS NOT NULL
			WHERE hb.hb_id IS NOT NULL and hb.hb_state!=4
			<if test="state != null">
			AND co.`co_state` = ${state}
			</if>
			@@ -128,10 +128,10 @@
			SELECT * FROM yeshi_ec_hongbao_v2 v2
			WHERE v2.`hb_uid`= ${uid}
			AND (v2.`hb_type` = 5 OR v2.`hb_type` = 6 OR v2.`hb_type` = 7
			OR v2.`hb_type` = 21 OR v2.`hb_type` = 22 )
			OR v2.`hb_type` = 21 OR v2.`hb_type` = 22 ) and v2.hb_state!=4
			) hbp ON hbp.hb_pid=ho.`ho_hongbao_id`
			LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
			WHERE hbp.hb_id IS NOT NULL
			WHERE hbp.hb_id IS NOT NULL and hbp.hb_state!=4
			<if test="state != null">
			AND co.`co_state` = ${state}
			</if>
			@@ -169,4 +169,11 @@
			WHERE co.`co_order_no` = #{orderNo}
			</select>

			<select id="countValidOrderByDate" resultType="Long">
			SELECT IFNULL(COUNT(co.`co_id`),0) FROM yeshi_ec_common_order co
			LEFT JOIN yeshi_ec_hongbao_order ho ON co.`co_id`=ho.`ho_order_id`
			LEFT JOIN yeshi_ec_hongbao_v2 v2 ON v2.hb_id=ho.`ho_hongbao_id`
			WHERE co.`co_uid` = #{uid} AND v2.`hb_type` = 1 AND v2.`hb_state` = 3
			AND co.`co_third_create_time` > #{dateTime}
			</select>
			</mapper>