From a8e38a794fa221d25b4b5d1d47f131419add63e4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 18:16:24 +0800
Subject: [PATCH] aa
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 48 +++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 31 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 9a9669f..b342df0 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
@@ -47,6 +47,12 @@
@Autowired
private MemberRidesMapper memberRidesMapper;
@Autowired
+ private HolidaysMapper holidaysMapper;
+ @Autowired
+ private PricingParamMapper pricingParamMapper;
+ @Autowired
+ private PricingDetailMapper pricingDetailMapper;
+ @Autowired
private ActionLogMapper actionLogMapper;
@Autowired
@@ -415,13 +421,17 @@
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
if(model.getStatus() == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
- if(StringUtils.isNotBlank(locks.getBikeCode())){
-
- }
MemberRides memberRides = new MemberRides();
- memberRides.setBikeCode(model.getBikeCode());
+ memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
+ memberRides.setRentLockId(model.getId());
+ memberRides.setIsdeleted(Constants.ZERO);
+ memberRides = findOne(memberRides);
+ if(memberRides == null){
+ return 0;
+ }
-
+ //锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
+ memberRidesMapper.updateById( memberRides);
}
return 0;
}
@@ -434,11 +444,10 @@
if(bikes != null ) {
if ( StringUtils.equals(model.getBikeCode(), bikes.getCode())){
//濡傛灉缁戝畾杞﹁締淇℃伅鍙戠敓缂栧彿锛屾洿鎹㈢粦瀹氬叧绯�
- bikes.setCode(model.getBikeCode());
- bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda().set(Bikes::getId, bikes.getId());
-
+ updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
+ updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
//鏇存柊鑷绔欑偣閿佸ご缁戝畾鑷杞︿俊鎭�
bikesMapper.updateById(bikes);
}
@@ -466,7 +475,6 @@
Locks model = locksMapper.selectById(locks.getId());
Date date =new Date();
//妫�鏌ョ珯鐐逛俊鎭紝涓嶅瓨鍦ㄥ垯鏂板
-// boolean newSite =false;
Sites sites = sitesMapper.selectById(locks.getSiteId());
if(sites == null){
sites = new Sites();
@@ -478,7 +486,6 @@
sites.setLockNum(1);
//鏂板閿佸ご
sitesMapper.insert(sites);
-// newSite =true;
}
if(model == null){
@@ -493,28 +500,7 @@
model.setCreateDate(date);
model.setStatus(locks.getStatus());
locksMapper.insert(model);
- /* UpdateWrapper<Sites> wrapper = new UpdateWrapper();
- wrapper.eq("id",sites.getId());
- wrapper.lambda().setSql("lock_num = COALESCE(lock_num,0) + 1");
- wrapper.lambda().set(Sites::getEditDate,date);
- sitesMapper.update(null,wrapper);//绱閿佸ご鏁伴噺*/
}else{
- /* if(!StringUtils.equals(model.getId(),locks.getId())){
- //濡傛灉绔欑偣鍙戠敓鍙樺寲锛屽師鏉ョ殑绔欑偣閿佸ご鏁伴噺-1
- UpdateWrapper<Sites> wrapper = new UpdateWrapper();
- wrapper.eq("id",model.getId());
- wrapper.lambda().setSql("lock_num = COALESCE(lock_num,0) - 1");
- wrapper.lambda().set(Sites::getEditDate,date);
- sitesMapper.update(null,wrapper);//绱閿佸ご鏁伴噺
- }
- if(!newSite){
- //濡傛灉绔欑偣鏈彂鐢熷彉鍖栵紝 骞朵笖涓嶆槸鏂扮珯鐐癸紝绔欑偣閿佸ご+1
- UpdateWrapper<Sites> wrapper = new UpdateWrapper();
- wrapper.eq("id",model.getId());
- wrapper.lambda().setSql("lock_num = COALESCE(lock_num,0) - 1");
- wrapper.lambda().set(Sites::getEditDate,date);
- sitesMapper.update(null,wrapper);//绱閿佸ご鏁伴噺
- }*/
model.setSiteId(locks.getSiteId());
model.setIsdeleted(Constants.ZERO);
model.setCode(locks.getCode());
--
Gitblit v1.9.3