From 1e22fd4f9b5e1e6beb95d68a74c0311f2300762a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 17 十月 2023 18:24:33 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 4 ++--
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 1 +
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 7 ++-----
server/services/src/main/java/com/doumee/dao/business/web/request/RepairRequest.java | 3 +++
server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java | 6 ++++++
server/services/src/main/java/com/doumee/service/business/MemberRidesService.java | 3 ++-
server/web/src/main/java/com/doumee/api/web/AccountApi.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 4 +++-
server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java | 5 +++++
9 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java b/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
index 2f246cb..d9dbab4 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
@@ -108,4 +108,9 @@
@ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
private String memberId;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)")
+ @ExcelColumn(name="杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)")
+ private String typeId;
+
+
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/RepairRequest.java b/server/services/src/main/java/com/doumee/dao/business/web/request/RepairRequest.java
index b62c6fb..0d2a3c3 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/request/RepairRequest.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/RepairRequest.java
@@ -25,6 +25,9 @@
@ApiModelProperty(value = "杞﹁締缂栫爜")
private String bikeCode;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)")
+ private String typeId;
+
@ApiModelProperty(value = "缁忓害", example = "1")
private BigDecimal longitude;
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
index 629334e..b8d9078 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
@@ -29,6 +29,12 @@
@ApiModelProperty(value = "楠戣缁撴潫鏃堕棿")
private Date rideEndTime;
+ @ApiModelProperty(value = "楠戣寮�濮嬫椂闂�-鐭椂闂�")
+ private String rideStartTimeStr;
+
+ @ApiModelProperty(value = "楠戣缁撴潫鏃堕棿-鐭椂闂�")
+ private String rideEndTimeStr;
+
@ApiModelProperty(value = "楠戣鏃堕暱")
private Integer rideTime;
diff --git a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
index f37680e..c9ec41d 100644
--- a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Locks;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.web.request.MemberRidesQuery;
@@ -115,7 +116,7 @@
* @param memberId
* @return
*/
- String getOnlineBike(String memberId);
+ MemberRides getOnlineBike(String memberId);
/**
* 鎵爜瑙ｉ攣
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index b4dc2e1..52fc9ef 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -165,6 +165,7 @@
BeanUtils.copyProperties(repairRequest,bikeRepair);
bikeRepair.setCreateDate(new Date());
bikeRepair.setIsdeleted(Constants.ZERO);
+ bikeRepair.setStatus(Constants.ZERO);
bikeRepair.setId(Constants.getUUID());
bikeRepairMapper.insert(bikeRepair);
//澶勭悊闄勪欢淇℃伅
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..8d6d6c5 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());
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 4a85145..2b0c3d3 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -237,7 +237,7 @@
}
@Override
- public String getOnlineBike(String memberId){
+ public MemberRides getOnlineBike(String memberId){
MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
.eq("isdeleted", Constants.ZERO)
.eq("member_id",memberId)
@@ -247,7 +247,7 @@
if(Objects.isNull(memberRides)){
return null;
}
- return memberRides.getBikeCode();
+ return memberRides;
}
/**
diff --git a/server/web/src/main/java/com/doumee/api/web/AccountApi.java b/server/web/src/main/java/com/doumee/api/web/AccountApi.java
index 4bb78d8..db5c45b 100644
--- a/server/web/src/main/java/com/doumee/api/web/AccountApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/AccountApi.java
@@ -67,7 +67,7 @@
public static void main(String[] args) {
- JwtPayLoad payLoad = new JwtPayLoad("07a9f07178864e57bf1fb34e7a321f08");
+ JwtPayLoad payLoad = new JwtPayLoad("d0a92489d26d43e182a1b8b75e1d9836");
System.out.println(JwtTokenUtil.generateToken(payLoad));
}
diff --git a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
index 516bbc7..2766dad 100644
--- a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
@@ -7,10 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.model.BaseParam;
-import com.doumee.dao.business.model.MemberRides;
-import com.doumee.dao.business.model.RentSite;
-import com.doumee.dao.business.model.Transactions;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
@@ -130,7 +127,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse<String> onlineBike() {
+ public ApiResponse<MemberRides> onlineBike() {
return ApiResponse.success("鏌ヨ鎴愬姛",memberRidesService.getOnlineBike(getMemberId()));
}
--
Gitblit v1.9.3