java/TianMa.git

			@@ -37,7 +37,6 @@
			<result column="parkMoney" property="parkMoney"/>
			<result column="roadTollMoney" property="roadTollMoney"/>
			<result column="tipMoney" property="tipMoney"/>
			<result column="holidayFee" property="holidayFee"/>
			<result column="redPacketMoney" property="redPacketMoney"/>
			<result column="couponMoney" property="couponMoney"/>
			<result column="redPacketId" property="redPacketId"/>
			@@ -47,7 +46,6 @@
			<result column="activityId" property="activityId"/>
			<result column="companyId" property="companyId"/>
			<result column="payMoney" property="payMoney"/>
			<result column="thankYouFee" property="thankYouFee"/>
			<result column="substitute" property="substitute"/>
			<result column="passengers" property="passengers"/>
			<result column="passengersPhone" property="passengersPhone"/>
			@@ -61,6 +59,7 @@
			<result column="endServiceTime" property="endServiceTime"/>
			<result column="orderType" property="orderType"/>
			<result column="orderSource" property="orderSource"/>
			<result column="deviceCode" property="deviceCode"/>
			<result column="invoiceId" property="invoiceId"/>
			<result column="isReassign" property="isReassign"/>
			<result column="reassignNotice" property="reassignNotice"/>
			@@ -276,13 +275,13 @@
			a.endLat as endLat,
			a.orderMoney as orderMoney,
			a.payManner as payManner,
			a.thankYouFee,
			a.trackId as trackId,
			b.nickName as nickName,
			a.passengersPhone as phone,
			a.orderType as reservation,
			a.telX as telX,
			a.bindId as bindId,
			a.orderSource as orderSource,
			(
			(select count(id) from t_order_private_car where userId = b.id and state in (8, 9)) +
			(select count(id) from t_order_taxi where userId = b.id and state in (8, 9)) +