java/IgoTravel.git

			@@ -75,7 +75,7 @@
			select
			a.id as id,
			a.state as orderState,
			if(a.type = 4, '同城小件物流订单', '跨城小件物流订单') as orderName,
			if(a.type = 4, '市内小件物流订单', '跨城小件物流订单') as orderName,
			DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime,
			a.startAddress as startAddress,
			a.endAddress as endAddress,
			@@ -130,7 +130,8 @@
			c.remark as cancelRemark,
			c.money as cancelPayMoney,
			if(c.userType = 1, '用户取消', '平台取消') as cancelUser,
			(select isSpecialCar from t_sys_reformist where companyId = a.companyId) as reassign
			(select isSpecialCar from t_sys_reformist where companyId = a.companyId) as reassign,
			a.driverPay
			from t_order_logistics a
			left join t_user b on (a.userId = b.id)
			left join t_order_cancel c on (a.id = c.orderId and c.orderType = a.type and c.state = 2)
			@@ -142,7 +143,7 @@
			select
			id as id,
			type as type,
			if(type = 4, '同城小件物流订单', '跨城小件物流订单') as `name`,
			if(type = 4, '市内小件物流订单', '跨城小件物流订单') as `name`,
			DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as `time`,
			startAddress as startAddress,
			endAddress as endAddress,
			@@ -163,7 +164,7 @@
			select
			id as id,
			type as type,
			if(type = 4, '同城小件物流订单', '跨城小件物流订单') as `name`,
			if(type = 4, '市内小件物流订单', '跨城小件物流订单') as `name`,
			DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
			startAddress as startAddress,
			endAddress as endAddress,
			@@ -173,7 +174,8 @@
			orderMoney as orderMoney,
			payManner as payManner,
			UNIX_TIMESTAMP(travelTime) as travelTime,
			remark as remark
			remark as remark,
			driverPay
			from t_order_logistics where driverId = #{uid}
			<if test="state == 1">
			and state not in (1, 7)