From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 454 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 358 insertions(+), 96 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 081c45e..ec2c3e8 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
@@ -13,6 +13,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.HttpsUtil;
+import com.doumee.core.utils.StringTools;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ActionLogMapper;
import com.doumee.dao.business.BikesMapper;
@@ -25,6 +27,7 @@
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.business.web.response.MemberRidesResponse;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.DeviceService;
@@ -40,9 +43,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.ConcurrentReferenceHashMap;
import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.ConcurrentMap;
import java.util.stream.Collectors;
/**
@@ -242,6 +247,8 @@
Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
queryWrapper
.selectAs(MemberRides::getId,MemberRidesDTO::getId)
+ .selectAs(MemberRides::getDiscountPrice,MemberRidesDTO::getDiscountPrice)
+ .selectAs(MemberRides::getType,MemberRidesDTO::getType)
.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
.selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
.selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
@@ -367,8 +374,33 @@
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(Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()));
+ String logInfo = null;
+ Bikes bike =null;
+ if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
+ //濡傛灉鏄嚜琛岃溅锛岀粦瀹氬埌铏氭嫙绔欑偣鍜岄攣澶�
+ update.setBackSiteId(collect.get(Constants.FORCE_BACK_SITE).getCode());
+ update.setBackLockId(Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()));
+ //鎻掑叆铏氭嫙閿佸ご鍜岀珯鐐逛笂-------
+ bike = new Bikes();
+ bike.setIsdeleted(Constants.ZERO);
+ bike.setCode(model.getBikeCode());
+ bike.setType(model.getType());
+ 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.setType(Constants.ZERO);
+ bike.setForceBackInfo("寮哄埗杩樿溅缁戝畾");
+ bikesMapper.insert(bike);
+ }
+ }else{
+ //濡傛灉鏄數杞︼紝璇锋眰web绔帴鍙ｅ叧闂溅杈嗕俊鎭�
+ bike = sendCloseElecBikeRequest(model.getOrdreId(),memberRides.getBikeCode());
+ }
+ logInfo = bike!=null?bike.getForceBackInfo():null;
Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
//璁＄畻楠戣璁¤垂鏃堕暱
@@ -379,21 +411,6 @@
String beforeContent = JSONObject.toJSONString(model);
//淇敼鍚�
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());
@@ -408,6 +425,7 @@
log.setObjType(Constants.ActionLogObjType.memberrides);
log.setResult(Constants.ZERO);
log.setObjId(model.getId());
+ log.setInfo(logInfo);
log.setType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
log.setContent(Constants.ACTIONLOG_TYPE.FORCE_BACK.getInfo());
log.setTitle(Constants.ACTIONLOG_TYPE.FORCE_BACK.getName());
@@ -417,84 +435,174 @@
actionLogMapper.insert(log);
}
+ /**
+ * 濡傛灉鏄數杞︼紝璇锋眰web绔帴鍙ｅ叧闂溅杈嗕俊鎭�
+ */
+ private Bikes sendCloseElecBikeRequest(String goodOrderId,String bikeCode) {
+ Bikes bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda()
+ .eq(Bikes::getType,Constants.ONE)
+ .eq(Bikes::getIsdeleted,Constants.ZERO)
+ .eq(Bikes::getCode,bikeCode)
+ );
+ if(bike == null){
+ return null;
+ }
+ bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣澶辫触锛�");
+ if(StringUtils.isNotBlank(bike.getDeviceSn())) {
+ try {
+ //璇锋眰鍦板潃
+ String url = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ELEC_BIKE_CONTRIL_API_URL).getCode();
+ JSONObject param = new JSONObject();
+ param.put("id", goodOrderId);
+ String res = HttpsUtil.postJsonString(url, param.toJSONString());
+ JSONObject json = JSONObject.parseObject(res);
+ if (json.get("code").equals("200")) {
+ //鍙戣捣鎸囦护鎴愬姛
+ bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣鎴愬姛锛�");
+ } else {
+ bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣澶辫触锛�" + json.get("msg"));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }else{
+ bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣澶辫触,鏈粦瀹氭帶鍒跺櫒sn锛�");
+ }
+ return bike;
+ }
+// private Bikes sendCloseElecBikeRequest(String bikeCode,int type) {
+// Bikes bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda()
+// .eq(Bikes::getType,Constants.ONE)
+// .eq(Bikes::getIsdeleted,Constants.ZERO)
+// .eq(Bikes::getCode,bikeCode)
+// );
+// if(bike == null){
+// return null;
+// }
+// bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣澶辫触锛�");
+// if(StringUtils.isNotBlank(bike.getDeviceSn())){
+// try {
+// //璇锋眰鍦板潃
+// String url = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ELEC_BIKE_CONTRIL_API_URL).getCode();
+// JSONObject param = new JSONObject();
+// param.put("clientId",StringTools.leftTrip(bike.getDeviceSn(),'0'));
+// param.put("type",type);//0寮�閿� 1鍏抽攣
+// String res = HttpsUtil.postJsonString(url,param.toJSONString());
+// JSONObject json = JSONObject.parseObject(res);
+// if(json.get("code").equals("200")){
+// //鍙戣捣鎸囦护鎴愬姛
+// bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣鎴愬姛锛�");
+// }else{
+// bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣澶辫触锛�"+json.get("msg"));
+// }
+// }catch (Exception e){
+// e.printStackTrace();
+// }
+// }else{
+// bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣澶辫触,鏈粦瀹氭帶鍒跺櫒sn锛�");
+// }
+// bikesMapper.updateById(bike);
+// return bike;
+// }
+ public static void main(String[] args) {
+ String url = "http://localhost:10025/jtt808/device/8500";
+ JSONObject param = new JSONObject();
+ param.put("clientId",StringTools.leftTrip("0067244400211",'0'));
+ param.put("type",0);//0寮�閿� 1鍏抽攣
+ String res = HttpsUtil.postJsonString(url,param.toJSONString());
+ System.out.println(res);
+ }
+ public ConcurrentMap<String,Integer> cacheOpenLock = new ConcurrentReferenceHashMap<>();
@Override
public MemberRidesDetailResponse openLock(String code,String memberId) {
- if(StringUtils.isBlank(code) || code.split("/").length != 2){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ョ珯鐐圭紪鍙蜂笉瀛樺湪锛岃灏濊瘯鏇存崲杞﹁締锛�");
+ if(Constants.formatIntegerNum(cacheOpenLock.get(code)) == 1){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ溅杈嗗凡琚攣瀹氬�熺敤锛岃灏濊瘯鏇存崲鍏朵粬杞﹁締锛�");
}
- //鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
- 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(), "鏈敮浠樻娂閲戯紝鏃犳硶杩涜璇ユ搷浣滐紒");
+ cacheOpenLock.put(code, 1);
+ try {
+ if(StringUtils.isBlank(code) || code.split("/").length != 2){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ョ珯鐐圭紪鍙蜂笉瀛樺湪锛岃灏濊瘯鏇存崲杞﹁締锛�");
+ }
+ //鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
+ Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
+ .eq("isdeleted", Constants.ZERO)
+ .eq("status", Constants.goodsorderStatus.pay)
+ .eq("type", Constants.ZERO)
+ .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, 4)) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
+ }
+ String[] codes = code.split("/");
+ Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>()
+ .lambda().eq(Locks::getCode, codes[1])
+ .eq(Locks::getSiteId, codes[0])
+ .eq(Locks::getIsdeleted, Constants.ZERO)
+ .last("limit 1"));
+ if (Objects.isNull(locks)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛岃绔欑偣閿佸ご鏆備笉鏀寔鍊熷嚭涓氬姟鍝︼紒");
+ }
+ //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
+ if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
+ locks =new Locks();
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
+ locks.setSiteId(codes[0]);
+ deviceService.getLockInfo(locks);
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈唦");
+ }
+ if (StringUtils.isBlank(locks.getBikeCode())) {
+ locks =new Locks();
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
+ locks.setSiteId(codes[0]);
+ locks.setId(codes[1]);
+ deviceService.getLockInfo(locks);
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
+ }
+ MemberRides memberRides = new MemberRides();
+ //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
+ isValidePricingType(locks,memberRides) ;
+ MqttLog flag = deviceService.openLock(locks);
+ MemberRidesDetailResponse memberRidesDetailResponse = new 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.getCode());
+ memberRides.setOrdreId(goodsorder.getId());
+ memberRides.setRentDate(new Date());
+ memberRides.setType(Constants.ZERO);
+ 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);
+ memberRidesMapper.insert(memberRides);
+ BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈唦");
+ }
+ return memberRidesDetailResponse;
+ }catch (BusinessException biz){
+ throw biz;
+ }catch (Exception biz){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR);
+ }finally {
+ cacheOpenLock.remove(code);
}
- //鍒ゆ柇褰撳墠鎶奸噾璁㈠崟鏄惁涓轰粖鏃ユ娂閲�
- 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(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
- }
- String[] codes = code.split("/");
- Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>()
- .lambda().eq(Locks::getCode, codes[1])
- .eq(Locks::getSiteId, codes[0])
- .eq(Locks::getIsdeleted, Constants.ZERO)
- .last("limit 1"));
- if (Objects.isNull(locks)) {
-// locks =new Locks();
-// locks.setCode(codes[1]);
-// locks.setSiteId(codes[0]);
-// deviceService.getLockInfo(locks);
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛岃绔欑偣閿佸ご鏆備笉鏀寔鍊熷嚭涓氬姟鍝︼紒");
- }
- //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
- if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
- locks =new Locks();
- locks.setCode(Constants.formatIntegerFromStr(codes[1]));
- locks.setSiteId(codes[0]);
- deviceService.getLockInfo(locks);
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈唦");
- }
- if (StringUtils.isBlank(locks.getBikeCode())) {
- locks =new Locks();
- locks.setCode(Constants.formatIntegerFromStr(codes[1]));
- locks.setSiteId(codes[0]);
- deviceService.getLockInfo(locks);
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
- }
- MemberRides memberRides = new MemberRides();
- //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
- isValidePricingType(locks,memberRides) ;
- MqttLog flag = deviceService.openLock(locks);
- MemberRidesDetailResponse memberRidesDetailResponse = new 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.getCode());
- 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);
-
- memberRidesMapper.insert(memberRides);
- BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
- }
- return memberRidesDetailResponse;
}
private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
@@ -559,6 +667,54 @@
return true;
}
+
+ public void dealMemberRidesData(String paramId,MemberRides memberRides){
+ 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::getBikeTypeId,paramId);
+ detail.lambda().eq(PricingDetail::getPricePramId,pp.getId());
+ 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);
+ }
+ }
+
@Override
public MemberRidesDetailResponse refreshLock(String id){
MemberRides memberRides = memberRidesMapper.selectById(id);
@@ -569,6 +725,107 @@
BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
return memberRidesDetailResponse;
}
+
+
+ /**
+ * 鑾峰彇杞﹁締杞﹀瀷绛夋暟鎹俊鎭�
+ */
+ @Override
+ public MemberRidesResponse getBikeChargingRule(String code,String memberId){
+ if(StringUtils.isBlank(code)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇锋壂鎻忔纭殑杞﹁締鐮�");
+ }
+ //鏌ヨ鏄惁澶勪簬楠戣涓�
+ if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1 ,4 )) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
+ }
+ Integer bikeType = Constants.ZERO;
+ //鏍规嵁鍓嶇紑鍖哄垎鏄惁涓虹數杞︿簩缁寸爜
+ if(code.startsWith(Constants.EBIKE_PREFIX)){
+ bikeType = Constants.ONE;
+ code = code.replaceFirst(Constants.EBIKE_PREFIX,"");
+ }
+ MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
+ Bikes bike= new Bikes();
+ if(Constants.equalsInteger(bikeType,Constants.ZERO)){
+ if(StringUtils.isBlank(code) || code.split("/").length != 2){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ョ珯鐐圭紪鍙蜂笉瀛樺湪锛岃灏濊瘯鏇存崲杞﹁締锛�");
+ }
+ //鍒ゆ柇鏄惁澶勪簬钀ヤ笟鏃堕棿
+ goodsorderService.checkBusiness();
+ String[] codes = code.split("/");
+
+ Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>()
+ .lambda().eq(Locks::getCode, codes[1])
+ .eq(Locks::getSiteId, codes[0])
+ .eq(Locks::getIsdeleted, Constants.ZERO)
+ .last("limit 1"));
+ if (Objects.isNull(locks)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛岃绔欑偣閿佸ご鏆備笉鏀寔鍊熷嚭涓氬姟鍝︼紒");
+ }
+ //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
+ if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
+ locks =new Locks();
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
+ locks.setSiteId(codes[0]);
+ deviceService.getLockInfo(locks);
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈唦");
+ }
+ if (StringUtils.isBlank(locks.getBikeCode())) {
+ locks =new Locks();
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
+ locks.setSiteId(codes[0]);
+ locks.setId(codes[1]);
+ deviceService.getLockInfo(locks);
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
+ }
+ bike.setLockId(locks.getCode());
+ 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(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒");
+ }
+ }else{
+ //鏌ヨ杞﹁締绫诲瀷
+ bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,code).eq(Bikes::getIsdeleted,Constants.ZERO).last(" limit 1 "));
+ if(Objects.isNull(bike)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"璇锋壂鎻忔纭殑杞﹁締鐮侊細銆愭湭鏌ヨ鍒拌溅杈嗕俊鎭��");
+ }
+ if(!Constants.equalsInteger(bike.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ溅杈嗗凡琚攣瀹氬�熺敤锛岃灏濊瘯鏇存崲鍏朵粬杞﹁締锛�");
+ }
+ if(StringUtils.isBlank(bike.getParamId())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"杞﹁締绫诲瀷寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ memberRidesResponse.setVoltageStatus(goodsorderService.getVoltageStatus(bike));
+ }
+ BaseParam baseParam = baseParamMapper.selectById(bike.getParamId());
+ if(Objects.isNull(baseParam)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"褰撳墠杞﹁締绫诲瀷鏃犳硶绉熻祦锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ memberRidesResponse.setBikeCode(bike.getCode());
+ memberRidesResponse.setBikeType(baseParam.getName());
+ memberRidesResponse.setRidesType(bikeType);
+ MemberRides memberRides = new MemberRides();
+ this.dealMemberRidesData(baseParam.getId(),memberRides);
+ memberRidesResponse.setBasePrice(memberRides.getBasePrice());
+ memberRidesResponse.setBaseTime(memberRides.getBaseTime());
+ memberRidesResponse.setUnitTime(memberRides.getUnitTime());
+ memberRidesResponse.setUnitPrice(memberRides.getUnitPrice());
+ memberRidesResponse.setPriceRole(PricingDetailServiceImpl.getRoleNameByParam(
+ memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
+ memberRidesResponse.getUnitPrice()
+ ,memberRidesResponse.getUnitTime()));
+ //鏌ヨ褰撳墠鐨勯獞琛屽椁�
+ memberRidesResponse.setDiscountMember(goodsorderService.getUseDiscount(memberId,Constants.ZERO,bikeType));
+ return memberRidesResponse;
+ }
+
+
+
+
/**
* 閿佸ご淇℃伅涓婃姤
@@ -586,7 +843,7 @@
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
- if(locks.getStatus() == Constants.LockStatus.open){
+ if(Constants.formatIntegerNum(locks.getStatus()) == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
MemberRides memberRides = new MemberRides();
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
@@ -603,7 +860,7 @@
update.setId(memberRides.getId());
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
memberRidesMapper.updateById( update);
- }else if(locks.getStatus() == Constants.LockStatus.closed ){
+ }else if(Constants.formatIntegerNum(locks.getStatus()) == Constants.LockStatus.closed ){
//濡傛灉鏄叧閿佷笟鍔★紝鍒ゆ柇瑙﹀彂杩樿溅
if(StringUtils.isNotBlank(locks.getBikeCode())){
MemberRides mbikes = new MemberRides();
@@ -639,6 +896,10 @@
@Override
public void autoRefreshLockStatus() {
+// memberRidesMapper.update(null,new UpdateWrapper<MemberRides>().lambda()
+// .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING.getKey())
+// .apply("" )
+// .set(MemberRides::getStatus, Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey()))
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -647,10 +908,10 @@
List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
if (!CollectionUtils.isEmpty(memberRides)){
memberRides.forEach(s->{
- Integer between = DateUtil.between(s.getCreateDate(), new Date());
- // 澶т簬闃堝��
- if (between > 2){
- s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
+ Integer between = DateUtil.betweenSeconds(s.getCreateDate(), new Date());
+ // 澶т簬闃堝��,鑷姩璁句负寮�閿佹垚鍔燂紙濡傚疄闄呮湭寮�閿侊紝鑱旂郴绔欑偣绠＄悊鍛樺悗鍙拌繘琛屽己鍒惰繕杞︽搷浣滐級
+ if (between >= 20){
+ s.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
s.setEditDate(new Date());
memberRidesMapper.updateById(s);
}
@@ -694,6 +955,7 @@
bikes.setEditDate(bikes.getCreateDate());
bikes.setSiteId(model.getSiteId());
bikes.setLockId(model.getCode());
+ bikes.setType(Constants.ZERO);
bikes.setCode(model.getBikeCode());
bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
bikesMapper.insert(bikes);
@@ -774,7 +1036,7 @@
if(Objects.nonNull(sites)){
Sites sites1 = new Sites();
sites1.setId(sites.getId());
- sites1.setLockNum(sites.getLockNum()+1);
+ sites1.setLockNum(Constants.formatIntegerNum(sites.getLockNum())+1);
sitesMapper.updateById(sites1);
}
}else{
--
Gitblit v1.9.3