From 39adc067cbc7e8ffbc9ecc9fc0a57f4efac6353a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 十月 2023 11:10:35 +0800
Subject: [PATCH] 订阅
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 b71fa87..05b0c97 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
@@ -397,6 +397,9 @@
@Override
public MemberRidesDetailResponse openLock(String code,String memberId) {
+ if(StringUtils.isBlank(code) || code.split("/").length != 2){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ョ珯鐐圭紪鍙蜂笉瀛樺湪锛岃灏濊瘯鏇存崲杞﹁締锛�");
+ }
//鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
.eq("isdeleted", Constants.ZERO)
@@ -417,7 +420,12 @@
if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1)) > Constants.ZERO) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
}
- Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>().eq("code", code).eq("isdeleted", Constants.ZERO).last("limit 1"));
+ String[] codes = code.split("/");
+ Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>()
+ .lambda().eq(Locks::getCode, codes[1])
+ .eq(Locks::getSiteId, codes[0])
+ .eq(Locks::getIsdeleted, Constants.ZERO)
+ .last("limit 1"));
if (Objects.isNull(locks)) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛屾湭鏌ヨ鍒伴攣澶翠俊鎭�");
}
@@ -440,7 +448,7 @@
memberRides.setMemberId(memberId);
memberRides.setCreateDate(new Date());
memberRides.setRentSiteId(locks.getSiteId());
- memberRides.setRentLockId(locks.getId());
+ memberRides.setRentLockId(locks.getCode());
memberRides.setOrdreId(goodsorder.getId());
memberRides.setRentDate(new Date());
memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
@@ -455,7 +463,7 @@
private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
Bikes bike= new Bikes();
- bike.setLockId(locks.getId());
+ bike.setLockId(locks.getCode());
bike.setSiteId(locks.getSiteId());
//鏌ヨ杞﹁締淇℃伅
bike = bikesMapper.selectOne(new QueryWrapper<>(bike).last("limit 1"));
@@ -560,7 +568,7 @@
private Bikes dealBikesByParam(Locks model) {
QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(Bikes::getLockId, model.getId());
+ wrapper.lambda().eq(Bikes::getLockId, model.getCode());
wrapper.lambda().eq(Bikes::getSiteId, model.getSiteId());
Bikes bikes = bikesMapper.selectOne(wrapper.last("last 1"));
if(bikes != null ) {
@@ -579,7 +587,7 @@
bikes.setIsdeleted(Constants.ZERO);
bikes.setCreateDate(new Date());
bikes.setSiteId(model.getSiteId());
- bikes.setLockId(model.getId());
+ bikes.setLockId(model.getCode());
bikes.setCode(model.getBikeCode());
bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
bikesMapper.insert(bikes);
@@ -598,7 +606,7 @@
return null;
}
String type = bikeCode.substring(0,1);
- if("1,2,3,4,5,6,7,8".contains(type)){
+ if(Constants.BIKE_TYPE.contains(type)){
return null;
}
BaseParam param = new BaseParam();
--
Gitblit v1.9.3