新建

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

@@ -18,6 +18,7 @@ import com.startup.minpay.frame.target.MINAction;
 import com.startup.minpay.frame.target.MINComponent;
 import com.startup.minpay.frame.target.MINParam;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,8 +48,37 @@ public class invCardManageAction implements IMINAction {
 
 	/**  销售数据 **/
 	public final static String SELECT_SALES_DATA = "selectSalesData";
+	/**  销售数据2 **/
+	public final static String SELECT_ALL_SALE = "selectAllSale";
 
 	/**
+	 * 总销售数量
+	 * @param session
+	 * @return
+	 * @throws Exception
+	 */
+	@MINAction(value = SELECT_ALL_SALE)
+	public MINActionResult selectAllSale (
+			MINSession session) throws Exception {
+		MINActionResult res = new MINActionResult();
+		User user = session.getUser();
+		//总实际金额
+		String allSale = Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(OrderManageMapper.class).selectAllSale();
+		//总商品成本
+		String allCost = Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(OrderManageMapper.class).selectAllCost();
+		BigDecimal num1 = new BigDecimal(allSale);
+		BigDecimal num2 = new BigDecimal(allCost);
+		BigDecimal  allProfit = num1.subtract(num2);
+		//返回数据
+		res.set("allSale", allSale);
+		res.set("allCost", allCost);
+		res.set("allProfit", allProfit);
+
+		return res;
+	}
+	/**
 	 * 销售数据
 	 * @param page
 	 * @param limit

src/main/webapp/admin/salesDataManage/salesData.html

@@ -11,13 +11,14 @@
 <div class="shadow-content" style="margin:1.5rem;">
     <table id="salesManage" lay-filter="tableFilter"></table>
 </div>
-<script type="text/html" id="switch">
-    <div  style="width:90px;height:70px">
-        {{#
-        if(!isEmpty(d.fmPic)&& d.fmPic != "null"){ }}
-        <img  src="{{ d.fmPic}}">
-        {{# } }}
-    </div>
+<script type="text/html" id="barDemo">
+    <p class="layui-btn layui-btn-danger layui-btn-xs">笔数+{{# countNo }}</p>
+    <p class="layui-btn layui-btn-danger layui-btn-xs">金额+{{# amount }}</p>
+</script>
+<script type="text/html" id="barDemo2">
+    <p class="layui-btn layui-btn-danger layui-btn-xs">实际金额+{{# amount }}</p>
+    <p class="layui-btn layui-btn-danger layui-btn-xs">商品成本+{{# proCost }}</p>
+    <p class="layui-btn layui-btn-danger layui-btn-xs">预估利润+{{# amount-proCost }}</p>
 </script>
 <script>
 	layui.use(['table','laydate','form'], function(){
@@ -26,12 +27,12 @@
 			action : '../../invCardManageAction/selectAllIncome',
 			data : { },
 			success : function(data) {
-				var orderNum = data.orderNum;
-			    var countIncome = data.countIncome;
-			    var countDevice = data.countDevice;
-<!--				$("#orderNum").html(orderNum);-->
-<!--				$("#countIncome").html(countIncome);-->
-<!--				$("#countDevice").html(countDevice);-->
+				var allSale = data.allSale;
+			    var allCost = data.allCost;
+			    var allProfit = data.allProfit;
+<!--				$("#allSale").html(allSale);-->
+<!--				$("#allCost").html(allCost);-->
+<!--				$("#allProfit").html(allProfit);-->
 				form.render();
 			}
 		});
@@ -51,12 +52,12 @@
 		    ,page: true //开启分页
 		    ,cols: [[ //表头
 				{type:'numbers',title: '序号',width:'5%'}
-		      	,{field: 'fmPic', title: '商品照片', width:"8%",align:'center',templet:'#switch'}
-				,{field: 'logonname', title: '商品名称', width:'12%'}
-		      	,{field: 'name', title: '类别', width:'12%'}
-		      	,{field: 'rolename', title: '总销售', width:'15%'}
-		      	,{field: 'createdate', title: '出货数量',width:'15%'}
-		      	,{field: 'lastlogon', title: '利润分析',width:'15%'}
+		      	,{field: 'mainUrl', title: '商品照片', width:"8%"}
+				,{field: 'proName', title: '商品名称', width:'12%'}
+		      	,{field: 'vciName', title: '类别', width:'12%'}
+		      	,{field: 'countNo', title: '总销售', width:'15%', toolbar: '#barDemo'}
+		      	,{field: 'proNums', title: '出货数量',width:'15%'}
+		      	,{field: 'proCost', title: '利润分析',width:'15%', toolbar: '#barDemo2'}
 		    ]]
 		    ,done: function(res, curr, count){
 		        //如果是异步请求数据方式，res即为你接口返回的信息。