排序了

src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -3,24 +3,25 @@
 <mapper namespace="com.minpay.db.table.own.mapper.OrderManageMapper">
 
 	<select id="selectOrderDetail" resultType="hashmap" parameterType="java.util.Map">
-	    SELECT
-		d.VOI_ID  				"orderNo",
+		SELECT
+		d.VOI_ID				"orderNo",
 		o.VOD_PRODUCT_ID 		"productId",
 		o.VOD_PRO_NAME 			"productName",
 		p.VCI_NAME 				"userName",
 		o.VOD_PRO_EQU_REL_ID 		"equrelId",
 		r.VCI_EQUIPMENT_ID 		"machineNo",
-		d.VOI_ORDER_AMT 		"orderAmt",
-		d.VOI_CREATE_TIME 		"createTime",
-		d.VOI_PICKUP_NO 		"pickupNo",
-		d.VOI_PICKUP_TIME 		"pickUpTime",
-		d.VOI_PICKUP_STT 		"stt",
+		o.VOD_AMOUNT 		"orderAmt",
+		o.VOD_CREATE_TIME 		"createTime",
+		o.VOD_DELIVERY_ID 		"pickupNo",
+		o.VOD_PICKUP_TIME 		"pickUpTime",
+		o.VOD_IS_DELIVERY 		"stt",
 		r.VCI_SALL_PRICE 		"sallPrice",
 		r.VCI_GAME_PRICE 		"gamePrice",
 		r.VCI_COST_PRICE 		"costPrice",
 		e.VEQ_IMEI_ADDR 		"imeiAddr",
-		r.VCI_AISLE 			"aisle"
-	    FROM vm_order_details o,vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p,vm_equipment_inf e
+		r.VCI_AISLE 			"aisle",
+		o.VOD_DETAILS_ID 		"detailsId"
+		FROM vm_order_details o,vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p,vm_equipment_inf e
 		where o.VOD_PRO_EQU_REL_ID = r.VCI_ID
 		and d.VOI_PERSON_ID = p.VCI_ID
 		and o.VOD_ORDER_ID = d.VOI_ID
@@ -28,31 +29,29 @@
 		<if test="branchId != null and branchId != ''">
 			and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
 		</if>
-    	<if test="pickupNo != null and pickupNo != ''">
-			AND	 d.VOI_PICKUP_NO  = #{pickupNo,jdbcType=VARCHAR}
+		<if test="pickUpCode != null and pickUpCode != ''">
+			AND	 o.VOD_DELIVERY_ID  = #{pickUpCode,jdbcType=VARCHAR}
 		</if>
 		<if test="pickUpState != null and pickUpState != ''">
-			AND	 d.VOI_PICKUP_STT  = #{pickUpState,jdbcType=VARCHAR}
+			AND	 o.VOD_IS_DELIVERY  = #{pickUpState,jdbcType=VARCHAR}
 		</if>
 		<if test="machineNo != null and machineNo != ''">
-			AND	 r.VCI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
+			AND	 e.VEQ_IMEI_ADDR  = #{machineNo,jdbcType=VARCHAR}
 		</if>
 		<if test="equrelId != null and equrelId != ''">
-			AND	 o.VOD_PRO_EQU_REL_ID  = #{equrelId,jdbcType=VARCHAR}
+			AND	 r.VCI_AISLE  = #{equrelId,jdbcType=VARCHAR}
 		</if>
 		<if test="creatdDtes != null and creatdDtes != ''">
