From f55b38102c99878a0eb9a829ee9cf3bc8a76de01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 18:16:32 +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 | 142 +++++++++++++++++++++++++++-------------------
1 files changed, 83 insertions(+), 59 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 9a9669f..df2d026 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,76 @@
@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(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
}
- //瀛樺偍楠戣璁板綍
- 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);
-
+ ;
+ 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(), "褰撳墠鎵爜閿佸ご鏃犺溅杈嗕俊鎭紝鏃犳硶杩涜寮�閿�");
+ }
+ MqttLog flag = deviceService.openLock(locks);
MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
- BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
- return memberRidesDetailResponse;
+ if (flag.getResult() == 0) {
+ //瀛樺偍楠戣璁板綍
+ MemberRides memberRides = new MemberRides();
+ 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;
}
@Override
@@ -415,13 +459,17 @@
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
if(model.getStatus() == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
- if(StringUtils.isNotBlank(locks.getBikeCode())){
-
- }
MemberRides memberRides = new MemberRides();
- memberRides.setBikeCode(model.getBikeCode());
+ 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.updateById( memberRides);
}
return 0;
}
@@ -434,11 +482,10 @@
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());
-
+ updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
+ updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
//鏇存柊鑷绔欑偣閿佸ご缁戝畾鑷杞︿俊鎭�
bikesMapper.updateById(bikes);
}
@@ -466,7 +513,6 @@
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();
@@ -478,7 +524,6 @@
sites.setLockNum(1);
//鏂板閿佸ご
sitesMapper.insert(sites);
-// newSite =true;
}
if(model == null){
@@ -493,28 +538,7 @@
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());
--
Gitblit v1.9.3