From 7d14164d6eb63881290e8cdffb00b16bf3dc51a9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 17 十月 2023 10:43:07 +0800
Subject: [PATCH] #订单默认获取已支付的
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 c8a55ff..77ee27d 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
@@ -36,6 +36,7 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -74,10 +75,13 @@
@Autowired
private SitesMapper sitesMapper;
@Autowired
+ private BaseParamMapper baseParamMapper;
+ @Autowired
private BikesMapper bikesMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
+ @Lazy
private GoodsorderService goodsorderService;
@@ -446,8 +450,6 @@
memberRidesMapper.insert(memberRides);
BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
}
-
-
return memberRidesDetailResponse;
}
@@ -523,7 +525,6 @@
MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
return memberRidesDetailResponse;
-
}
/**
@@ -540,7 +541,6 @@
Locks model = dealLockAndSite(locks);
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
-
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
if(model.getStatus() == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
@@ -588,9 +588,28 @@
}
- //TODO-----JP------------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ /**
+ -----------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ *
+ */
private String getBileTypeByCode(String bikeCode) {
- return null;
+// int temp=1+(int)(Math.random()*(8));
+ if(StringUtils.isBlank(bikeCode)){
+ return null;
+ }
+ String type = bikeCode.substring(0,1);
+ if("1,2,3,4,5,6,7,8".contains(type)){
+ return null;
+ }
+ BaseParam param = new BaseParam();
+ param.setIsdeleted(Constants.ZERO);
+ param.setType(Constants.THREE);
+ param.setSortnum(Integer.parseInt(type));
+ param = baseParamMapper.selectOne(new QueryWrapper<>(param).lambda().last("limit 1" ));
+ if(param == null){
+ return null;
+ }
+ return param.getId();
}
private Locks dealLockAndSite(Locks locks) {
@@ -609,7 +628,6 @@
//鏂板閿佸ご
sitesMapper.insert(sites);
}
-
if(model == null){
//濡傛灉閿佸ご涓嶅瓨鍦紝鍒ゆ柇瀛樺偍
model = new Locks();
@@ -631,7 +649,6 @@
model.setBikeCode(locks.getBikeCode());
model.setStatus(locks.getStatus());
locksMapper.update(null, new QueryWrapper<>(model));
-
}
model.setSites(sites);
return model;
@@ -645,7 +662,7 @@
@Override
public int mqttCloseBikeEvent(MemberRides bikes){
//鍏嶈垂楠戣鏃堕暱鏌ヨ锛屾暟鎹瓧鍏搁厤缃�
- if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getRentLockId())){
+ if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getBackLockId())||StringUtils.isBlank(bikes.getBackSiteId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杩樿溅涓婃姤鍙傛暟閿欒锛�");
}
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
--
Gitblit v1.9.3