java/IgoTravel.git

			@@ -76,6 +76,7 @@
			<result column="oldState" property="oldState"/>
			<result column="telX" property="telX"/>
			<result column="bindId" property="bindId"/>
			<result column="driverPay" property="driverPay"/>
			</resultMap>


			@@ -413,6 +414,7 @@
			a.couponMoney as couponMoney,
			a.discount as discount,
			a.discountMoney as discountMoney,
			a.payType,
			a.payMoney as payMoney,
			a.reassignNotice as reassignNotice,
			a.oldState as oldState,
			@@ -425,7 +427,8 @@
			(
			(select count(id) from t_order_private_car where driverId = a.driverId and state in (7, 8, 9)) +
			(select count(id) from t_order_taxi where driverId = a.driverId and state in (7, 8, 9)) +
			(select count(id) from t_order_cross_city where driverId = a.driverId and state in (6, 8, 9))
			(select count(id) from t_order_cross_city where driverId = a.driverId and state in (6, 8, 9)) +
			(select count(id) from t_order_logistics where driverId = a.driverId and state in (6, 9))
			) as orderNum,
			b.phone as driverPhone,
			if(a.state = 12, (select money from t_order_cancel where orderId = a.id and orderType = 1 and state = 1 order by insertTime desc limit 0, 1), if(a.state = 10, (select money from t_order_cancel where orderId = a.id and orderType = 1 and state = 2 order by insertTime desc limit 0, 1), 0)) as cancelPayMoney,