From 5db5a84cee050795051a27181982bcc9a64ff19e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 17 二月 2025 11:28:38 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 5 ++++-
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
index 1555531..fd456a1 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -50,7 +50,9 @@
@TableField(exist = false)
private String memberOpenid;
-
+ @ApiModelProperty(value = "杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅")
+ @ExcelColumn(name="杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅")
+ private Integer type;
@ApiModelProperty(value = "杞﹁締缂栫爜")
@ExcelColumn(name="杞﹁締缂栫爜",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String bikeCode;
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 07efb42..c2b3bd0 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
@@ -386,6 +386,7 @@
Bikes bike = new Bikes();
bike.setIsdeleted(Constants.ZERO);
bike.setCode(model.getBikeCode());
+ bike.setType(model.getType());
bike.setSiteId(update.getBackSiteId());
bike.setLockId(update.getBackLockId());
if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
@@ -393,6 +394,7 @@
bike.setParamId(model.getParamId());
bike.setLastBackDate(model.getRentDate());
bike.setStatus(Constants.ZERO);
+ bike.setType(Constants.ZERO);
bike.setInfo("寮哄埗杩樿溅缁戝畾");
bikesMapper.insert(bike);
}
@@ -496,10 +498,10 @@
memberRides.setRentLockId(locks.getCode());
memberRides.setOrdreId(goodsorder.getId());
memberRides.setRentDate(new Date());
+ memberRides.setType(Constants.ZERO);
memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
memberRides.setCloseStatus(Constants.ZERO);
-
memberRidesMapper.insert(memberRides);
BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
}else{
@@ -717,6 +719,7 @@
bikes.setEditDate(bikes.getCreateDate());
bikes.setSiteId(model.getSiteId());
bikes.setLockId(model.getCode());
+ bikes.setType(Constants.ZERO);
bikes.setCode(model.getBikeCode());
bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
bikesMapper.insert(bikes);
--
Gitblit v1.9.3