wanglm 4 years ago
parent
commit
0cea8e4e7e

+ 58 - 0
src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -163,6 +163,63 @@
 			AND vp.PIF_TYPE = '99'
 			AND VOD_IS_WINNING != '00'
 			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
+			UNION
+			SELECT SUBSTR(vp.PIF_SUCCTIME, 1, 8) 	succtime,
+			vp.PIF_RCVCSTNO 			branchId,
+			ve.VEQ_MACHINE_NO 			equNum,
+			SUM(vd.VOD_AMOUNT)		allAmout,
+			'0.00'					costAmout,
+			SUM(vd.VOD_AMOUNT)		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, 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_EQUIPMENT_ID = ve.VEQ_ID
+			AND vp.PIF_STATUS = '1'
+			AND vp.PIF_PAYTYPE = '91'
+			AND VOD_IS_WINNING = '00'
+			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
+			UNION
+			SELECT SUBSTR(vp.PIF_SUCCTIME, 1, 8) 	succtime,
+			vp.PIF_RCVCSTNO			branchId,
+			ve.VEQ_MACHINE_NO 		equNum,
+			SUM(vd.VOD_AMOUNT)		allAmout,
+			'0.00'					costAmout,
+			SUM(vd.VOD_AMOUNT)		proAmout,
+			'0.00'				wxAmout,
+			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, 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_EQUIPMENT_ID = ve.VEQ_ID
+			AND vp.PIF_STATUS = '1'
+			AND vp.PIF_PAYTYPE = '92'
+			AND VOD_IS_WINNING = '00'
+			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
+			UNION
+			SELECT SUBSTR(vp.PIF_SUCCTIME, 1, 8) 	succtime,
+			vp.PIF_RCVCSTNO 			branchId,
+			ve.VEQ_MACHINE_NO 		equNum,
+			SUM(vd.VOD_AMOUNT)		allAmout,
+			'0.00'					costAmout,
+			SUM(vd.VOD_AMOUNT)		proAmout,
+			'0.00'				wxAmout,
+			'0.00'				zfAmout,
+			SUM(vd.VOD_AMOUNT)		czAmout,
+			PIF_PAYTYPE			payType
+			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_EQUIPMENT_ID = ve.VEQ_ID
+			AND vp.PIF_STATUS = '1'
+			AND vp.PIF_TYPE = '99'
+			AND VOD_IS_WINNING = '00'
+			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
 		) vv
 		where 1=1
 		<if test="branchId != null and branchId != ''">
@@ -212,6 +269,7 @@
 		join vm_payment_inf b on PIF_TRANFLOWNO = VOD_ORDER_ID
 		left join vm_pro_equ_rel c on c.VCI_ID = a.VOD_PRO_EQU_REL_ID
 		WHERE PIF_STATUS = '1'
+		and VOD_IS_WINNING != '00'
 		<if test="nowDate != null and nowDate != ''">
 			and substr(PIF_SUCCTIME,1,8) = #{nowDate,jdbcType=VARCHAR}
 		</if>