From b1c1c20ef382dd2be0f6bdf81f5d2913e749faef Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 11:12:02 +0800
Subject: [PATCH] 整理接口
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 98 insertions(+), 13 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 04d9dc4..0f68927 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;
@@ -10,21 +14,21 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ActionLogMapper;
+import com.doumee.dao.business.LocksMapper;
import com.doumee.dao.business.MemberRidesMapper;
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 +37,6 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
-import java.util.UUID;
/**
* 鐢ㄦ埛楠戣璁板綍琛⊿ervice瀹炵幇
@@ -48,12 +51,17 @@
@Autowired
private ActionLogMapper actionLogMapper;
-
@Autowired
private MemberRidesJoinMapper memberRidesJoinMapper;
@Autowired
private DeviceService deviceService;
+
+ @Autowired
+ private LocksMapper locksMapper;
+
+ @Autowired
+ private GoodsorderService goodsorderService;
@Override
public String create(MemberRides memberRides) {
@@ -103,7 +111,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 +164,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 +219,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);
}
@@ -216,6 +239,13 @@
if(Constants.formatIntegerNum(model.getStatus()) != Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()||
Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ONE){
throw new BusinessException( ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙兘閽堝宸茶繕杞︿笖鏈粨绠楃殑鏁版嵁杩涜鎿嶄綔锛�" );
+ }
+ if(Constants.formatIntegerNum(memberRides.getDuration()) == Constants.formatIntegerNum(model.getDuration())){
+ throw new BusinessException( ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏃堕暱鏈彂鐢熸敼鍙橈紝鏃犻渶淇敼锛�" );
+ }
+ int actTime = DateUtil.betweenMin(model.getRentDate(), model.getBackDate());
+ if(memberRides.getDuration() > actTime){
+ throw new BusinessException( ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璁¤垂鏃堕暱涓嶈兘瓒呰繃瀹為檯鍊熷嚭鏃堕暱锛�" );
}
MemberRides update = new MemberRides();
update.setId(model.getId());
@@ -230,6 +260,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());
@@ -303,13 +335,66 @@
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"));
+ Boolean flag = deviceService.openLock(locks);
+ if(!flag){
+ 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;
+
+ }
}
--
Gitblit v1.9.3