java/mx_charging_pile.git

			@@ -31,7 +31,7 @@
			R<String> queryOrderByGunId(@PathVariable("id") String id);
			@PostMapping(value = "/t-charging-order/useOrderCount")
			R<Long> useOrderCount(@RequestParam("userId") Long userId);
			@PostMapping(value = "/t-charging-order/chargingBillListR")
			@PostMapping(value = "/chargingBill/chargingBillListR")
			R<ChargingBillVO> chargingBillListR(@RequestBody ChargingListQuery dto);
			@PostMapping(value = "/t-charging-order/detail")
			R<TChargingOrder> orderDetail(@RequestParam("orderId") Long orderId);
			@@ -120,8 +120,8 @@
			@GetMapping(value = "/financial/settlement/downloadSettlement/{uid}")
			public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid);

			@GetMapping(value = "/financial/settlement/settlementTotalR")
			public R<SettlementTotalVO> settlementTotalR(String time);
			@GetMapping(value = "/financial/settlement/settlementTotalR/{time}/{userId}")
			public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time,@PathVariable("userId")Long userId);

			/**
			* 修改充电订单
			@@ -151,6 +151,17 @@
			@RequestParam("transaction_id") String transaction_id,
			@RequestParam("attach") String attach);


			/**
			* 充电支付成功回调通知
			* @param out_trade_no
			* @param transaction_id
			* @param attach
			*/
			@PostMapping("/t-charging-order/chargingOrderALICallback")
			void chargingOrderALICallback(@RequestParam("out_trade_no") String out_trade_no,
			@RequestParam("transaction_id") String transaction_id,
			@RequestParam("attach") String attach);

			/**
			* 远程启动失败后退款回调
			@@ -205,7 +216,7 @@
			* @param vo
			*/
			@PostMapping("/t-charging-order/endChargeBillingCharge")
			void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
			R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);

			/**
			* 获取充电订单数据
			@@ -214,4 +225,15 @@
			*/
			@PostMapping("/t-charging-order/getChargingOrder")
			R<List<TChargingOrder>> getChargingOrder(@RequestBody TChargingOrderVo order);


			/**
			* 根据车辆id获取指定时间范围内的数据
			* @param carId
			* @param startTime
			* @param endTime
			* @return
			*/
			@PostMapping("/t-charging-order/getCarChargingOrder")
			R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime);
			}