-			and substr(VOI_CREATE_TIME,1,8) between substr((#{creatdDtes, jdbcType=VARCHAR}),1,8)
+			and substr(VOD_CREATE_TIME,1,8) between substr((#{creatdDtes, jdbcType=VARCHAR}),1,8)
 			and substr((#{creatdDtes, jdbcType=VARCHAR}),12,19)
 		</if>
 		<if test="pickUpDates != null and pickUpDates != ''">
-			and substr(VOI_PICKUP_TIME,1,8) between substr((#{pickUpDates, jdbcType=VARCHAR}),1,8)
+			and substr(VOD_PICKUP_TIME,1,8) between substr((#{pickUpDates, jdbcType=VARCHAR}),1,8)
 			and substr((#{pickUpDates, jdbcType=VARCHAR}),12,19)
 		</if>
 		and VCI_EXEIT_STATE = "00"
 		and VOI_STATE = "00"
 		and VCI_STATUS = "00"
-		and VOI_IS_DRAW = "01"
-		and VOI_PICKUP_STT in ("00", "01")
 		order by d.VOI_CREATE_TIME desc
 	</select>
 	<select id="selectPickupRecord" resultType="hashmap" parameterType="java.util.Map">
@@ -60,17 +59,18 @@
 		oi.VOI_EQUIPMENT_ID 	"machineNo",
 		oi.VOI_ID 				"orderNo",
 		di.VDI_STATUS 			"stt",
-		oi.VOI_PICKUP_TIME 		"pickUpDates",
+		od.VOD_PICKUP_TIME 		"pickUpDates",
 		od.VOD_PRO_NAME 		"productName",
 		od.VOD_PRO_EQU_REL_ID 	"equrelId",
-		oi.VOI_PICKUP_NO 		"pickupNo",
+		di.VDI_DELIVERY_ID 		"pickupNo",
 		p.VCI_ID				"vciId",
 		p.VCI_NAME 				"userName",
 		r.VCI_SALL_PRICE 		"sallPrice",
 		r.VCI_GAME_PRICE 		"gamePrice",
 		r.VCI_COST_PRICE 		"costPrice",
 		e.VEQ_IMEI_ADDR 		"imeiAddr",
-		r.VCI_AISLE 			"aisle"
+		r.VCI_AISLE 			"aisle",
+		od.VOD_DETAILS_ID 		"detailsId"
 		from vm_delivery_inf di, vm_order_details od, vm_order_inf oi, vm_person_inf p, vm_pro_equ_rel r,vm_equipment_inf e
 		where di.VDI_ORD_DET_ID = od.VOD_DETAILS_ID
 		and VOD_ORDER_ID = oi.VOI_ID
@@ -79,102 +79,102 @@
 		and r.VCI_EQUIPMENT_ID = e.VEQ_ID
 		and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
 		<if test="machineNo != null and machineNo != ''">
-			AND	oi.VOI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
+			AND	e.VEQ_IMEI_ADDR  = #{machineNo,jdbcType=VARCHAR}
 		</if>
 		<if test="orderNo != null and orderNo != ''">
-			AND	oi.VOI_ID  = #{orderNo,jdbcType=VARCHAR}
+			AND	od.VOD_DETAILS_ID  = #{orderNo,jdbcType=VARCHAR}
 		</if>
 		<if test="equrelId != null and equrelId != ''">
-			AND	od.VOD_PRO_EQU_REL_ID  = #{equrelId,jdbcType=VARCHAR}
+			AND	r.VCI_AISLE   = #{equrelId,jdbcType=VARCHAR}
 		</if>
 		<if test="vciId != null and vciId != ''">
 			AND	p.VCI_ID  = #{vciId,jdbcType=VARCHAR}
 		</if>
 		<if test="pickupNo != null and pickupNo != ''">
-			AND	oi.VOI_PICKUP_NO  = #{pickupNo,jdbcType=VARCHAR}
+			AND	di.VDI_DELIVERY_ID  = #{pickupNo,jdbcType=VARCHAR}
 		</if>
 		<if test="pickUpDates != null and pickUpDates != ''">
-			and substr(VOI_PICKUP_TIME,1,8) between substr((#{pickUpDates, jdbcType=VARCHAR}),1,8)
+			and substr(VOD_PICKUP_TIME,1,8) between substr((#{pickUpDates, jdbcType=VARCHAR}),1,8)
 			and substr((#{pickUpDates, jdbcType=VARCHAR}),12,19)
 		</if>
 	</select>
 
 	<select id="selectIncomeDetail" resultType="hashmap" parameterType="java.util.Map">
 		SELECT succTime sellTime,
-			ROUND(SUM(allCount),2) newCount,
-			ROUND(SUM(wxSum),2) sellWxSum,
-			ROUND(SUM(zfSum),2) sellZfSum,
-			ROUND(SUM(yeSum),2) sellYESum,
-			ROUND(SUM(mfSum),2)  sellMfSum,
-			ROUND(IFNULL(SUM(wxSum), 0.00) + IFNULL(SUM(zfSum), 0.00) +  IFNULL(SUM(yeSum), 0.00),2)  allSell,
-			VEQ_MACHINE_NO vciId
+		ROUND(SUM(allCount),2) newCount,
+		ROUND(SUM(wxSum),2) sellWxSum,
+		ROUND(SUM(zfSum),2) sellZfSum,
+		ROUND(SUM(yeSum),2) sellYESum,
+		ROUND(SUM(mfSum),2)  sellMfSum,
+		ROUND(IFNULL(SUM(wxSum), 0.00) + IFNULL(SUM(zfSum), 0.00) +  IFNULL(SUM(yeSum), 0.00),2)  allSell,
+		VEQ_MACHINE_NO vciId
 		FROM (
-			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
-				COUNT(1) allCount,
-				SUM(VOI_ORDER_AMT) wxSum,
-				'0' zfSum,
-				'0' yeSum,
-				'0' mfSum
-			FROM vm_payment_inf, vm_order_inf,vm_equipment_inf
-			WHERE PIF_STATUS = '1'
-			AND VOI_ID = PIF_TRANFLOWNO
-			AND VOI_EQUIPMENT_ID = VEQ_ID
-			AND PIF_PAYTYPE IN ('91')
-			AND VOI_ORDER_AMT != '0.00'
-			<if test="branchId != null and branchId != ''">
-				AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
-			</if>
-			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
-			UNION ALL
-			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
-				COUNT(1) allCount,
-				'0' wxSum,
-				SUM(VOI_ORDER_AMT) zfSum,
-				'0' yeSum,
-				'0' mfSum
-			FROM vm_payment_inf, vm_order_inf,vm_equipment_inf
-			WHERE PIF_STATUS = '1'
-			AND VOI_ID = PIF_TRANFLOWNO
-			AND VOI_EQUIPMENT_ID = VEQ_ID
-			AND PIF_PAYTYPE IN ('92')
-			AND VOI_ORDER_AMT != '0.00'
-			<if test="branchId != null and branchId != ''">
-				AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
-			</if>
-			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
-			UNION ALL
+		SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
+		COUNT(1) allCount,
+		SUM(VOI_ORDER_AMT) wxSum,
+		'0' zfSum,
+		'0' yeSum,
+		'0' mfSum
+		FROM vm_payment_inf, vm_order_inf,vm_equipment_inf
+		WHERE PIF_STATUS = '1'
+		AND VOI_ID = PIF_TRANFLOWNO
+		AND VOI_EQUIPMENT_ID = VEQ_ID
+		AND PIF_PAYTYPE IN ('91')
+		AND VOI_ORDER_AMT != '0.00'
+		<if test="branchId != null and branchId != ''">
+			AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
+		</if>
+		GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
+		UNION ALL
+		SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
+		COUNT(1) allCount,
+		'0' wxSum,
+		SUM(VOI_ORDER_AMT) zfSum,
+		'0' yeSum,
+		'0' mfSum
+		FROM vm_payment_inf, vm_order_inf,vm_equipment_inf
+		WHERE PIF_STATUS = '1'
+		AND VOI_ID = PIF_TRANFLOWNO
+		AND VOI_EQUIPMENT_ID = VEQ_ID
+		AND PIF_PAYTYPE IN ('92')
+		AND VOI_ORDER_AMT != '0.00'
+		<if test="branchId != null and branchId != ''">
+			AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
+		</if>
+		GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
+		UNION ALL
 
-			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
-			COUNT(1) allCount,
-			'0' wxSum,
-			 '0' zfSum,
+		SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
+		COUNT(1) allCount,
+		'0' wxSum,
+		'0' zfSum,
 		SUM(VOI_ORDER_AMT) yeSum,
 		'0' mfSum
-			FROM vm_payment_inf, vm_order_inf,vm_equipment_inf
-			WHERE PIF_STATUS = '1'
-			AND VOI_ID = PIF_TRANFLOWNO
-			AND VOI_EQUIPMENT_ID = VEQ_ID
-			AND PIF_PAYTYPE IN ('93')
-			AND VOI_ORDER_AMT != '0.00'
-			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
+		FROM vm_payment_inf, vm_order_inf,vm_equipment_inf
+		WHERE PIF_STATUS = '1'
+		AND VOI_ID = PIF_TRANFLOWNO
+		AND VOI_EQUIPMENT_ID = VEQ_ID
+		AND PIF_PAYTYPE IN ('93')
+		AND VOI_ORDER_AMT != '0.00'
+		GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 
-			UNION ALL
-			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
-				COUNT(1) allCount,
-				'0' wxSum,
-				'0' zfSum,
-				'0' yeSum,
-				SUM(PIF_ORDERAMOUT) mfSum
-			FROM vm_payment_inf, vm_order_inf,vm_equipment_inf
-			WHERE PIF_STATUS = '1'
-			AND VOI_ID = PIF_TRANFLOWNO
-			AND VOI_EQUIPMENT_ID = VEQ_ID
-			AND PIF_PAYTYPE IN ('91', '92','93')
-			AND VOI_ORDER_AMT = '0.00'
-			<if test="branchId != null and branchId != ''">
-				AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
-			</if>
-			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
+		UNION ALL
+		SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
+		COUNT(1) allCount,
+		'0' wxSum,
+		'0' zfSum,
+		'0' yeSum,
+		SUM(PIF_ORDERAMOUT) mfSum
+		FROM vm_payment_inf, vm_order_inf,vm_equipment_inf
+		WHERE PIF_STATUS = '1'
+		AND VOI_ID = PIF_TRANFLOWNO
+		AND VOI_EQUIPMENT_ID = VEQ_ID
+		AND PIF_PAYTYPE IN ('91', '92','93')
+		AND VOI_ORDER_AMT = '0.00'
+		<if test="branchId != null and branchId != ''">
+			AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
+		</if>
+		GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 		) b
 		where 1=1
 		<if test="equNum != null and equNum != ''">
@@ -190,13 +190,13 @@
 		GROUP BY succTime, vciId
 		ORDER BY succTime DESC, vciId DESC
 	</select>
-<!--	总订单数-->
+	<!--	总订单数-->
 	<select id="selectCountOrderNum" resultType="java.lang.String" parameterType="java.util.Map">
 		SELECT COUNT(1)
 		FROM vm_order_inf
 		WHERE VOI_STATE = '00'
 	</select>
-<!--	累计收入-->
+	<!--	累计收入-->
 	<select id="selectCountIncome" resultType="java.lang.String" parameterType="java.util.Map">
 		select IFNULL(CAST(SUM(PIF_ORDERAMOUT) AS DECIMAL(15,2)), 0.00)
 		from vm_payment_inf