From 9d58e6467c46a9a2cd715d24ec0e30b581baec60 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 17 二月 2025 17:26:39 +0800
Subject: [PATCH] jtt808初始化

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

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 c1ab843..1302e95 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
@@ -244,6 +244,8 @@
                 Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
         queryWrapper
                 .selectAs(MemberRides::getId,MemberRidesDTO::getId)
+                .selectAs(MemberRides::getDiscountPrice,MemberRidesDTO::getDiscountPrice)
+                .selectAs(MemberRides::getType,MemberRidesDTO::getType)
                 .selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
                 .selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
                 .selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
@@ -386,6 +388,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 +396,7 @@
             bike.setParamId(model.getParamId());
             bike.setLastBackDate(model.getRentDate());
             bike.setStatus(Constants.ZERO);
+            bike.setType(Constants.ZERO);
             bike.setInfo("寮哄埗杩樿溅缁戝畾");
             bikesMapper.insert(bike);
         }
@@ -477,6 +481,7 @@
                 locks =new Locks();
                 locks.setCode(Constants.formatIntegerFromStr(codes[1]));
                 locks.setSiteId(codes[0]);
+                locks.setId(codes[1]);
                 deviceService.getLockInfo(locks);
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
             }
@@ -495,10 +500,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{
@@ -670,9 +675,9 @@
         if (!CollectionUtils.isEmpty(memberRides)){
             memberRides.forEach(s->{
                 Integer between = DateUtil.betweenSeconds(s.getCreateDate(), new Date());
-                // 澶т簬闃堝��
+                // 澶т簬闃堝��,鑷姩璁句负寮�閿佹垚鍔燂紙濡傚疄闄呮湭寮�閿侊紝鑱旂郴绔欑偣绠$悊鍛樺悗鍙拌繘琛屽己鍒惰繕杞︽搷浣滐級
                 if (between >= 20){
-                    s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
+                    s.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
                     s.setEditDate(new Date());
                     memberRidesMapper.updateById(s);
                 }
@@ -716,6 +721,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