优化

src/main/java/com/minpay/db/table/own/mapper/OrderManageMapper.java

@@ -56,4 +56,8 @@ public interface OrderManageMapper extends IMINMybatisEntityMapper {
 	 * 预估利润
 	 */
 	String selectPredictIncome(Map<String, String> m);
+	/**
+	 * 查询累计收入 只查询微信支付宝
+	 */
+	List<Map<String, String>>  selectCountIncomeb(Map<String, String> m);
 }

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

@@ -107,10 +107,30 @@ public class invCardManageAction implements IMINAction {
 		String predictIncome = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectPredictIncome(m);
 
+		//查询累计收入
+		List<Map<String, String>> mapList = Service.lookup(IMINDataBaseService.class)
+														.getMybatisMapper(OrderManageMapper.class).selectCountIncomeb(m);
+
+		String  wxzfbAmout = "0";
+		String  czAmout = "0";
+		for (int i = 0; i < mapList.size(); i++) {
+			Map<String, String> map = mapList.get(i);
+			String transType = map.get("transType");
+			if(transType.equals("00")){ //充值金额
+				 czAmout =  String.valueOf(map.get("amout"));
+			}
+			if(transType.equals("10")){ //支付金额
+				wxzfbAmout =   String.valueOf(map.get("amout"));
+			}
+		}
+
 		predictIncome = CommonUtil.subtract(countIncome,predictIncome);
+		String zsrAmout = CommonUtil.add(czAmout,wxzfbAmout);
 		//返回数据
 		res.set("countIncome", countIncome);
 		res.set("predictIncome", predictIncome);
+		res.set("czAmout", czAmout);
+		res.set("zsrAmout", zsrAmout);
 		res.set("time", time);
 		return res;
 	}

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

@@ -253,4 +253,19 @@
 			GROUP BY aa.PRT_ID
 		) cc
 	</select>
+	<select id="selectCountIncomeb" resultType="hashmap" parameterType="java.util.Map">
+		select PIF_TRANSTYPE transType, IFNULL(CAST(SUM(PIF_ORDERAMOUT) AS DECIMAL(15,2)), 0.00) amout
+		from vm_payment_inf
+		where PIF_STATUS = '1' and PIF_PAYTYPE in ('91','92') and PIF_TRANSTYPE in ('00','10')
+		<if test="nowDate != null and nowDate != ''">
+			and substr(PIF_SUCCTIME,1,8) = #{nowDate,jdbcType=VARCHAR}
+		</if>
+		<if test="yesDate != null and yesDate != ''">
+			and substr(PIF_SUCCTIME,1,8) = #{yesDate,jdbcType=VARCHAR}
+		</if>
+		<if test="weekDate != null and weekDate != ''">
+			and substr(PIF_SUCCTIME,1,8) >= #{weekDate,jdbcType=VARCHAR}
+		</if>
+		group  by PIF_TRANSTYPE
+	</select>
 </mapper>

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

@@ -31,7 +31,7 @@
             </div>
             <div class="d-dashed" style="margin: 10px 0;"></div>
 
-            <div class="layui-inline">
+            <div class="layui-inline" style = "width: 300px">
                 <label class="f12-gray4">交易总额汇总:</label>
                 <div class="layui-input-inline">
                     <input type="text" class="layui-input" id="countIncome" name="countIncome" style="border:none;color: red" disabled="disabled" class="search-select">
@@ -44,6 +44,18 @@
                 </div>
             </div>
             <div class="layui-inline">
+                <label class="f12-gray4">充值汇总:</label>
+                <div class="layui-input-inline">
+                    <input type="text" class="layui-input" id="czAmout" name="czAmout" style="border:none;color: red" disabled="disabled" class="search-select">
+                </div>
+            </div>
+            <div class="layui-inline">
+                <label class="f12-gray4">实际收入:</label>
+                <div class="layui-input-inline">
+                    <input type="text" class="layui-input" id="zsrAmout" name="zsrAmout" style="border:none;color: red" disabled="disabled" class="search-select">
+                </div>
+            </div>
+            <div class="layui-inline">
                 <label class="f12-gray4">统计时间:</label>
                 <div class="layui-input-inline">
                     <input type="text" class="layui-input" id="time" name="time" style="border:none;color: red" disabled="disabled" class="search-select">
@@ -228,6 +240,8 @@
             success : function(data) {
                 $("#countIncome").val(data.countIncome);
                 $("#predictIncome").val(data.predictIncome);
+                $("#czAmout").val(data.czAmout);
+                $("#zsrAmout").val(data.zsrAmout);
                 $("#time").val(data.time);
             }
         });