统计优化1

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

@@ -108,55 +108,58 @@
 		 		SUM(zfAmout) sumZFAmout, SUM(czAmout) sumCZAmout
 		FROM(
 			SELECT SUBSTR(vp.PIF_SUCCTIME, 1, 8) 	succtime,
-				vr.VCI_USER_Id 			branchId,
-				vr.VCI_EQUIPMENT_ID 		equNum,
-				SUM(vp.PIF_ORDERAMOUT)		allAmout,
+				vp.PIF_RCVCSTNO 			branchId,
+				ve.VEQ_MACHINE_NO 			equNum,
+				SUM(vd.VOD_AMOUNT)		allAmout,
 				SUM(vr.VCI_COST_PRICE)		costAmout,
-				SUM(vp.PIF_ORDERAMOUT)-SUM(vr.VCI_COST_PRICE)	proAmout,
-				SUM(vp.PIF_ORDERAMOUT)		wxAmout,
+				SUM(vd.VOD_AMOUNT)-SUM(vr.VCI_COST_PRICE)	proAmout,
+				SUM(vd.VOD_AMOUNT)		wxAmout,
 				'0.00'				zfAmout,
 				'0.00'				czAmout,
 				PIF_PAYTYPE			payType
-			FROM vm_payment_inf vp, vm_order_details vd, vm_pro_equ_rel vr
+			FROM vm_payment_inf vp, vm_order_details vd, vm_pro_equ_rel vr, vm_equipment_inf ve
 			WHERE vp.PIF_TRANFLOWNO = vd.VOD_ORDER_ID
 			AND vd.VOD_PRO_EQU_REL_ID = vr.VCI_ID
+			AND vr.VCI_ID = ve.VEQ_ID
 			AND vp.PIF_STATUS = '1'
 			AND vp.PIF_PAYTYPE = '91'
-			GROUP BY vr.VCI_USER_Id, SUBSTR(PIF_SUCCTIME, 1, 8), vr.VCI_EQUIPMENT_ID
+			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
 			UNION
 			SELECT SUBSTR(vp.PIF_SUCCTIME, 1, 8) 	succtime,
-				vr.VCI_USER_Id 			branchId,
-				vr.VCI_EQUIPMENT_ID 		equNum,
-				SUM(vp.PIF_ORDERAMOUT)		allAmout,
+				vp.PIF_RCVCSTNO			branchId,
+				ve.VEQ_MACHINE_NO 		equNum,
+				SUM(vd.VOD_AMOUNT)		allAmout,
 				SUM(vr.VCI_COST_PRICE)		costAmout,
-				SUM(vp.PIF_ORDERAMOUT)-SUM(vr.VCI_COST_PRICE)	proAmout,
+				SUM(vd.VOD_AMOUNT)-SUM(vr.VCI_COST_PRICE)	proAmout,
 				'0.00'				wxAmout,
-				SUM(vp.PIF_ORDERAMOUT)		zfAmout,
+				SUM(vd.VOD_AMOUNT)		zfAmout,
 				'0.00'				czAmout,
 				PIF_PAYTYPE			payType
-			FROM vm_payment_inf vp, vm_order_details vd, vm_pro_equ_rel vr
+			FROM vm_payment_inf vp, vm_order_details vd, vm_pro_equ_rel vr, vm_equipment_inf ve
 			WHERE vp.PIF_TRANFLOWNO = vd.VOD_ORDER_ID
 			AND vd.VOD_PRO_EQU_REL_ID = vr.VCI_ID
+			AND vr.VCI_ID = ve.VEQ_ID
 			AND vp.PIF_STATUS = '1'
 			AND vp.PIF_PAYTYPE = '92'
-			GROUP BY vr.VCI_USER_Id, SUBSTR(PIF_SUCCTIME, 1, 8), vr.VCI_EQUIPMENT_ID
+			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
 			UNION
 			SELECT SUBSTR(vp.PIF_SUCCTIME, 1, 8) 	succtime,
-				vr.VCI_USER_Id 			branchId,
-				vr.VCI_EQUIPMENT_ID 		equNum,
-				SUM(vp.PIF_ORDERAMOUT)		allAmout,
+				vp.PIF_RCVCSTNO 			branchId,
+				ve.VEQ_MACHINE_NO 		equNum,
+				SUM(vd.VOD_AMOUNT)		allAmout,
 				SUM(vr.VCI_COST_PRICE)		costAmout,
-				SUM(vp.PIF_ORDERAMOUT)-SUM(vr.VCI_COST_PRICE)	proAmout,
+				SUM(vd.VOD_AMOUNT)-SUM(vr.VCI_COST_PRICE)	proAmout,
 				'0.00'				wxAmout,
 				'0.00'				zfAmout,
-				SUM(vp.PIF_ORDERAMOUT)		czAmout,
+				SUM(vd.VOD_AMOUNT)		czAmout,
 				PIF_PAYTYPE			payType
-			FROM vm_payment_inf vp, vm_order_details vd, vm_pro_equ_rel vr
+			FROM vm_payment_inf vp, vm_order_details vd, vm_pro_equ_rel vr, vm_equipment_inf ve
 			WHERE vp.PIF_TRANFLOWNO = vd.VOD_ORDER_ID
 			AND vd.VOD_PRO_EQU_REL_ID = vr.VCI_ID
+			AND vr.VCI_ID = ve.VEQ_ID
 			AND vp.PIF_STATUS = '1'
 			AND vp.PIF_TYPE = '99'
-			GROUP BY vr.VCI_USER_Id, SUBSTR(PIF_SUCCTIME, 1, 8), vr.VCI_EQUIPMENT_ID
+			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
 		) vv
 		where 1=1
 		<if test="branchId != null and branchId != ''">
@@ -183,7 +186,7 @@
 		select IFNULL(CAST(SUM(PIF_ORDERAMOUT) AS DECIMAL(15,2)), 0.00)
 		from vm_payment_inf, vm_order_inf
 		where PIF_STATUS = '1'
-		and (PIF_PAYTYPE in ('91', '92') or PIF_TRANSTYPE = '00')
+		and (PIF_PAYTYPE in ('91', '92') or PIF_TRANSTYPE = '00' or PIF_TRANSTYPE = '10')
 		and PIF_TRANFLOWNO = VOI_ID
 		<if test="nowDate != null and nowDate != ''">
 				and substr(PIF_SUCCTIME,1,8) = #{nowDate,jdbcType=VARCHAR}