| 
														
															@@ -123,17 +123,19 @@ public class PosMachineController { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             order.setStatus("1"); 
														 | 
														
														 | 
														
															             order.setStatus("1"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             order.setBeginTime(beginTime); 
														 | 
														
														 | 
														
															             order.setBeginTime(beginTime); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             order.setEndTime(dateFormat.format(date)); 
														 | 
														
														 | 
														
															             order.setEndTime(dateFormat.format(date)); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            //查询要班结订单总和 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             order.setGroupBy(""); 
														 | 
														
														 | 
														
															             order.setGroupBy(""); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             List<Map> listSum = payOrderService.selectSum(order); 
														 | 
														
														 | 
														
															             List<Map> listSum = payOrderService.selectSum(order); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            //查询要班结订单总和按油品分类 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             order.setGroupBy("oilName"); 
														 | 
														
														 | 
														
															             order.setGroupBy("oilName"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             List<Map> listSumGroupByOilName = payOrderService.selectSum(order); 
														 | 
														
														 | 
														
															             List<Map> listSumGroupByOilName = payOrderService.selectSum(order); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            //查询要班结订单总和按支付方式 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             order.setGroupBy("payType"); 
														 | 
														
														 | 
														
															             order.setGroupBy("payType"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             List<Map> listSumGroupByPayType = payOrderService.selectSum(order); 
														 | 
														
														 | 
														
															             List<Map> listSumGroupByPayType = payOrderService.selectSum(order); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             Map<String, Object> map = new HashMap(); 
														 | 
														
														 | 
														
															             Map<String, Object> map = new HashMap(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             map.put("listSumGroupByOilName", listSumGroupByOilName); 
														 | 
														
														 | 
														
															             map.put("listSumGroupByOilName", listSumGroupByOilName); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             map.put("listSum", listSum); 
														 | 
														
														 | 
														
															             map.put("listSum", listSum); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             map.put("listSumGroupByPayType", listSumGroupByPayType); 
														 | 
														
														 | 
														
															             map.put("listSumGroupByPayType", listSumGroupByPayType); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            //List<PayOrder> list = payOrderService.selectPayOrderList(order); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             resultData =ResultData.success(map); 
														 | 
														
														 | 
														
															             resultData =ResultData.success(map); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         }else { 
														 | 
														
														 | 
														
															         }else { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             resultData =ResultData.error(CodeMsg.PARAMS_NUll); 
														 | 
														
														 | 
														
															             resultData =ResultData.error(CodeMsg.PARAMS_NUll); 
														 |