| | |
|---|
| | | break; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime()); |
|---|
| | | String s2 = DateUtils.localDateTimeToString(chargingOrderListVO.getStartTime()); |
|---|
| | | String s3 = DateUtils.localDateTimeToString(chargingOrderListVO.getEndTime()); |
|---|
| | | tChargingOrderExport.setCreateTime(s1); |
|---|
| | | tChargingOrderExport.setStartTime(s2); |
|---|
| | | tChargingOrderExport.setEndTime(s3); |
|---|
| | | if (chargingOrderListVO.getCreateTime()!=null){ |
|---|
| | | String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime()); |
|---|
| | | tChargingOrderExport.setCreateTime(s1); |
|---|
| | | } |
|---|
| | | if (chargingOrderListVO.getStartTime()!=null){ |
|---|
| | | String s2 = DateUtils.localDateTimeToString(chargingOrderListVO.getStartTime()); |
|---|
| | | tChargingOrderExport.setStartTime(s2); |
|---|
| | | } |
|---|
| | | if (chargingOrderListVO.getEndTime()!=null){ |
|---|
| | | String s3 = DateUtils.localDateTimeToString(chargingOrderListVO.getEndTime()); |
|---|
| | | tChargingOrderExport.setEndTime(s3); |
|---|
| | | } |
|---|
| | | tChargingOrderExport.setRechargePaymentStatus(chargingOrderListVO.getRechargePaymentStatus()+""); |
|---|
| | | tChargingOrderExport.setType("充电订单"); |
|---|
| | | tChargingOrderExport.setChargingType("单桩双充"); |
|---|
| | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @GetMapping(value = "/settlementTotalR/{time}") |
|---|
| | | public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time) { |
|---|
| | | @GetMapping(value = "/settlementTotalR/{time}/{userId}") |
|---|
| | | public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time,@PathVariable("userId")Long userId) { |
|---|
| | | time = time+"-01 00:00:00"; |
|---|
| | | SettlementTotalVO res = chargingOrderService.settlementTotal(time); |
|---|
| | | SettlementTotalVO res = chargingOrderService.settlementTotalR(time,userId); |
|---|
| | | return R.ok(res); |
|---|
| | | } |
|---|
| | | |
|---|
