From 82f2883865eae70d69ea0c2840598b46ca84f1a1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 18:30:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 163 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 135 insertions(+), 28 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 129fc1b..0ec50d7 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
@@ -5,6 +5,7 @@
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.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -13,6 +14,10 @@
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.BikesMapper;
+import com.doumee.dao.business.LocksMapper;
+import com.doumee.dao.business.MemberRidesMapper;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
@@ -32,6 +37,7 @@
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;
@@ -47,6 +53,12 @@
@Autowired
private MemberRidesMapper memberRidesMapper;
@Autowired
+ private HolidaysMapper holidaysMapper;
+ @Autowired
+ private PricingParamMapper pricingParamMapper;
+ @Autowired
+ private PricingDetailMapper pricingDetailMapper;
+ @Autowired
private ActionLogMapper actionLogMapper;
@Autowired
@@ -61,9 +73,11 @@
private SitesMapper sitesMapper;
@Autowired
private BikesMapper bikesMapper;
-
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Autowired
private GoodsorderService goodsorderService;
+
@Override
public String create(MemberRides memberRides) {
@@ -346,46 +360,134 @@
@Override
- public MemberRidesDetailResponse openLock(String code,String memberId){
+ 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)
+ .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 (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(),"闈炰粖鏃ユ娂閲戣鍗曪紝璇风粨绠楀悗閲嶆柊鏀粯锛�");
+ 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(),"寮�閿佸け璐�");
+ 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"));
+ if (Objects.isNull(locks)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛屾湭鏌ヨ鍒伴攣澶翠俊鎭�");
+ }
+ //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
+ if (!locks.getStatus().equals(Constants.ZERO)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠鎵爜閿佸ご鐘舵�侀敊璇紝鏃犳硶杩涜寮�閿�");
+ }
+ if (StringUtils.isBlank(locks.getBikeCode())) {
+ 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);
-
+ //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
+ isValidePricingType(locks,memberRides) ;
+ MqttLog flag = deviceService.openLock(locks);
MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
- BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
- return memberRidesDetailResponse;
+ if (flag.getResult() == 0) {
+ //瀛樺偍楠戣璁板綍
+ memberRides.setId(Constants.getUUID());
+ memberRides.setIsdeleted(Constants.ZERO);
+ memberRides.setMemberId(memberId);
+ memberRides.setCreateDate(new Date());
+ memberRides.setRentSiteId(locks.getSiteId());
+ memberRides.setRentLockId(locks.getId());
+ memberRides.setOrdreId(goodsorder.getId());
+ 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;
+ }
+
+ private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
+ Bikes bike= new Bikes();
+ bike.setLockId(locks.getId());
+ bike.setSiteId(locks.getSiteId());
+ //鏌ヨ杞﹁締淇℃伅
+ bike = bikesMapper.selectOne(new QueryWrapper<>(bike).last("limit 1"));
+ if(bike == null && StringUtils.isBlank(bike.getParamId())){
+ //濡傛灉杞﹁締绫诲瀷鏄┖
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒");
+ }
+ Date date =new Date();
+
+ QueryWrapper<PricingParam> param = new QueryWrapper<>();
+ param.lambda().eq(PricingParam::getStatus,Constants.ZERO);
+ param.lambda().eq(PricingParam::getIsdeleted,Constants.ZERO);
+ param.lambda().le(PricingParam::getStartDate,date);
+ param.lambda().ge(PricingParam::getEndDate,date);
+ param.lambda().last(" limit 1" ) ;
+ param.lambda().orderByAsc(PricingParam::getSortnum);
+ //鏌ヨ浼樺厛绾ф渶楂橈紙鎺掑簭鐮佹渶灏忕殑锛夊彲鐢ㄩ厤浠锋柟妗�
+ PricingParam pp = pricingParamMapper.selectOne(param);
+ if(pp == null){
+ //濡傛灉杞﹁締鏈缃厤浠锋柟妗堬紝鎻愮ず寮�閿佸け璐ワ紒
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曞摝锛�");
+ }
+ QueryWrapper<PricingDetail> detail = new QueryWrapper<>();
+ detail.lambda().eq(PricingDetail::getPricePramId,bike.getParamId());
+ detail.lambda().eq(PricingDetail::getIsdeleted,Constants.ZERO);
+ detail.lambda().last(" limit 1" ) ;
+ //鏌ヨ浼樺厛绾ф渶楂橈紙鎺掑簭鐮佹渶灏忕殑锛夊彲鐢ㄩ厤浠锋柟妗�
+ PricingDetail pricingDetail = pricingDetailMapper.selectOne(detail);
+ if(pricingDetail == null){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曞摝~");
+ }
+ String nowDate = DateUtil.getDateLong(date);
+ Holidays holidays = new Holidays();
+ holidays.setHoliday(nowDate);
+ holidays.setIsdeleted(Constants.ZERO);
+ //妫�鏌ユ槸鍚﹁妭鍋囨棩
+ if(holidaysMapper.selectCount(new QueryWrapper<>(holidays)) >0){
+ //濡傛灉鏄妭鍋囨棩
+ memberRides.setBasePrice(pricingDetail.getHolidayBasePrice());
+ memberRides.setBaseTime(pricingDetail.getHolidayBaseTime());
+ memberRides.setUnitPrice(pricingDetail.getHolidayUnitPrice());
+ memberRides.setUnitTime(pricingDetail.getHolidayUnitTime());
+ memberRides.setIsHoliday(Constants.ONE);
+ }else{
+ //濡傛灉鏄伐浣滄棩
+ memberRides.setBasePrice(pricingDetail.getBasePrice());
+ memberRides.setBaseTime(pricingDetail.getBaseTime());
+ memberRides.setUnitPrice(pricingDetail.getUnitPrice());
+ memberRides.setUnitTime(pricingDetail.getUnitTime());
+ memberRides.setIsHoliday(Constants.ZERO);
+ }
+ return true;
}
@Override
@@ -419,8 +521,13 @@
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
memberRides.setRentLockId(model.getId());
memberRides.setIsdeleted(Constants.ZERO);
+ memberRides = findOne(memberRides);
+ if(memberRides == null){
+ return 0;
+ }
+
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
- memberRidesMapper.update(null,new UpdateWrapper<>(memberRides));
+ memberRidesMapper.updateById( memberRides);
}
return 0;
}
--
Gitblit v1.9.3