From 18cf2f252338e52fb531cd2ca1cc49e39bf6efe0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 19 二月 2025 18:50:50 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java | 8
server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java | 10
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 40 +++
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 3
server/services/src/main/java/com/doumee/dao/business/DiscountMemberMapper.java | 3
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 149 +++++++++++
server/services/src/main/java/com/doumee/core/constants/Constants.java | 3
server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java | 255 +++++++++++++++++++-
server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java | 12 +
server/services/src/main/java/com/doumee/service/business/MemberRidesService.java | 4
server/services/src/main/java/com/doumee/dao/business/web/request/OpenElecBikeRequest.java | 23 +
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 159 ++++++++++++-
server/platform/src/main/resources/application.yml | 2
server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java | 7
14 files changed, 630 insertions(+), 48 deletions(-)
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index 495699e..f9ad69d 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# application:
# name: parkbike
profiles:
- active: pro
+ active: dev
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 2e621be..037071c 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -34,6 +34,7 @@
public static final String MINI_PROGRAMME ="MINI_PROGRAMME" ;
public static final String FREE_RENT_TIME ="FREE_RENT_TIME" ;
+ public static final String LOW_VOLTAGE ="LOW_VOLTAGE" ;
public static final String ACCESS_TOKEN ="ACCESS_TOKEN" ;
public static final String IMG_DIR = "IMG_DIR";
public static final String FILE_DIR ="FILE_DIR" ;
@@ -220,6 +221,8 @@
public static final String BUSINESS_STARTTIME = "BUSINESS_STARTTIME";
//灏忕▼搴忔瘡鏃ユ湇鍔＄粨鏉熸椂闂�
public static final String BUSINESS_ENDTIME = "BUSINESS_ENDTIME";
+ //鐢佃溅浜岀淮鐮佸墠缂�
+ public static final String ELECTRICITY_PREFIX = "ELECTRICITY_PREFIX";
//閽夐拤閫氱煡鍦板潃
public static final String DINGDING_URL = "DINGDING_URL";
diff --git a/server/services/src/main/java/com/doumee/dao/business/DiscountMemberMapper.java b/server/services/src/main/java/com/doumee/dao/business/DiscountMemberMapper.java
index 664aa29..3ad1fc7 100644
--- a/server/services/src/main/java/com/doumee/dao/business/DiscountMemberMapper.java
+++ b/server/services/src/main/java/com/doumee/dao/business/DiscountMemberMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.DiscountMember;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
/**
* @author 姹熻箘韫�
* @date 2025/02/17 09:43
*/
-public interface DiscountMemberMapper extends BaseMapper<DiscountMember> {
+public interface DiscountMemberMapper extends MPJJoinMapper<DiscountMember> {
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java b/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
index 91e765e..f81fa77 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
@@ -146,6 +146,14 @@
@TableField(exist = false)
private Integer useTimes;
+ @ApiModelProperty(value = "浣跨敤鏃堕暱")
+ @TableField(exist = false)
+ private Integer useTime;
+
+ @ApiModelProperty(value = "鍓╀綑鏃堕暱",hidden = true)
+ @TableField(exist = false)
+ private Integer surplusTime;
+
@ApiModelProperty(value = "楠戣璁板綍")
@TableField(exist = false)
private List<DiscountLog> discountLogList;
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/OpenElecBikeRequest.java b/server/services/src/main/java/com/doumee/dao/business/web/request/OpenElecBikeRequest.java
new file mode 100644
index 0000000..d6ba01d
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/OpenElecBikeRequest.java
@@ -0,0 +1,23 @@
+package com.doumee.dao.business.web.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/10/9 11:04
+ */
+@Data
+@ApiModel("鐢佃溅寮�閿佽姹傚弬鏁�")
+public class OpenElecBikeRequest {
+
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級",hidden = true)
+ private String memberId;
+
+ @ApiModelProperty(value = "杞﹁締缂栧彿")
+ private String code;
+
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
index b8d9078..a9fb0b5 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.business.model.DiscountMember;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -43,11 +44,18 @@
@ApiModelProperty(value = "璁′环瑙勫垯")
private String priceRole;
+
@ApiModelProperty(value = "杞﹀瀷")
private String bikeType;
@ApiModelProperty(value = "缂栧彿")
private String bikeCode;
+
+ @ApiModelProperty(value = "璁㈠崟绫诲瀷锛�0=鑷杞﹁鍗曪紱1=鐢佃溅璁㈠崟")
+ private Integer ridesType;
+
+ @ApiModelProperty(value = "鐢甸噺鐘舵�侊細0=鐢甸噺鍏呰冻锛�1=鐢甸噺浣�")
+ private Integer voltageStatus;
@ApiModelProperty(value = "璧锋浠�", example = "1")
private BigDecimal basePrice;
@@ -63,4 +71,8 @@
@ApiModelProperty(value = "楠戣璁板綍涓婚敭")
private String rideId;
+
+ @ApiModelProperty(value = "濂楅鍗′俊鎭�")
+ private DiscountMember discountMember;
+
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java
index 38fb132..ff943c2 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java
@@ -29,6 +29,13 @@
@ApiModelProperty(value = "璁¤垂鏃堕暱")
private Integer duration;
+ @ApiModelProperty(value = "鏄惁瀛樺湪楠戣鍗℃姷鎵�:0=鍚︼紱1=鏄紱")
+ private Integer haveDisCount;
+
+ @ApiModelProperty(value = "鎶垫墸閲戦")
+ private BigDecimal disCountMoney;
+
+
@ApiModelProperty(value = "楠戣璁板綍")
private List<MemberRidesResponse> memberRidesResponseList;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
index dc989d6..ff655b5 100644
--- a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -151,6 +151,7 @@
*/
GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
+ Integer getVoltageStatus(Bikes bikes);
/**
* 濂楅鍗¤鍗曡鎯�
* @param id
@@ -159,7 +160,6 @@
GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
/**
* 寮哄埗缁撶畻璁㈠崟
- * @param id
* @return
*/
void closeGoodsorder(Goodsorder order,int type );
@@ -169,7 +169,6 @@
/**
* 閫�娆�
- * @param orderId
*/
void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
List<MemberRides> getMemberRidesForClose(String orderid );
diff --git a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
index bd381c4..294c6fc 100644
--- a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
@@ -9,6 +9,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 java.util.List;
@@ -132,6 +133,9 @@
* @return
*/
MemberRidesDetailResponse refreshLock(String id);
+
+ MemberRidesResponse getBikeChargingRule(String code, String memberId);
+
void updateDuration(MemberRides memberRides);
void forceBack(MemberRides memberRides);
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java
index 7c88851..6e6895b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java
@@ -73,7 +73,7 @@
|| StringUtils.isBlank(discount.getName())
|| Objects.isNull(discount.getType())
|| Objects.isNull(discount.getLimitType())
- || (Constants.equalsInteger(discount.getLimitTime(),Constants.ONE) && Objects.isNull(discount.getLimitTime()))
+ || (Constants.equalsInteger(discount.getLimitTime(),Constants.ONE) && (Objects.isNull(discount.getLimitTime()) || discount.getLimitTime() > 1440))
|| Objects.isNull(discount.getPrice()) || discount.getPrice().compareTo(BigDecimal.ZERO) <= Constants.ZERO
|| Objects.isNull(discount.getChannel())
|| Objects.isNull(discount.getStartDate())
@@ -85,17 +85,14 @@
|| (Objects.isNull(discount.getUseHoliday()) || Objects.isNull(discount.getUseWorkday()) )
|| (Objects.isNull(discount.getIsbike()) || Objects.isNull(discount.getIselecbike()) )
){
- throw new BusinessException(ResponseStatus.SERVER_ERROR);
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
if(discount.getStartDate().getTime()>discount.getEndDate().getTime()){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閿�鍞椂娈典俊鎭敊璇�");
}
//鍥哄畾鏃ユ湡鐢熸晥
if(Constants.equalsInteger(discount.getUseType(),Constants.ZERO) &&
- ( discount.getUseStartDate().getTime()>discount.getUseEndDate().getTime() ||
- discount.getUseStartDate().getTime() < discount.getStartDate().getTime() ||
- discount.getUseEndDate().getTime() > discount.getEndDate().getTime()
- ) ){
+ ( discount.getUseStartDate().getTime()>discount.getUseEndDate().getTime()) ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浣跨敤鏃舵淇℃伅閿欒");
}
@@ -165,6 +162,7 @@
@Override
public Discount findById(String id) {
Discount discount = discountJoinMapper.selectOne(new MPJLambdaWrapper<Discount>()
+ .selectAll(Discount.class)
.select(" (select count(1) from goodsorder g where g.obj_type = 0 and g.obj_id = t.id and g.pay_status = 1 ) ",Discount::getSaleNum)
.leftJoin(SystemUser.class,SystemUser::getId,Discount::getCreator)
.eq(Discount::getId,id)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index d9771e0..81955cc 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -92,6 +92,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private BikesMapper bikesMapper;
+
@Autowired
@@ -121,6 +124,10 @@
@Autowired
RefundService refundService;
+
+ @Autowired
+ private HolidaysMapper holidaysMapper;
+
@Override
public String create(Goodsorder goodsorder) {
@@ -346,16 +353,11 @@
}
-
-
-
@Override
public long count(Goodsorder goodsorder) {
QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
return goodsorderMapper.selectCount(wrapper);
}
-
-
@Override
public HomeResponse getHome(String memberId){
@@ -373,6 +375,7 @@
homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
homeResponse.setIsBusiness(this.checkBusiness()?0:1);
homeResponse.setUnBusinessTips("钀ヤ笟鏃堕棿涓�"+ systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode() +" ~ "+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode()+"锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
+
homeResponse.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
.eq("isdeleted",Constants.ZERO)
.eq("status",Constants.ZERO)
@@ -423,13 +426,14 @@
.ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
.orderByDesc(MemberRides::getCreateDate)
.last(" limit 1 "));
- if (!Objects.isNull(memberRides)) {
+ if (Objects.nonNull(memberRides)) {
homeResponse.setRideStatus(memberRides.getStatus());
MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
if(!Objects.isNull(baseParam)){
memberRidesResponse.setBikeType(baseParam.getName());
}
+ memberRidesResponse.setRidesType(memberRides.getType());
memberRidesResponse.setRideId(memberRides.getId());
memberRidesResponse.setRideStartTime(memberRides.getRentDate());
memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
@@ -445,13 +449,27 @@
memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
memberRidesResponse.getUnitPrice()
,memberRidesResponse.getUnitTime()));
+ if(Constants.equalsInteger(memberRides.getType(),Constants.ONE)){
+ Bikes bikes = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,memberRides.getBikeCode()).eq(Bikes::getType,Constants.ONE).last("limit 1"));
+ memberRidesResponse.setVoltageStatus(this.getVoltageStatus(bikes));
+ }
+ //鏌ヨ褰撳墠鐨勯獞琛屽椁�
+ memberRidesResponse.setDiscountMember(this.getUseDiscount(memberId,Constants.ZERO));
homeResponse.setMemberRidesResponse(memberRidesResponse);
}
}
}
-
-
return homeResponse;
+ }
+
+ @Override
+ public Integer getVoltageStatus(Bikes bikes){
+ //浣庣數閲忕數鍘�
+ BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.LOW_VOLTAGE).getCode());
+ if(Objects.isNull(bikes)||Objects.isNull(bikes.getVoltage())||Objects.isNull(lowVoltage)){
+ return 0;
+ }
+ return bikes.getVoltage().compareTo(lowVoltage)>0?0:1;
}
@@ -596,7 +614,7 @@
freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
}catch (Exception e){
}
- closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney()).getAmount();
+ closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney(),goodsorder.getMemberId()).getAmount();
//瀹為檯缁撶畻浠锋牸锛岃褰曞湪鏈�楂樿溅鍨嬭褰曚笂
// memberRides.get(0).setActualPrice(closeMoney);
}
@@ -818,11 +836,13 @@
transactionsMapper.insert(transactions);
}
- private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney) {
+ private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney,String memberId) {
RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
+ ridesDetailResponse.setHaveDisCount(Constants.ZERO);
BigDecimal closeMoney = new BigDecimal(0.00);
int durationSum = 0;
MemberRides topRides =null;
+
//鍙栨渶楂樿溅鍨嬭绠楁柟妗堢粨绠楄鍗�
for(MemberRides rides : memberRides){
if ( isClose && Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(rides.getStatus()))){
@@ -836,7 +856,8 @@
}
}
}
-// MemberRides topRides =memberRides.get(0);
+
+ //璁＄畻搴斾粯閲戦
if( topRides != null){
int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
@@ -850,6 +871,49 @@
}
}
topRides.setActualPrice(closeMoney);
+ }
+ //鏌ヨ鏄惁瀛樺湪濂楅淇℃伅
+ DiscountMember discountMember = this.getUseDiscount(memberId,durationSum);
+ //璁＄畻鎶垫墸閲戦
+ if(Objects.nonNull(discountMember) && discountMember.getSurplusTime() > Constants.ZERO && Objects.nonNull(topRides)){
+ //瀛樺偍鎶垫墸璁板綍
+ DiscountLog discountLog = new DiscountLog();
+ discountLog.setIsdeleted(Constants.ZERO);
+ discountLog.setCreator(memberId);
+ discountLog.setCreateDate(new Date());
+ discountLog.setDiscountMemberId(discountMember.getId());
+ discountLog.setType(Constants.ZERO);
+ discountLog.setInfo("楠戣鎶垫墸");
+ discountLog.setEditInfo("楠戣鎶垫墸");
+ discountLog.setGoodsorderId(topRides.getOrdreId());
+ //濡傛灉楠戣鏃堕棿灏忎簬绛変簬鍓╀綑鏃堕棿 鍒欑洿鎺ユ坊鍔� 楠戣鍗′娇鐢ㄦ暟鎹� 淇瀹為檯鏀粯閲戦
+ if(discountMember.getSurplusTime() >= durationSum){
+ discountLog.setRideTime(durationSum);
+ discountLog.setRidePrice(closeMoney);
+ discountLogMapper.insert(discountLog);
+ topRides.setActualPrice(BigDecimal.ZERO);
+ closeMoney = BigDecimal.ZERO;
+ }else{
+ int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
+ BigDecimal closeDisCountMoney = Constants.formatDecimalNum(topRides.getBasePrice());
+ //濡傛灉鏄竴鍙ｄ环鏂瑰紡锛屼环鏍肩洿鎺ヤ负涓�鍙ｄ环baseMoney,濡傛灉涓嶆槸璁＄畻姝ｅ父浠锋牸
+ Integer durationDisCountSum = durationSum - discountMember.getSurplusTime();
+ discountLog.setRideTime(discountMember.getSurplusTime());
+ if(baseTime != -1){//涓嶆槸涓�鍙ｄ环
+ if(durationDisCountSum > baseTime && Constants.formatIntegerNum(topRides.getUnitTime())>0){
+ //濡傛灉瓒呭嚭浜嗚捣姝ヤ环鏍硷紝璁＄畻瓒呭嚭浠锋牸
+ BigDecimal unit = new BigDecimal(durationSum-baseTime).divide(new BigDecimal(topRides.getUnitTime()), 0, BigDecimal.ROUND_UP);
+ //璁＄畻閲戦绱瓒呭嚭閮ㄩ棬浠锋牸锛堣秴鍑烘椂闂村崟浣�*瓒呭嚭鍗曚綅鏃堕棿浠锋牸锛�
+ closeDisCountMoney = closeDisCountMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
+ }
+ discountLog.setRidePrice(closeMoney.subtract(closeDisCountMoney));
+ }else{
+ discountLog.setRidePrice(BigDecimal.ZERO);
+ }
+ }
+ discountLogMapper.insert(discountLog);
+ ridesDetailResponse.setHaveDisCount(Constants.ONE);
+ ridesDetailResponse.setDisCountMoney(discountLog.getRidePrice());
}
//濡傛灉璁㈠崟浠锋牸灏侀《浜嗭紝鍙栬鍗� 浠锋牸
if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
@@ -1082,7 +1146,7 @@
return memberRidesResponse;
}).collect(Collectors.toList());
//绱鍜岄绠楃粨绠楅噾棰�
- RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney());
+ RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney(),goodsorder.getMemberId());
if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
//濡傛灉闈炲凡鏀粯浣嗘湭缁撶畻锛屼娇鐢ㄨ鍗曢噾棰�
ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
@@ -1494,4 +1558,75 @@
}
+ /**
+ * 鑾峰彇褰撳墠鍙娇鐢ㄧ殑濂楅
+ * @param memberId
+ */
+ public DiscountMember getUseDiscount(String memberId,Integer driveTime){
+ String today = DateUtil.getToday();
+ //鍒ゆ柇浠婂ぉ鏄惁涓鸿妭鍋囨棩
+ Holidays holidays = new Holidays();
+ holidays.setHoliday(today);
+ holidays.setIsdeleted(Constants.ZERO);
+ //鏄惁鏄妭鍋囨棩 1=鏄紱0=鍚�
+ Integer holiday = holidaysMapper.selectCount(new QueryWrapper<>(holidays))>0?1:0;
+ List<DiscountMember> discountMemberList = discountMemberMapper.selectJoinList(DiscountMember.class,new MPJLambdaWrapper<DiscountMember>()
+ .selectAll(DiscountMember.class)
+ .select(" select sum(d.ride_time) from discount_log d where and d.discount_member_id = discount_member.id " +
+ "and d.isdeleted = 0 and d.type = 0 and EXTRACT(DAY FROM d.create_date) = EXTRACT(DAY FROM CURRENT_DATE) " , DiscountMember::getUseTime)//鏌ヨ浠婃棩宸蹭娇鐢ㄦ椂闂�
+ .eq(DiscountMember::getStatus,Constants.ZERO)
+ .eq(DiscountMember::getMemberId,memberId)
+ .ge(DiscountMember::getUseStartDate, Utils.Date.getStart(DateUtil.StringToDate(today)))
+ .le(DiscountMember::getUseEndDate, Utils.Date.getEnd(DateUtil.StringToDate(today)))
+ .eq(Constants.equalsInteger(holiday,Constants.ONE),DiscountMember::getUseHoliday,Constants.ONE)
+ .orderByDesc(DiscountMember::getLimitType)
+ .orderByDesc(DiscountMember::getLimitTime)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(discountMemberList)){
+ //鏌ョ湅鏄惁鏈夋棤鏈熼檺鐨勫椁� 濡傛灉瀛樺湪 鍒欑洿鎺ヨ繑鍥炴棤鏈熼檺鐨勫椁�
+ Optional<DiscountMember> optional = discountMemberList.stream().filter(i->Constants.equalsInteger(i.getLimitType(),Constants.ZERO)).findAny();
+ if(optional.isPresent()){
+ return optional.get();
+ }
+ //澶勭悊鍓╀綑鏃堕棿
+ for (DiscountMember discountMember:discountMemberList) {
+ if(Objects.isNull(discountMember.getUseTime())){
+ discountMember.setSurplusTime(discountMember.getLimitTime());
+ }else if(discountMember.getUseTime()>=discountMember.getLimitTime()){
+ discountMember.setSurplusTime(0);
+ }else{
+ discountMember.setSurplusTime(discountMember.getLimitTime() - discountMember.getUseTime());
+ }
+ }
+ //楠戣涓� 鏄剧ず鍓╀綑鏃堕棿鏈�澶х殑
+ if(Constants.equalsInteger(driveTime,Constants.ZERO)){
+ List<DiscountMember> list = discountMemberList.stream().filter(i->i.getSurplusTime()>0).collect(Collectors.toList());
+ if(list.size()>Constants.ZERO){
+ //d1鍦ㄥ墠鍒欏崌搴� 鍙嶄箣闄嶅簭
+ list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
+ }
+ return list.get(Constants.ZERO);
+ }else{
+ //鏃犳棤鏈熼檺鐨勫椁� 浼樺厛鏌ヨ鍓╀綑鏃堕暱澶т簬楠戣鏃堕暱鐨勪俊鎭�(鍙栨椂闂存渶灏忕殑濂楅) 鍐嶆煡璇㈠皬浜庨獞琛屾椂闀跨殑濂楅
+ List<DiscountMember> list = discountMemberList.stream().filter(i->i.getSurplusTime()>=driveTime).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
+ if(list.size()>Constants.ZERO){
+ //d1鍦ㄥ墠鍒欏崌搴� 鍙嶄箣闄嶅簭
+ list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
+ }
+ return list.get(Constants.ZERO);
+ }
+ list = discountMemberList.stream().filter(i->i.getSurplusTime()<driveTime).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
+ if(list.size()>Constants.ZERO){
+ list.sort((d1,d2)-> Integer.compare(d1.getSurplusTime(),d2.getSurplusTime()));
+ }
+ return list.get(Constants.ZERO);
+ }
+ }
+ }
+ return null;
+ }
+
+
}
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..9967282 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;
@@ -509,7 +510,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 +520,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 +570,6 @@
}finally {
cacheOpenLock.remove(code);
}
-
}
private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
@@ -638,6 +634,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 +693,99 @@
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(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.ELECTRICITY_PREFIX).getCode())){
+ bikeType = Constants.ONE;
+ }
+ 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(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(),"褰撳墠杞﹁締绫诲瀷鏃犳硶绉熻祦锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ MemberRides memberRides = new MemberRides();
+ this.dealMemberRidesData(baseParam.getId(),memberRides);
+ memberRidesResponse.setBikeCode(memberRides.getBikeCode());
+ 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()));
+ return memberRidesResponse;
+ }
+
+
+
+
+
/**
* 閿佸ご淇℃伅涓婃姤
* @param locks
diff --git a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
index e1fd075..8aa7b36 100644
--- a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
@@ -11,9 +11,11 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.request.BackElecBikeRequest;
+import com.doumee.dao.business.web.request.OpenElecBikeRequest;
import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
+import com.doumee.dao.business.web.response.MemberRidesResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.jtt808.web.service.Jtt808Service;
@@ -185,6 +187,20 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+ @PreventRepeat
+ @LoginRequired
+ @ApiOperation(value = "鎵爜鑾峰彇杞﹁締淇℃伅", notes = "灏忕▼搴忕")
+ @GetMapping("/getBikeChargingRule")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "閿佸ご鐮併�佺數杞︾爜", required = true)
+ })
+ public ApiResponse<MemberRidesResponse> getBikeChargingRule(@RequestParam String code) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",memberRidesService.getBikeChargingRule(code,getMemberId()));
+ }
+
+
@PreventRepeat
@LoginRequired
@ApiOperation(value = "鎵爜瑙ｉ攣", notes = "灏忕▼搴忕")
@@ -232,6 +248,7 @@
return ApiResponse.success("鏌ヨ鎴愬姛",systemDictDataBiz.queryByCode(dicCode,label));
}
+ @LoginRequired
@ApiOperation(value = "鐢佃溅绔欑偣杩樿溅", notes = "鐢佃溅绔欑偣杩樿溅")
@PostMapping("/backElecBike")
public ApiResponse backElecBike(@RequestBody BackElecBikeRequest param) {
@@ -239,6 +256,8 @@
jtt808Service.backElecBike(param);
return ApiResponse.success( null);
}
+
+ @LoginRequired
@ApiOperation(value = "鐢佃溅涓存椂鍋滆溅", notes = "鐢佃溅涓存椂鍋滆溅")
@PostMapping("/pauseElecBike")
public ApiResponse pauseElecBike(@RequestBody BackElecBikeRequest param) {
@@ -246,4 +265,25 @@
jtt808Service.pauseElecBike(param);
return ApiResponse.success( null);
}
+
+
+ @LoginRequired
+ @ApiOperation(value = "鐢佃溅寮�閿�", notes = "鐢佃溅寮�閿�")
+ @PostMapping("/openElecBike")
+ public ApiResponse openElecBike(@RequestBody OpenElecBikeRequest param) {
+ param.setMemberId(getMemberId());
+ jtt808Service.openLock(param);
+ return ApiResponse.success( null);
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "涓村仠寮�閿�", notes = "涓村仠寮�閿�")
+ @PostMapping("/pauseOpenElecBike")
+ public ApiResponse pauseOpenElecBike(@RequestBody BackElecBikeRequest param) {
+ param.setMemberId(getMemberId());
+ jtt808Service.pauseOpenElecBike(param);
+ return ApiResponse.success( null);
+ }
+
+
}
diff --git a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
index b22e0eb..ad6648b 100644
--- a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
@@ -20,14 +20,18 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.request.BackElecBikeRequest;
import com.doumee.dao.business.web.request.LocaltionDTO;
+import com.doumee.dao.business.web.request.OpenElecBikeRequest;
+import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.jtt808.web.endpoint.MessageManager;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.PricingRuleService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ConcurrentReferenceHashMap;
import org.springframework.web.bind.annotation.RequestBody;
import org.yzh.commons.model.APIResult;
import org.yzh.protocol.commons.transform.AttributeKey;
@@ -42,6 +46,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.concurrent.ConcurrentMap;
@Service
public class Jtt808Service {
@@ -53,40 +58,26 @@
private BikesMapper bikesMapper;
@Autowired
- private DiscountMemberMapper discountMemberMapper;
-
- @Autowired
- private DiscountLogMapper discountLogMapper;
-
- @Autowired
- GoodsorderJoinMapper goodsorderJoinMapper;
-
- @Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private MemberMapper memberMapper;
- @Autowired
- private BaseParamMapper baseParamMapper;
- @Autowired
- private RefundMapper refundMapper;
-
- @Autowired
- private RefundJoinMapper refundJoinMapper;
@Autowired
private SitesMapper sitesMapper;
@Autowired
private MemberRidesJoinMapper memberRidesJoinMapper;
- @Autowired
- private AdMapper adMapper;
@Autowired
- private TransactionsMapper transactionsMapper;
+ private PricingParamMapper pricingParamMapper;
@Autowired
- private WxMiniUtilService wxMiniUtilService;
+ private PricingDetailMapper pricingDetailMapper;
+
+ @Autowired
+ private HolidaysMapper holidaysMapper;
+
@Autowired
PricingRuleService pricingRuleService;
@@ -253,6 +244,7 @@
memberRidesJoinMapper.updateById(memberRides);//鏇存柊楠戣鐘舵�佷负涓村仠涓�
}
+
private void checkPausePostionBiz(Bikes bike) {
int ruleType = 0;
try {
@@ -326,4 +318,227 @@
.eq(Bikes::getId,bikes.getId()));
}
}
+
+ public ConcurrentMap<String,Integer> cacheOpenLock = new ConcurrentReferenceHashMap<>();
+
+
+ @Transactional(rollbackFor = {BusinessException.class})
+ public MemberRidesDetailResponse openLock(OpenElecBikeRequest openElecBikeRequest){
+ Member member = memberMapper.selectById(openElecBikeRequest.getMemberId());
+ if (member == null) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿淇℃伅鏌ヨ澶辫触锛岃杩斿洖閲嶆柊杩涘叆灏忕▼搴忓啀璇曪紒");
+ }
+ if(Constants.formatIntegerNum(cacheOpenLock.get(openElecBikeRequest.getCode())) == 1){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ溅杈嗗凡琚攣瀹氬�熺敤锛岃灏濊瘯鏇存崲鍏朵粬杞﹁締锛�");
+ }
+ Bikes bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,openElecBikeRequest.getCode()).eq(Bikes::getIsdeleted,Constants.ZERO)
+ .eq(Bikes::getType,Constants.ONE).last(" limit 1 "));
+ if(bike == null && StringUtils.isBlank(bike.getParamId())){
+ //濡傛灉杞﹁締绫诲瀷鏄┖
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒");
+ }
+ cacheOpenLock.put(bike.getCode(), 1);
+ try {
+ //鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
+ Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
+ .eq("isdeleted", Constants.ZERO)
+ .eq("status", Constants.goodsorderStatus.pay)
+ .eq("member_id", member.getId())
+ .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(), "闈炰粖鏃ユ娂閲戣鍗曪紝璇风粨绠楀悗閲嶆柊鏀粯锛�");
+ }
+ //鏄惁瀛樺湪鍏朵粬楠戣璁板綍
+ if (memberRidesJoinMapper.selectCount(new QueryWrapper<MemberRides>().lambda().eq(MemberRides::getOrdreId,goodsorder.getId())) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "宸查獞琛屽叾浠栬溅杈嗭紝鏃犳硶鎵爜锛岃缁撶畻鍚庨噸鏂板皾璇�");
+ }
+ //鍒ゆ柇鏄惁澶勪簬钀ヤ笟鏃堕棿
+ goodsorderService.checkBusiness();
+ //鏌ヨ鏄惁澶勪簬楠戣涓�
+ if (memberRidesJoinMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", member.getId()).in("status", 0, 1, 4)) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪楠戣涓溅杈嗭紝鏃犳硶鎵爜");
+ }
+ MemberRides memberRides = new MemberRides();
+ //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
+ isValidePricingType(bike,memberRides) ;
+ MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
+ this.lockBikes(bike.getDeviceSn(),1);
+ //瀛樺偍楠戣璁板綍
+ memberRides.setId(Constants.getUUID());
+ memberRides.setIsdeleted(Constants.ZERO);
+ memberRides.setMemberId(member.getId());
+ memberRides.setCreateDate(new Date());
+ memberRides.setOrdreId(goodsorder.getId());
+ memberRides.setBikeCode(bike.getCode());
+ 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.RIDES_RUNNING.getKey());
+ memberRides.setCloseStatus(Constants.ZERO);
+ memberRidesJoinMapper.insert(memberRides);
+ BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
+ return memberRidesDetailResponse;
+ }catch (Exception e){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寮�閿佸け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }finally {
+ cacheOpenLock.remove(bike.getCode());
+ }
+ }
+
+
+ @Transactional(rollbackFor = {BusinessException.class})
+ public void pauseOpenElecBike(BackElecBikeRequest param) {
+ Member member = memberMapper.selectById(param.getMemberId());
+ if (member == null) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿淇℃伅鏌ヨ澶辫触锛岃杩斿洖閲嶆柊杩涘叆灏忕▼搴忓啀璇曪紒");
+ }
+ Goodsorder gparam = new Goodsorder();
+ gparam.setMemberId(param.getMemberId());
+ gparam.setStatus(Constants.goodsorderStatus.pay);
+ Goodsorder goodsorder = goodsorderService.findOne(gparam);
+ if(Objects.isNull(goodsorder)){
+ throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鎮ㄥ綋鍓嶆湁楠戣涓鍗曡褰�");
+ }
+ //鏌ヨ褰撳墠姝ｅ湪涓村仠涓殑楠戣璁板綍
+ MemberRides memberRides = memberRidesJoinMapper.selectJoinOne(MemberRides.class,new MPJLambdaWrapper<MemberRides>()
+ .eq(MemberRides::getOrdreId,goodsorder.getId())
+ .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey())
+ .selectAll(MemberRides.class)
+ .last("limit 1"));
+ if(memberRides ==null || memberRides.getBikeCode() == null){
+ throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鎮ㄥ綋鍓嶆湁涓村仠涓褰�");
+ }
+ Bikes bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,memberRides.getBikeCode())
+ .eq(Bikes::getIsdeleted,Constants.ZERO)
+ .eq(Bikes::getType,Constants.ONE)
+ .last(" limit 1 ")
+ );
+ if(bike == null && StringUtils.isBlank(bike.getParamId())){
+ //濡傛灉杞﹁締绫诲瀷鏄┖
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "杞﹀瀷淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ this.lockBikes(bike.getDeviceSn(),1);
+ //鏇存柊楠戣鐘舵�佷负楠戣涓�
+ memberRides.setEditDate(memberRides.getBackDate());
+ memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+ memberRidesJoinMapper.updateById(memberRides);
+ }
+
+
+ private boolean isValidePricingType(Bikes bike,MemberRides memberRides ) {
+ //鏌ヨ杞﹀瓙鐢甸噺淇℃伅
+ if(goodsorderService.getVoltageStatus(bike)>0){
+ 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::getBikeTypeId,bike.getParamId());
+ 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);
+ memberRides.setBikeCode(bike.getCode());
+ memberRides.setParamId(bike.getParamId());
+ bike.setLastRentDate(new Date());
+ bike.setStatus(Constants.ONE);
+ bikesMapper.updateById(bike);
+ //妫�鏌ユ槸鍚﹁妭鍋囨棩
+ 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;
+ }
+
+
+ /**
+ * 涓存椂鍋滆溅瓒呮椂 鑷姩杩樿溅
+ */
+ public void autoBackBike(){
+ List<MemberRides> memberRidesList = memberRidesJoinMapper.selectJoinList(MemberRides.class,new MPJLambdaWrapper<MemberRides>()
+ .selectAll(MemberRides.class)
+ .leftJoin(Goodsorder.class,Goodsorder::getId,MemberRides::getOrdreId)
+ .eq(Goodsorder::getStatus,Constants.ONE)
+ .eq(MemberRides::getIsdeleted,Constants.ZERO)
+ .eq(MemberRides::getType,Constants.ONE)
+ .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING)
+ .apply(" NOW() >= t.create_date + INTERVAL '2 hours' ")
+ );
+
+ for (MemberRides timeOutRides:memberRidesList) {
+ Goodsorder goodsorder = goodsorderService.findById(timeOutRides.getOrdreId());
+ //鏌ヨ楠戣璁板綍
+ List<MemberRides> memberRides = goodsorderService.getMemberRidesForClose(goodsorder.getId());
+ if(memberRides!=null && memberRides.size()>0){
+ for (MemberRides rides : memberRides){
+ if(Constants.equalsInteger(rides.getStatus(),Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey())
+ &&Constants.equalsInteger(rides.getType(),Constants.ONE)){
+ //濡傛灉鏄數杞﹀苟涓旀槸楠戣涓� 杩涜鍏抽攣澶勭悊
+ Bikes bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda()
+ .eq(Bikes::getType,Constants.ONE)
+ .eq(Bikes::getIsdeleted,Constants.ZERO)
+ .eq(Bikes::getCode,rides.getBikeCode())
+ );
+ lockBikes(bike.getDeviceSn(),Constants.ZERO);//鍙戣捣鍏抽攣鎸囦护璇锋眰
+ rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞�
+ rides.setBackSiteId(bike.getSiteId());//杩樿溅绔欑偣
+ rides.setBackDate(new Date());
+ rides.setEditDate(rides.getBackDate());
+ memberRidesJoinMapper.updateById(rides);//鏇存柊楠戣鐘舵�佷负宸茶繕杞�
+ }
+ }
+ }
+ //璁㈠崟缁撶畻
+ Date date = new Date();
+ goodsorder.setEditDate(date);
+ goodsorder.setEditor(null);
+ goodsorderService.dealCloseGoodsorderBiz( goodsorder,Constants.REFUND_TYPE.NORMAL.getKey(),memberRides);
+ }
+
+
+
+
+
+ }
+
+
+
+
}
--
Gitblit v1.9.3