From e40a072541e1b31add7ed345e47adf61c49ecf4f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 13 十月 2023 09:05:39 +0800
Subject: [PATCH] #获取可退款信息
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
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 4630a8e..a1b7255 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
@@ -57,6 +57,8 @@
import java.net.UnknownHostException;
import java.sql.Ref;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -243,19 +245,23 @@
homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
homeResponse.setPricingRules(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRICING_RULE).getCode());
homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
- homeResponse.setIsStopServe(Constants.ZERO);
+ 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)
.orderByDesc("create_date")
- ));
- //鏌ヨ鏄惁瀛樺湪 宸叉敮浠樼殑 鎶奸噾璁㈠崟
- Integer status = this.goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>()
- .eq("member_id",memberId)
- .eq("status",Constants.goodsorderStatus.pay));
- homeResponse.setDepositStatus(status);
+ ));;
homeResponse.setRideStatus(-1);
- if(homeResponse.getDepositStatus()==Constants.goodsorderStatus.pay) {
+ //鏌ヨ鏄惁瀛樺湪 宸叉敮浠樼殑 鎶奸噾璁㈠崟
+ Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
+ .eq("member_id",memberId)
+ .eq("status",Constants.goodsorderStatus.pay)
+ .last(" limit 1 "));
+ if(!Objects.isNull(goodsorder)&&goodsorder.getStatus().equals(Constants.goodsorderStatus.pay)){
+ homeResponse.setDepositStatus(Constants.goodsorderStatus.pay);
+ homeResponse.setGoodsOrderId(goodsorder.getId());
//鏌ヨ褰撳墠楠戣鐘舵��
MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().eq("member_id", memberId)
.orderByDesc(" create_date ")
@@ -273,8 +279,8 @@
memberRidesResponse.setBikeCode(memberRides.getBikeCode());
memberRidesResponse.setBasePrice(memberRides.getBasePrice());
memberRidesResponse.setBaseTime(memberRides.getBaseTime());
- memberRidesResponse.setUnitTime(memberRidesResponse.getUnitTime());
- memberRidesResponse.setUnitPrice(memberRidesResponse.getUnitPrice());
+ memberRidesResponse.setUnitTime(memberRides.getUnitTime());
+ memberRidesResponse.setUnitPrice(memberRides.getUnitPrice());
homeResponse.setMemberRidesResponse(memberRidesResponse);
}
}
@@ -425,13 +431,13 @@
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()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璁㈠崟鏈夋湭瀹屾垚鐨勯獞琛岋紝鏃犳硶寮哄埗缁撶畻");
}
durationSum += Constants.formatIntegerNum(rides.getDuration());//绱楠戣锛堣璐癸級鏃堕暱
}
+ MemberRides topRides =memberRides.get(0);
if(durationSum > 0 && topRides != null){
int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
@@ -601,7 +607,7 @@
memberRidesResponse.setBikeCode(s.getBikeCode());
memberRidesResponse.setBasePrice(s.getBasePrice());
memberRidesResponse.setBaseTime(s.getBaseTime());
- memberRidesResponse.setUnitPrice(s.getUnitTime());
+ memberRidesResponse.setUnitPrice(s.getUnitPrice());
memberRidesResponse.setUnitTime(s.getUnitTime());
if ( Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(s.getStatus()))){
//濡傛灉鏄獞琛屼腑
@@ -637,9 +643,13 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸叉敮浠樿繃瀹氶噾锛屾棤娉曢噸澶嶈鎿嶄綔");
}
//鏄惁澶勪簬灏忕▼搴忓仠姝㈡湇鍔℃椂闂村唴
- this.checkTemporaryStop();
+ if(this.checkTemporaryStop()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
+ };
//鏄惁澶勪簬钀ヤ笟鏃堕棿
- this.checkBusiness();
+ if(this.checkBusiness()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"钀ヤ笟鏃堕棿涓�"+ systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode() +" ~ "+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode()+"锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
+ };
Goodsorder goodsorder = new Goodsorder();
goodsorder.setId(Constants.getUUID());
goodsorder.setCreateDate(new Date());
@@ -675,21 +685,24 @@
* 楠岃瘉钀ヤ笟鏃堕棿
*/
@Override
- public void checkBusiness(){
+ public Boolean checkBusiness(){
String businessStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode();
String businessEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode();
- String nowTime = DateUtil.getDate(new Date(),"HH:mm");
+ LocalTime currentTime = LocalTime.now();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+ String nowTime = currentTime.format(formatter);
if(Integer.valueOf(nowTime.replace(":",""))<= Integer.valueOf(businessStartTime.replace(":",""))
||Integer.valueOf(nowTime.replace(":","")) > Integer.valueOf(businessEndTime.replace(":",""))){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"钀ヤ笟鏃堕棿涓�06:00 ~ 23:59锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
+ return true;
}
+ return false;
}
/**
* 涓存椂鍋滄鏈嶅姟 鏈氦鎶奸噾鐨勭敤鎴凤紝鏃犳硶鎵溅浣跨敤锛涘凡缁忎氦杩囨娂閲戠殑鐢ㄦ埛鍙互缁х画鎵爜楠戣锛�
*/
@Override
- public void checkTemporaryStop(){
+ public Boolean checkTemporaryStop(){
if(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.IS_STOP_SERVE).getCode().equals(Constants.ONE)){
String stopServeStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_STARTTIME).getCode();
String stopServeEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_ENDTIME).getCode();
@@ -697,9 +710,10 @@
long s = DateUtil.StringToDate(stopServeStartTime).getTime();
long e = DateUtil.StringToDate(stopServeEndTime).getTime();
if(e>System.currentTimeMillis()&&s<=System.currentTimeMillis()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
+ return true;
}
}
+ return false;
}
--
Gitblit v1.9.3