java/mx_charging_pile.git

			@@ -144,6 +144,8 @@

			TCharingOrderVO chargingOrder(ChargingOrderQuery dto);

			List<ChargingOrderBalanceIncomeDetailVO> balanceIncomeDetail(ChargingOrderQuery dto);

			R<PageInfo<PayOrderDto>> payOrderQuery(PayOrderQueryDto payOrderQueryDto);

			R<PageInfo<TChargingOrderRefund>> getRefundList(ChargingRefundDto chargingRefundDto);
			@@ -156,6 +158,8 @@

			Map<String, Object> countAll(List<Integer> siteIds);

			List<SixIncomeCircleDto> payTypeCircle(LocalDate sixBefore, List<Integer> siteIds);

			List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);

			List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds);
			@@ -167,6 +171,10 @@
			List<Map<String, Object>> getYearData(LocalDate start,LocalDate end,List<Integer> siteIds);

			ChargingOrderTimeVO chargingList(ChargingListQuery dto);


			List<ChargingOrderListVO> export(ChargingListQuery dto);


			R payRefund(PayOrderRefundDto payOrderQueryDto);

			@@ -261,6 +269,9 @@
			List<Map<String, Object>> equipmentMapOut2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

			List<Map<String, Object>> needElec(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

			Map<String, Object> getChargingOrderCount(List<Integer> siteIds, String time);


			List<Map<String, Object>> getHourType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);

			@@ -359,4 +370,42 @@
			* @return
			*/
			List<TChargingOrder> findEndChargingOrder();

			/**
			* 获取需要手动修改订单状态的数据
			* @return
			*/
			List<TChargingOrder> findUpStatusChargingOrder();



			/**
			* 查询充电算账单数据
			* @param startTime
			* @param endTime
			* @param dateType
			*/
			List<Map<String, Object>> getChargingSettlementBill(String startTime, String endTime, Integer dateType);


			/**
			* 查询账户结算账单数据
			* @param startTime
			* @param endTime
			* @return
			*/
			List<Map<String, Object>> getAccountSettlementStatement(String startTime, String endTime, Integer rechargePaymentType);

			/**
			* 手动处理退款数据
			* @param refund_out_trade_no 退款商户单号
			*/
			void orderQueryRefund(Long orderId, String refund_out_trade_no);


			/**
			* 手动添加完善订单费用明细
			* @param orderId
			*/
			void addOrderExpenseBreakdown(Long orderId);
			}