From 0aa7c7fcb8b3516ef421e2da4106b5f768d1daa7 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 17 十月 2023 08:56:55 +0800
Subject: [PATCH] #获取可退款信息
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 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 f2cab9a..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;
@@ -438,6 +442,7 @@
memberRides.setRentSiteId(locks.getSiteId());
memberRides.setRentLockId(locks.getId());
memberRides.setOrdreId(goodsorder.getId());
+ memberRides.setRentDate(new Date());
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);
@@ -445,8 +450,6 @@
memberRidesMapper.insert(memberRides);
BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
}
-
-
return memberRidesDetailResponse;
}
@@ -476,7 +479,8 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曞摝锛�");
}
QueryWrapper<PricingDetail> detail = new QueryWrapper<>();
- detail.lambda().eq(PricingDetail::getPricePramId,bike.getParamId());
+ detail.lambda().eq(PricingDetail::getBikeTypeId,bike.getParamId());
+ detail.lambda().eq(PricingDetail::getPricePramId,pp.getId());
detail.lambda().eq(PricingDetail::getIsdeleted,Constants.ZERO);
detail.lambda().last(" limit 1" ) ;
//鏌ヨ浼樺厛绾ф渶楂橈紙鎺掑簭鐮佹渶灏忕殑锛夊彲鐢ㄩ厤浠锋柟妗�
@@ -489,6 +493,7 @@
holidays.setHoliday(nowDate);
holidays.setIsdeleted(Constants.ZERO);
memberRides.setBikeCode(bike.getCode());
+ memberRides.setParamId(bike.getParamId());
bike.setLastRentDate(new Date());
bike.setStatus(Constants.ONE);
bikesMapper.updateById(bike);
@@ -520,7 +525,6 @@
MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
return memberRidesDetailResponse;
-
}
/**
@@ -537,7 +541,6 @@
Locks model = dealLockAndSite(locks);
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
-
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
if(model.getStatus() == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
@@ -585,10 +588,28 @@
}
- //TODO-----JP------------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ /**
+ -----------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ *
+ */
private String getBileTypeByCode(String bikeCode) {
- int temp=1+(int)(Math.random()*(8));
- return temp+"";
+// 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) {
@@ -607,7 +628,6 @@
//鏂板閿佸ご
sitesMapper.insert(sites);
}
-
if(model == null){
//濡傛灉閿佸ご涓嶅瓨鍦紝鍒ゆ柇瀛樺偍
model = new Locks();
@@ -629,7 +649,6 @@
model.setBikeCode(locks.getBikeCode());
model.setStatus(locks.getStatus());
locksMapper.update(null, new QueryWrapper<>(model));
-
}
model.setSites(sites);
return model;
--
Gitblit v1.9.3