From 697775ce76037e4ec4a2f7de59395fc873070c71 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 17:35:25 +0800
Subject: [PATCH] 修改
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 245 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 230 insertions(+), 15 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 9e40183..9a9669f 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
@@ -1,6 +1,10 @@
package com.doumee.service.business.impl;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -9,22 +13,20 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.ActionLogMapper;
-import com.doumee.dao.business.MemberRidesMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.request.MemberRidesQuery;
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.service.business.DeviceService;
+import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,7 +35,6 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
-import java.util.UUID;
/**
* 鐢ㄦ埛楠戣璁板綍琛⊿ervice瀹炵幇
@@ -48,12 +49,21 @@
@Autowired
private ActionLogMapper actionLogMapper;
-
@Autowired
private MemberRidesJoinMapper memberRidesJoinMapper;
@Autowired
private DeviceService deviceService;
+
+ @Autowired
+ private LocksMapper locksMapper;
+ @Autowired
+ private SitesMapper sitesMapper;
+ @Autowired
+ private BikesMapper bikesMapper;
+
+ @Autowired
+ private GoodsorderService goodsorderService;
@Override
public String create(MemberRides memberRides) {
@@ -103,7 +113,7 @@
@Override
public MemberRides findOne(MemberRides memberRides) {
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>(memberRides);
- return memberRidesMapper.selectOne(wrapper);
+ return memberRidesMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -156,28 +166,37 @@
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
- if (!CollectionUtils.isEmpty(bikeLogDTOIPage.getRecords())){
- bikeLogDTOIPage.getRecords().forEach(s->{
+ initBikeLogObj(bikeLogDTOIPage.getRecords());
+ return PageData.from(bikeLogDTOIPage);
+ }
+ public static List<BikeLogDTO> findBikeLogList( MemberRidesJoinMapper mrJoinMapper,MemberRidesQuery pageWrap) {
+ MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap);
+ List<BikeLogDTO> list = mrJoinMapper.selectJoinList( BikeLogDTO.class, queryWrapper);
+ initBikeLogObj(list);
+ return list;
+ }
+
+ public static void initBikeLogObj(List<BikeLogDTO> list){
+ if (!CollectionUtils.isEmpty(list)){
+ list.forEach(s->{
if (Objects.nonNull(s.getBackDate())){
s.setRideTime(DateUtil.betweenMin(s.getRentDate(),s.getBackDate()));
}
});
}
- return PageData.from(bikeLogDTOIPage);
}
-
- private MPJLambdaWrapper<MemberRides> initQueryParamByModel(MemberRidesQuery model) {
+ public static MPJLambdaWrapper<MemberRides> initQueryParamByModel(MemberRidesQuery model) {
MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(model);
queryWrapper.orderByDesc(MemberRides::getCreateDate);
queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
- .eq(BaseParam::getType, Constants.THREE)
.like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
.like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode());
queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
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)
.selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
.selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
@@ -202,10 +221,16 @@
}
return memberRides.getBikeCode();
}
+
+ /**
+ * 楠戣鏃堕暱淇敼
+ * @param memberRides
+ */
@Override
public void updateDuration(MemberRides memberRides){
LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(StringUtils.isBlank(memberRides.getMemberId())
+ ||StringUtils.isBlank(memberRides.getBackReason())
|| memberRides.getDuration() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -237,6 +262,8 @@
ActionLog log = new ActionLog();
log.setId(Constants.getUUID());
+ log.setActInfo(memberRides.getBackInfo());
+ log.setActReason(memberRides.getBackReason());
log.setIsdeleted(Constants.ZERO);
log.setCreateDate(update.getBackDate());
log.setCreator(user.getId());
@@ -310,13 +337,201 @@
log.setObjType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
log.setContent(Constants.ACTIONLOG_TYPE.FORCE_BACK.getInfo());
log.setTitle(Constants.ACTIONLOG_TYPE.FORCE_BACK.getName());
+ log.setActInfo(memberRides.getBackInfo());
+ log.setActReason(memberRides.getBackReason());
//璁板綍鎿嶄綔鏃ュ織
actionLogMapper.insert(log);
}
+ @Override
+ public MemberRidesDetailResponse openLock(String code,String memberId){
+ //鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
+ Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
+ .eq("isdeleted",Constants.ZERO)
+ .eq("status",Constants.goodsorderStatus.pay)
+ .eq("member_id",memberId)
+ .orderByDesc("create_date")
+ .last("limit 1"));
+ if(Objects.isNull(goodsorder)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈敮浠樻娂閲戯紝鏃犳硶杩涜璇ユ搷浣滐紒");
+ }
+ //鍒ゆ柇褰撳墠鎶奸噾璁㈠崟鏄惁涓轰粖鏃ユ娂閲�
+ if(!DateUtil.DateToStr(goodsorder.getPayDate(),"yyyy-MM-dd").equals(DateUtil.getDate(new Date(),"yyyy-MM-dd"))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰粖鏃ユ娂閲戣鍗曪紝璇风粨绠楀悗閲嶆柊鏀粯锛�");
+ }
+ //鍒ゆ柇鏄惁澶勪簬钀ヤ笟鏃堕棿
+ goodsorderService.checkBusiness();
+ //鏌ヨ鏄惁澶勪簬楠戣涓�
+ 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"));
+ MqttLog flag = deviceService.openLock(locks);
+ if(flag.getResult() == 0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寮�閿佸け璐�");
+ }
+ //瀛樺偍楠戣璁板綍
+ MemberRides memberRides = new MemberRides();
+ memberRides.setIsdeleted(Constants.ZERO);
+ memberRides.setMemberId(memberId);
+ memberRides.setCreateDate(new Date());
+ memberRides.setRentSiteId(locks.getSiteId());
+ memberRides.setRentLockId(locks.getId());
+ memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
+ memberRidesMapper.insert(memberRides);
+
+ MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
+ BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
+ return memberRidesDetailResponse;
+
+ }
+
+ @Override
+ public MemberRidesDetailResponse refreshLock(String id){
+ MemberRides memberRides = memberRidesMapper.selectById(id);
+ if(Objects.isNull(memberRides)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
+ BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
+ return memberRidesDetailResponse;
+
+ }
+
+ /**
+ * 閿佸ご淇℃伅涓婃姤
+ * @param locks
+ * @return
+ */
+ @Override
+ public int mqttLockInfoEvent(Locks locks){
+ //鍒ゆ柇妫�鏌ュ鐞嗙珯鐐归攣澶翠俊鎭�
+ Locks model = dealLockAndSite(locks);
+ //杞﹁締璁板綍
+ Bikes bikes = dealBikesByParam(model);
+
+ //鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
+ if(model.getStatus() == Constants.LockStatus.open){
+ //濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
+ if(StringUtils.isNotBlank(locks.getBikeCode())){
+
+ }
+ MemberRides memberRides = new MemberRides();
+ memberRides.setBikeCode(model.getBikeCode());
+ }
+ return 0;
+ }
+ private Bikes dealBikesByParam(Locks model) {
+ QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(Bikes::getLockId, model.getId());
+ wrapper.lambda().eq(Bikes::getSiteId, model.getSiteId());
+ Bikes bikes = bikesMapper.selectOne(wrapper.last("last 1"));
+ 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());
+
+ //鏇存柊鑷绔欑偣閿佸ご缁戝畾鑷杞︿俊鎭�
+ bikesMapper.updateById(bikes);
+ }
+ }else{
+ bikes = new Bikes();
+ bikes.setId(Constants.getUUID());
+ bikes.setIsdeleted(Constants.ZERO);
+ bikes.setCreateDate(new Date());
+ bikes.setSiteId(model.getSiteId());
+ bikes.setLockId(model.getId());
+ bikes.setCode(model.getBikeCode());
+ bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
+ bikesMapper.insert(bikes);
+ }
+ return bikes;
+
+ }
+
+ //TODO-----JP------------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ private String getBileTypeByCode(String bikeCode) {
+ return null;
+ }
+
+ private Locks dealLockAndSite(Locks locks) {
+ 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();
+ sites.setIsdeleted(Constants.ZERO);
+ sites.setCode(locks.getSiteId());
+ sites.setId(locks.getSiteId());
+ sites.setCreateDate(date);
+ sites.setStatus(Constants.ZERO);
+ sites.setLockNum(1);
+ //鏂板閿佸ご
+ sitesMapper.insert(sites);
+// newSite =true;
+ }
+
+ if(model == null){
+ //濡傛灉閿佸ご涓嶅瓨鍦紝鍒ゆ柇瀛樺偍
+ model = new Locks();
+ model.setId(locks.getId());
+ model.setSiteId(locks.getSiteId());
+ model.setIsdeleted(Constants.ZERO);
+ model.setCode(locks.getCode());
+ model.setSiteId(locks.getSiteId());
+ model.setBikeCode(locks.getBikeCode());
+ 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());
+ model.setId(locks.getSiteId());
+ model.setEditDate(date);
+ model.setBikeCode(locks.getBikeCode());
+ model.setStatus(locks.getStatus());
+ locksMapper.update(null, new QueryWrapper<>(model));
+
+ }
+ model.setSites(sites);
+ return model;
+ }
+
+ @Override
+ public int mqttCloseBikeEvent(MemberRides bikes){
+ return 0;
+
+ }
}
--
Gitblit v1.9.3