优化

src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -220,7 +220,7 @@ public class invCardManageAction implements IMINAction {
 		User user = session.getUser();
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		//获取当前时间
-		Date currentTime = new Date();
+ 		Date currentTime = new Date();
 		String nowDate = DateUtil.format(currentTime,"yyyyMMdd");
 		Map<String, String> m = new HashMap<String, String>();
 		m.put("equNum", equNum);

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

@@ -91,17 +91,19 @@
 
 	<select id="selectIncomeDetail" resultType="hashmap" parameterType="java.util.Map">
 		SELECT succTime sellTime,
-			SUM(allCount) newCount,
-			SUM(wxSum) sellWxSum,
-			SUM(zfSum) sellZfSum,
-			SUM(mfSum) sellMfSum,
-			IFNULL(SUM(wxSum), 0.00)+IFNULL(SUM(zfSum), 0.00) allSell,
+			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'
@@ -115,6 +117,7 @@
 				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'
@@ -124,16 +127,33 @@
 			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,
+		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
+
+			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')
+			AND PIF_PAYTYPE IN ('91', '92','93')
 			AND VOI_ORDER_AMT = '0.00'
 			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 		) b

src/main/webapp/WEB-INF/config.properties

@@ -4,6 +4,11 @@ dataSource.url=jdbc:mysql://123.138.111.28:3506/shouhuoji?useUnicode=true&charac
 dataSource.username=shouhuoji_user
 dataSource.password=123456
 
+#Éú²ú
+#dataSource.url=jdbc:mysql://bj-cdb-cwuz68g2.sql.tencentcdb.com:61132/shouhuoji?useUnicode=true&characterEncoding=UTF8
+#dataSource.username=root
+#dataSource.password=root@2020
+
 #dataSource.url=jdbc:mysql://172.16.3.235:3306/trade?useUnicode=true&characterEncoding=UTF8
 #dataSource.username=trade
 #dataSource.password=Trade_pro1024

src/main/webapp/admin/incomeStatisticsManage/incomeStatistics.html

@@ -110,6 +110,7 @@
 		      	,{field: 'newCount', title: '支付次数', width:'10%', sort: true}
 				,{field: 'sellWxSum', title: '微信支付金额', width:'18%'}
 		      	,{field: 'sellZfSum', title: '支付宝支付金额', width:'18%'}
+                ,{field: 'sellYESum', title: '余额支付金额', width:'18%'}
 		      	,{field: 'sellMfSum', title: '免费支付金额', width:'18%'}
 		      	,{field: 'allSell', title: '合计金额',width:'18%'}
 		    ]]