| 
					
				 | 
			
			
				@@ -319,7 +319,6 @@ public class PosMachineController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 listSum.get(0).put("refundAmtSum", "0.00"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //按照油品名称 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             classes.setGroupBy("oilName"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             classes.setStatus("1"); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -331,9 +330,9 @@ public class PosMachineController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             List<Map<String, String>> listSumGroupByPayType = stationClassStructureService.selectClassStructureSum(classes); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //退款金额按照支付方式 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            classes.setGroupBy("payType"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            classes.setStatus("3"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            List<Map<String, String>> listSumGroupByPayTypeRefund = stationClassStructureService.selectClassStructureSum(classes); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            classes.setGroupBy("payType"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            classes.setStatus("3"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            List<Map<String, String>> listSumGroupByPayTypeRefund = stationClassStructureService.selectClassStructureSum(classes); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //班结人、时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             classes.setGroupBy("timeAndMan"); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -345,7 +344,7 @@ public class PosMachineController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             map.put("listSum", listSum); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             map.put("timeList", timeList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             map.put("listSumGroupByPayType", listSumGroupByPayType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            map.put("listSumGroupByPayTypeRefund", listSumGroupByPayTypeRefund); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //map.put("listSumGroupByPayTypeRefund", listSumGroupByPayTypeRefund); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             resultData = ResultData.success(map); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return gson.toJson(resultData); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -428,9 +427,9 @@ public class PosMachineController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             List<Map> listSumGroupByPayType = payOrderService.selectSum(order); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //要班结订单退款金额按照支付方式汇总 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            order.setGroupBy("payType"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            order.setStatus("3"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            List<Map> listSumGroupByPayTypeRefund = payOrderService.selectSum(order); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            order.setGroupBy("payType"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            order.setStatus("3"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            List<Map> listSumGroupByPayTypeRefund = payOrderService.selectSum(order); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //返回POS机数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Map<String, Object> map = new HashMap(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -438,7 +437,7 @@ public class PosMachineController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             map.put("listSum", listSum); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             map.put("timeList", timeList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             map.put("listSumGroupByPayType", listSumGroupByPayType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            map.put("listSumGroupByPayTypeRefund", listSumGroupByPayTypeRefund); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //map.put("listSumGroupByPayTypeRefund", listSumGroupByPayTypeRefund); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             resultData =ResultData.success(map); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             resultData =ResultData.error(CodeMsg.PARAMS_NUll); 
			 |