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 | 214 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 196 insertions(+), 18 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 3dff2f5..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
@@ -27,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;
@@ -397,7 +398,7 @@
}
}else{
//濡傛灉鏄數杞︼紝璇锋眰web绔帴鍙ｅ叧闂溅杈嗕俊鎭�
- bike = sendCloseElecBikeRequest(memberRides.getBikeCode(),Constants.ONE);
+ bike = sendCloseElecBikeRequest(model.getOrdreId(),memberRides.getBikeCode());
}
logInfo = bike!=null?bike.getForceBackInfo():null;
Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
@@ -437,7 +438,7 @@
/**
* 濡傛灉鏄數杞︼紝璇锋眰web绔帴鍙ｅ叧闂溅杈嗕俊鎭�
*/
- private Bikes sendCloseElecBikeRequest(String bikeCode,int type) {
+ 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)
@@ -447,30 +448,62 @@
return null;
}
bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣澶辫触锛�");
- if(StringUtils.isNotBlank(bike.getDeviceSn())){
+ if(StringUtils.isNotBlank(bike.getDeviceSn())) {
try {
//璇锋眰鍦板潃
- String url = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ELEC_BIKE_CONTRIL_API_URL).getCode();
+ 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());
+ param.put("id", goodOrderId);
+ String res = HttpsUtil.postJsonString(url, param.toJSONString());
JSONObject json = JSONObject.parseObject(res);
- if(json.get("code").equals("200")){
+ if (json.get("code").equals("200")) {
//鍙戣捣鎸囦护鎴愬姛
bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣鎴愬姛锛�");
- }else{
- bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣澶辫触锛�"+json.get("msg"));
+ } else {
+ bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣澶辫触锛�" + json.get("msg"));
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}else{
bike.setForceBackInfo("寮哄埗杩樿溅鍏抽棴杞﹂攣澶辫触,鏈粦瀹氭帶鍒跺櫒sn锛�");
}
- bikesMapper.updateById(bike);
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";
@@ -496,6 +529,7 @@
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"));
@@ -509,7 +543,7 @@
//鍒ゆ柇鏄惁澶勪簬钀ヤ笟鏃堕棿
goodsorderService.checkBusiness();
//鏌ヨ鏄惁澶勪簬楠戣涓�
- if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1)) > Constants.ZERO) {
+ 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("/");
@@ -519,10 +553,6 @@
.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(), "鎵爜鏃犳晥锛岃绔欑偣閿佸ご鏆備笉鏀寔鍊熷嚭涓氬姟鍝︼紒");
}
//鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
@@ -573,7 +603,6 @@
}finally {
cacheOpenLock.remove(code);
}
-
}
private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
@@ -638,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);
@@ -649,6 +726,107 @@
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;
+ }
+
+
+
+
+
/**
* 閿佸ご淇℃伅涓婃姤
* @param locks
--
Gitblit v1.9.3