From aa6febca297b0e1a68b1877fc9f41885e9fc0c7a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 16 十月 2023 15:56:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 165 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 131 insertions(+), 34 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 0ec50d7..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
@@ -25,22 +25,25 @@
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
+import com.doumee.dao.system.SystemDictDataMapper;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesService;
+import com.doumee.service.system.SystemDictDataService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
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;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 鐢ㄦ埛楠戣璁板綍琛⊿ervice瀹炵幇
@@ -72,12 +75,19 @@
@Autowired
private SitesMapper sitesMapper;
@Autowired
+ private BaseParamMapper baseParamMapper;
+ @Autowired
private BikesMapper bikesMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
+ @Lazy
private GoodsorderService goodsorderService;
+
+
+ @Autowired
+ private SystemDictDataMapper systemDictDataMapper;
@Override
public String create(MemberRides memberRides) {
@@ -168,7 +178,7 @@
MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId);
- queryWrapper.eq(MemberRides::getMemberId, id);
+ queryWrapper.eq(MemberRides::getId, id);
queryWrapper.selectAll(MemberRides.class);
queryWrapper.selectAs(BaseParam::getName,MemberRidesDTO::getBikeType) ;
queryWrapper.last("limit 1");
@@ -211,13 +221,17 @@
queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
- queryWrapper.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
+ queryWrapper
+ .selectAs(MemberRides::getId,MemberRidesDTO::getId)
+ .selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
.selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
.selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
.selectAs(MemberRides::getStatus,MemberRidesDTO::getStatus)
.selectAs(BaseParam::getName,MemberRidesDTO::getBikeType)
.selectAs(MemberRides::getDuration,MemberRidesDTO::getDuration)
.selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
+ .selectAs(MemberRides::getRentLockId,MemberRidesDTO::getRentLockId)
+ .selectAs(MemberRides::getRentSiteId,MemberRidesDTO::getRentSiteId)
.selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
return queryWrapper;
}
@@ -243,7 +257,7 @@
@Override
public void updateDuration(MemberRides memberRides){
LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(StringUtils.isBlank(memberRides.getMemberId())
+ if(StringUtils.isBlank(memberRides.getId())
||StringUtils.isBlank(memberRides.getBackReason())
|| memberRides.getDuration() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -304,10 +318,9 @@
*/
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public void forceBack(MemberRides memberRides){
+ public void forceBack(MemberRides memberRides){
LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(StringUtils.isBlank(memberRides.getMemberId())
- ||StringUtils.isBlank(memberRides.getBackReason())){
+ if(StringUtils.isBlank(memberRides.getBackReason())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
MemberRides model = findJoinById(memberRides.getId());
@@ -317,6 +330,12 @@
if(Constants.formatIntegerNum(model.getStatus()) != Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey() ){
throw new BusinessException( ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙兘閽堝鏈繕杞﹁締杩涜寮哄埗杩樿溅鎿嶄綔锛�" );
}
+ QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK));
+ List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
+ Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s));
+
MemberRides update = new MemberRides();
update.setId(model.getId());
update.setEditDate(new Date());
@@ -326,6 +345,9 @@
update.setBackReason(memberRides.getBackReason());
update.setBackUserid(user.getId());
update.setBackType(Constants.ONE);
+ update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());
+ update.setBackSiteId(collect.get(Constants.FORCE_BACK_SITE).getCode());
+ update.setBackLockId(collect.get(Constants.FORCE_BACK_LOCK).getCode());
//璁＄畻楠戣璁¤垂鏃堕暱
update.setDuration(DateUtil.betweenMin(model.getRentDate(), update.getBackDate()));
memberRidesMapper.updateById(update);
@@ -334,6 +356,20 @@
//淇敼鍚�
String after = JSONObject.toJSONString(update);
+ //鎻掑叆铏氭嫙閿佸ご鍜岀珯鐐逛笂-------
+ Bikes bike = new Bikes();
+ bike.setIsdeleted(Constants.ZERO);
+ bike.setCode(model.getBikeCode());
+ bike.setSiteId(update.getBackSiteId());
+ bike.setLockId(update.getBackLockId());
+ if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
+ bike.setId(Constants.getUUID());
+ bike.setParamId(model.getParamId());
+ bike.setLastBackDate(model.getRentDate());
+ bike.setStatus(Constants.ZERO);
+ bike.setInfo("寮哄埗杩樿溅缁戝畾");
+ bikesMapper.insert(bike);
+ }
ActionLog log = new ActionLog();
log.setId(Constants.getUUID());
@@ -406,30 +442,14 @@
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);
- //涓存椂浣跨敤
- Bikes bikes = bikesMapper.selectById(locks.getBikeCode());
- if (Objects.isNull(bikes)) {
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌鑷杞︿俊鎭�");
- }
- memberRides.setBikeCode(bikes.getId());
- memberRides.setParamId(bikes.getParamId());
- memberRides.setRentSiteId(locks.getSiteId());
- memberRides.setRentLockId(locks.getId());
- memberRides.setRentDate(new Date());
- memberRides.setBasePrice(new BigDecimal(3990L));
- memberRides.setBaseTime(1800);
- memberRides.setUnitTime(600);
- memberRides.setUnitPrice(new BigDecimal(1000L));
-
memberRidesMapper.insert(memberRides);
BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
}
-
-
return memberRidesDetailResponse;
}
@@ -459,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" ) ;
//鏌ヨ浼樺厛绾ф渶楂橈紙鎺掑簭鐮佹渶灏忕殑锛夊彲鐢ㄩ厤浠锋柟妗�
@@ -471,6 +492,11 @@
Holidays holidays = new Holidays();
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);
//妫�鏌ユ槸鍚﹁妭鍋囨棩
if(holidaysMapper.selectCount(new QueryWrapper<>(holidays)) >0){
//濡傛灉鏄妭鍋囨棩
@@ -499,7 +525,6 @@
MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
return memberRidesDetailResponse;
-
}
/**
@@ -509,11 +534,13 @@
*/
@Override
public int mqttLockInfoEvent(Locks locks){
+ if(StringUtils.isBlank(locks.getId()) ||StringUtils.isBlank(locks.getSiteId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閿佸ご淇℃伅涓婃姤鍙傛暟閿欒锛�");
+ }
//鍒ゆ柇妫�鏌ュ鐞嗙珯鐐归攣澶翠俊鎭�
Locks model = dealLockAndSite(locks);
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
-
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
if(model.getStatus() == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
@@ -525,7 +552,6 @@
if(memberRides == null){
return 0;
}
-
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
memberRidesMapper.updateById( memberRides);
}
@@ -562,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) {
@@ -583,7 +628,6 @@
//鏂板閿佸ご
sitesMapper.insert(sites);
}
-
if(model == null){
//濡傛灉閿佸ご涓嶅瓨鍦紝鍒ゆ柇瀛樺偍
model = new Locks();
@@ -605,15 +649,68 @@
model.setBikeCode(locks.getBikeCode());
model.setStatus(locks.getStatus());
locksMapper.update(null, new QueryWrapper<>(model));
-
}
model.setSites(sites);
return model;
}
+ /**
+ * 杩樿溅璁㈤槄娑堟伅涓氬姟澶勭悊
+ * @param bikes
+ * @return
+ */
@Override
public int mqttCloseBikeEvent(MemberRides bikes){
+ //鍏嶈垂楠戣鏃堕暱鏌ヨ锛屾暟鎹瓧鍏搁厤缃�
+ 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<>();
+ wrapper.lambda().eq(MemberRides::getBikeCode, bikes.getBikeCode());
+ wrapper.lambda().eq(MemberRides::getStatus, Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+ wrapper.lambda().eq(MemberRides::getIsdeleted, Constants.ZERO);
+ //鏍规嵁杞﹁締缂栫爜鏌ヨ楠戣涓殑楠戣璁板綍淇℃伅锛屽鏋滄湁杩涜杩樿溅鎿嶄綔
+ MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("last 1"));
+ if(memberRides!=null){
+ //杩涜
+ dealMemberRidesBack(memberRides,bikes);
+ }
return 0;
+ }
+ private void dealMemberRidesBack(MemberRides memberRides,MemberRides param) {
+ int freeTime = 0;
+ try {
+ freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
+ }catch (Exception e){
+ }
+ Date date = new Date();
+ MemberRides update = new MemberRides();
+ update.setEditDate(date);
+ update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());
+ update.setBackDate(date);
+ update.setBackLockId(param.getBackLockId());
+ update.setBackSiteId(param.getBackSiteId());
+ update.setBackCommondId(param.getBackCommondId());
+ int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
+ update.setDuration(duration>0?duration:0);
+ update.setBackType(Constants.ONE);
+ update.setBackInfo("鐢ㄦ埛姝ｅ父杩樿溅");
+
+ Bikes bikes = new Bikes();
+ bikes.setSiteId(memberRides.getBackSiteId());
+ bikes.setLockId(memberRides.getBackLockId());
+// bikes.setCode(memberRides.getBikeCode());
+ bikes = bikesMapper.selectById(new QueryWrapper<>(bikes).last("limit 1"));
+ if(bikes != null ) {
+ UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().set(Bikes::getId, bikes.getId());
+ updateWrapper.lambda().set(Bikes::getEditDate,new Date());
+ updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
+ //鏇存柊鑷杞︽渶鍚庤繕杞︽椂闂�
+ bikesMapper.updateById(bikes);
+ }
+ //鏇存柊杩樿溅璁板綍涓哄凡杩樿溅
+ memberRidesMapper.updateById(update);
}
}
--
Gitblit v1.9.3