销售统计

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

@@ -3,6 +3,7 @@ package com.minpay.shouhuo;
 import com.minpay.common.bean.User;
 import com.minpay.common.format.IFormatService;
 import com.minpay.common.service.ILogService;
+import com.minpay.common.util.CommonUtil;
 import com.minpay.common.util.DateUtil;
 import com.minpay.db.table.mapper.VmOrderInfMapper;
 import com.minpay.db.table.model.VmOrderInf;
@@ -21,6 +22,7 @@ import com.startup.minpay.frame.target.MINParam;
 import org.apache.commons.lang.StringUtils;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -79,12 +81,24 @@ public class invCardManageAction implements IMINAction {
 		Date weekFristDate = cal.getTime();
 		String weekDate = DateUtil.format(weekFristDate,"yyyyMMdd");
 		//按时间查询
+		String time = null;
 		if("0".equals(dateFlag)) {
 			m.put("nowDate", nowDate);
+			Date  parse = new SimpleDateFormat("yyyyMMdd").parse(nowDate);
+			String  dateString = new SimpleDateFormat("yyyy-MM-dd").format(parse);
+			time = dateString;
 		}else if("1".equals(dateFlag)) {
 			m.put("yesDate", yesDate);
+			Date  parse = new SimpleDateFormat("yyyyMMdd").parse(yesDate);
+			String  dateString = new SimpleDateFormat("yyyy-MM-dd").format(parse);
+			time = dateString;
 		}else if("2".equals(dateFlag)) {
 			m.put("weekDate", weekDate);
+			Date  parse = new SimpleDateFormat("yyyyMMdd").parse(weekDate);
+			String  dateString = new SimpleDateFormat("yyyy-MM-dd").format(parse);
+			Date  parseb = new SimpleDateFormat("yyyyMMdd").parse(nowDate);
+			String  dateStringb = new SimpleDateFormat("yyyy-MM-dd").format(parseb);
+			 time = dateString.concat(" 至 ").concat(dateStringb);
 		}
 		//查询累计收入
 		String countIncome = Service.lookup(IMINDataBaseService.class)
@@ -92,12 +106,12 @@ public class invCardManageAction implements IMINAction {
 		//查询预估利润
 		String predictIncome = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectPredictIncome(m);
-		BigDecimal ljsr=new BigDecimal(countIncome);
-		BigDecimal ljzf=new BigDecimal(predictIncome);
-		predictIncome = (ljsr.subtract(ljzf)).toString();
+
+		predictIncome = CommonUtil.subtract(countIncome,predictIncome);
 		//返回数据
-		res.set("countIncome", ljsr);
+		res.set("countIncome", countIncome);
 		res.set("predictIncome", predictIncome);
+		res.set("time", time);
 		return res;
 	}
 

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

@@ -154,7 +154,7 @@
 	</select>
 <!--	累计收入-->
 	<select id="selectCountIncome" resultType="java.lang.String" parameterType="java.util.Map">
-		select IFNULL(SUM(PIF_ORDERAMOUT), 0.00)
+		select IFNULL(CAST(SUM(PIF_ORDERAMOUT) AS DECIMAL(15,2)), 0.00)
 		from vm_payment_inf
 		where PIF_STATUS = '1'
 		<if test="nowDate != null and nowDate != ''">
@@ -169,7 +169,7 @@
 	</select>
 	<!--	预估利润-->
 	<select id="selectPredictIncome" resultType="java.lang.String" parameterType="java.util.Map">
-		SELECT IFNULL(SUM(VOD_AMOUNT), 0.00)
+		SELECT IFNULL(CAST(SUM(PIF_ORDERAMOUT) AS DECIMAL(15,2)), 0.00)
 		FROM vm_order_details, vm_payment_inf
 		WHERE VOD_IS_WINNING IN ('01', '02')
 		AND PIF_TRANFLOWNO = VOD_ORDER_ID

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

@@ -17,11 +17,6 @@
             <button class="layui-btn order-bnt2" id = "addUser">添加</button>
             <a href="#" id="toggle" class="top">收起</a>
         </div>
-<!--        <div class="tiaojian-part2 fr  demoTable">-->
-<!--            <button class="layui-btn  date-bnt0">今天</button>-->
-<!--            <button class="layui-btn  date-bnt1">昨天</button>-->
-<!--            <button class="layui-btn  date-bnt2">本周</button>-->
-<!--        </div>-->
     </div>
     <form class="layui-form"  action="javascript:void(0)"  id = "formName">
         <div class="order-select back-border" id="content">
@@ -34,7 +29,34 @@
                 <input onchange = "changeSelectCon(1,this,'inp')" class="search-select"
                        type="tel" name="equNum" id ="equNum" value="" placeholder="设备编号" />
             </div>
+            <div class="d-dashed" style="margin: 10px 0;"></div>
+
+            <div class="layui-inline">
+                <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">
+                </div>
+            </div>
+            <div class="layui-inline">
+                <label class="f12-gray4">预计利润汇总:</label>
+                <div class="layui-input-inline">
+                    <input type="text" class="layui-input" id="predictIncome" name="predictIncome" 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">
+                </div>
+            </div>
+            <div class="tiaojian-part2 fr  demoTable">
+                <button  class="layui-btn order-bnt2" onclick="wyyq(0)">今天</button>
+                <button  class="layui-btn order-bnt2" onclick="wyyq(1)">昨天</button>
+                <button  class="layui-btn order-bnt2" onclick="wyyq(2)">本周</button>
+            </div>
         </div>
+
+
     </form>
 </div>
 
@@ -59,7 +81,7 @@
                 changeSelectCon(0,"dates",'date',value)
             }
         });
-		$.request({
+		/*$.request({
 			action : '../../invCardManageAction/selectIncomeBydate',
 			data : { dateFlag:'0'},
 			success : function(data) {
@@ -68,7 +90,7 @@
 <!--				$("#countIncome").html(countIncome);-->
 <!--				$("#predictIncome").html(predictIncome);-->
 			}
-		});
+		});*/
 	})
 
 	var table;
@@ -98,6 +120,7 @@
 		        console.log(curr);
 		        //得到数据总量
 		        console.log(count);
+                wyyq(1);
 		      }
 		    ,even: true //开启隔行背景
         });
@@ -197,6 +220,18 @@
             $(t).remove();
         }
     }
+    function wyyq(aa) {
+        $.request({
+            action : '../../invCardManageAction/selectIncomeBydate',
+            data : { dateFlag:aa},
+            success : function(data) {
+                $("#countIncome").val(data.countIncome);
+                $("#predictIncome").val(data.predictIncome);
+                $("#time").val(data.time);
+            }
+        });
+        
+    }
 </script>
 </body>
 </html>