Merge branch 'master' of http://git.minpay.cc/shouhuobang/adm

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

@@ -96,47 +96,50 @@
 			SUM(zfSum) sellZfSum,
 			SUM(mfSum) sellMfSum,
 			IFNULL(SUM(wxSum), 0.00)+IFNULL(SUM(zfSum), 0.00) allSell,
-			VOI_EQUIPMENT_ID vciId
+			VEQ_MACHINE_NO vciId
 		FROM (
-			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VOI_EQUIPMENT_ID,
+			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
 				COUNT(1) allCount,
 				SUM(VOI_ORDER_AMT) wxSum,
 				'0' zfSum,
 				'0' mfSum
-			FROM vm_payment_inf, vm_order_inf
+			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'
-			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VOI_EQUIPMENT_ID
+			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 			UNION ALL
-			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VOI_EQUIPMENT_ID,
+			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
 				COUNT(1) allCount,
 				'0' wxSum,
 				SUM(VOI_ORDER_AMT) zfSum,
 				'0' mfSum
-			FROM vm_payment_inf, vm_order_inf
+			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'
-			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VOI_EQUIPMENT_ID
+			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 			UNION ALL
-			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VOI_EQUIPMENT_ID,
+			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
 				COUNT(1) allCount,
 				'0' wxSum,
 				'0' zfSum,
 				SUM(PIF_ORDERAMOUT) mfSum
-			FROM vm_payment_inf, vm_order_inf
+			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')
 			AND VOI_ORDER_AMT = '0.00'
-			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VOI_EQUIPMENT_ID
+			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 		) b
 		where 1=1
 		<if test="equNum != null and equNum != ''">
-			AND	VOI_EQUIPMENT_ID  = #{equNum,jdbcType=VARCHAR}
+			AND	VEQ_MACHINE_NO  = #{equNum,jdbcType=VARCHAR}
 		</if>
 		<if test="datesTime != null and datesTime != ''">
 			and succTime between substr((#{datesTime, jdbcType=VARCHAR}),1,8)