From c1a2d61c91cc28dec10d03f8735a4cf28add3b79 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 10:40:49 +0800
Subject: [PATCH] 开发
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 32 +++++++++++++++++++++++++++++---
server/services/src/main/java/com/doumee/dao/business/model/Bikes.java | 8 ++++++--
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 6 +++---
3 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
index d13a64e..4dd61cf 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
@@ -87,10 +87,14 @@
@ApiModelProperty(value = "鏈�杩戠鍊熸椂闂�")
@ExcelColumn(name="鏈�杩戠鍊熸椂闂�")
//@JsonFormat(pattern = "yyyy-MM-dd")
- private Date lastRentData;
+ private Date lastRentDate;
+ @ApiModelProperty(value = "鏈�杩戣繕杞︽椂闂�")
+ @ExcelColumn(name="鏈�杩戣繕杞︽椂闂�")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
+ private Date lastBackDate;
@ApiModelProperty(value = "鍑哄敭鏃堕棿")
- @ExcelColumn(name="鍑哄敭鏃堕棿")
+ @ExcelColumn(name="")
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date soldoutDate;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index fefcb4b..d38055c 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -156,9 +156,9 @@
if (pageWrap.getModel().getLockId() != null) {
queryWrapper.lambda().eq(Bikes::getLockId, pageWrap.getModel().getLockId());
}
- if (pageWrap.getModel().getLastRentData() != null) {
- queryWrapper.lambda().ge(Bikes::getLastRentData, Utils.Date.getStart(pageWrap.getModel().getLastRentData()));
- queryWrapper.lambda().le(Bikes::getLastRentData, Utils.Date.getEnd(pageWrap.getModel().getLastRentData()));
+ if (pageWrap.getModel().getLastRentDate() != null) {
+ queryWrapper.lambda().ge(Bikes::getLastRentDate, Utils.Date.getStart(pageWrap.getModel().getLastRentDate()));
+ queryWrapper.lambda().le(Bikes::getLastRentDate, Utils.Date.getEnd(pageWrap.getModel().getLastRentDate()));
}
if (pageWrap.getModel().getSoldoutDate() != null) {
queryWrapper.lambda().ge(Bikes::getSoldoutDate, Utils.Date.getStart(pageWrap.getModel().getSoldoutDate()));
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 d7a7d79..1c391aa 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
@@ -352,6 +352,21 @@
//淇敼鍚�
String after = JSONObject.toJSONString(update);
+ //鎻掑叆铏氭嫙閿佸ご鍜岀珯鐐逛笂-------
+ Bikes bike = new Bikes();
+ bike.setIsdeleted(Constants.ZERO);
+ bike.setCode(model.getBikeCode());
+ bike.setSiteId(update.getBackSiteId());
+ bike.setLockId(update.getBackLockId());
+ if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
+ bike.setId(Constants.getUUID());
+ bike.setParamId(model.getParamId());
+ bike.setLastBackDate(model.getRentDate());
+ bike.setStatus(Constants.ZERO);
+ bike.setInfo("寮哄埗杩樿溅缁戝畾");
+ bikesMapper.insert(bike);
+ }
+
ActionLog log = new ActionLog();
log.setId(Constants.getUUID());
log.setIsdeleted(Constants.ZERO);
@@ -651,13 +666,10 @@
//杩涜
dealMemberRidesBack(memberRides,bikes);
}
-
return 0;
-
}
private void dealMemberRidesBack(MemberRides memberRides,MemberRides param) {
-
int freeTime = 0;
try {
freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
@@ -675,6 +687,20 @@
update.setDuration(duration>0?duration:0);
update.setBackType(Constants.ONE);
update.setBackInfo("鐢ㄦ埛姝ｅ父杩樿溅");
+
+ Bikes bikes = new Bikes();
+ bikes.setSiteId(memberRides.getBackSiteId());
+ bikes.setLockId(memberRides.getBackLockId());
+// bikes.setCode(memberRides.getBikeCode());
+ bikes = bikesMapper.selectById(new QueryWrapper<>(bikes).last("limit 1"));
+ if(bikes != null ) {
+ UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().set(Bikes::getId, bikes.getId());
+ updateWrapper.lambda().set(Bikes::getEditDate,new Date());
+ updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
+ //鏇存柊鑷杞︽渶鍚庤繕杞︽椂闂�
+ bikesMapper.updateById(bikes);
+ }
//鏇存柊杩樿溅璁板綍涓哄凡杩樿溅
memberRidesMapper.updateById(update);
}
--
Gitblit v1.9.3