From e24375b5bde4ddfb55a520f104fb6136e456522e Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 17 十月 2023 18:35:21 +0800
Subject: [PATCH] #车型序号内置

---
 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 213d97e..ec04d88 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -288,8 +288,10 @@
                 }
                 memberRidesResponse.setRideId(memberRides.getId());
                 memberRidesResponse.setRideStartTime(memberRides.getRentDate());
+                memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
                 memberRidesResponse.setRideEndTime(memberRides.getBackDate());
-                memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRidesResponse.getRideStartTime(),memberRidesResponse.getRideEndTime()));
+                memberRidesResponse.setRideEndTimeStr(DateUtil.DateToStr(memberRides.getBackDate(),"HH:mm"));
+                memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRides.getRentDate(),memberRides.getBackDate()));
                 memberRidesResponse.setBikeCode(memberRides.getBikeCode());
                 memberRidesResponse.setBasePrice(memberRides.getBasePrice());
                 memberRidesResponse.setBaseTime(memberRides.getBaseTime());
@@ -512,6 +514,8 @@
             refundDTO.setReason(reason);
             refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
             Refund refund = wxMiniUtilService.wxRefund(refundDTO);
+        }else {
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閫�娆鹃噾棰濅笉鍏佽瓒呰繃"+canBalance);
         }
     }
 

--
Gitblit v1.9.3