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 | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 8010bb4..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
@@ -252,14 +252,16 @@
.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 ")
@@ -277,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);
}
}
@@ -429,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());
@@ -605,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()))){
//濡傛灉鏄獞琛屼腑
--
Gitblit v1.9.3