~jiangyouyao/beauty-erp.git

			@@ -113,8 +113,8 @@
			<if test="type != null and type !='' ">
			type = #{type},
			</if>
			<if test="taotal != null and taotal !='' ">
			taotal = #{taotal},
			<if test="total != null and total !='' ">
			total = #{total},
			</if>
			<if test="times != null and times !='' ">
			times = #{times},
			@@ -331,6 +331,41 @@
			</if>
			</if>
			</select>

			<select id="selectForWxInPage" resultMap="MoneyCardUseFlowMap">
			select
			id,
			order_no,
			pay_no,
			content,
			create_time,
			type,
			total,
			times,
			gift_money,
			balance,
			(SELECT su_name from sys_users a WHERE operation_id=a.su_id) staffName
			from money_card_use_flow
			<where>
			and car_use_id=#{record.carUseId}
			<if test="record.queryTime!=null and record.queryTime!=''">
			and DATE_FORMAT(create_time,'%Y-%m')=#{record.queryTime}
			</if>
			<if test="record.revenueType==1">
			and total>0
			</if>
			<if test="record.revenueType==2">
			<![CDATA[ and total<0 ]]>
			</if>
			</where>
			order by create_time desc
			</select>

			<update id="updateVipCardId">
			update money_card_use_flow
			set car_use_id=#{cardId}
			where vip_id=#{vipId} and type='会员充值'
			</update>
			</mapper>