From a7f017adfb5ec73abf83f73108220e2665208fdc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十月 2023 10:43:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 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 2ed8c62..7aecc5e 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
@@ -258,7 +258,7 @@
homeResponse.setLeaseNotice(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE).getCode());
homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(BigDecimal.valueOf(100)));
homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode());
- homeResponse.setLeaseVideoUrl(fullPath + systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
+ homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
homeResponse.setIsBusiness(this.checkBusiness()?0:1);
@@ -343,12 +343,13 @@
if (!CollectionUtils.isEmpty(refunds)){
refunds.forEach(s->{
PayOrderDTO refundOrderDTO = new PayOrderDTO();
- refundOrderDTO.setOrderCode(s.getCode());
+ refundOrderDTO.setOrderCode(s.getObjId());
refundOrderDTO.setId(s.getId());
refundOrderDTO.setPayWay(s.getPayWay());
refundOrderDTO.setRefundType(s.getType());
refundOrderDTO.setMoney(Constants.translateMoney(s.getMoney()));
refundOrderDTO.setPayDate(s.getDoneDate());
+ refundOrderDTO.setOnlineorderId(s.getOnlineOrderid());
payOrderDTOList.add(refundOrderDTO);
});
}
@@ -409,7 +410,7 @@
update.setId(goodsorder.getId());
update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
update.setCloseMoney(goodsorder.getMoney());
- update.setCloseDate(goodsorder.getEndDate());
+ update.setCloseDate(new Date());
update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
update.setCloseUserId(goodsorder.getEditor());
if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
@@ -435,23 +436,23 @@
refundDTO.setType(type);
Refund refund = wxMiniUtilService.wxRefund(refundDTO);
update.setCloseId(refund.getId());
- //瀛樺偍 娑堣垂浜ゆ槗娴佹按
- Transactions transactions = new Transactions();
- transactions.setId(Constants.getUUID());
- transactions.setMemberId(goodsorder.getMemberId());
- transactions.setCreateDate(new Date());
- transactions.setIsdeleted(Constants.ZERO);
- transactions.setOrderId(goodsorder.getId());
- transactions.setMoney(goodsorder.getMoney().subtract(new BigDecimal(refundMoney)));
- transactions.setType(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getKey());
- transactions.setDoneDate(new Date());
- transactions.setTitle(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getName());
- transactions.setContent(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getInfo());
- transactions.setBalance(BigDecimal.ZERO);
- transactions.setObjId(goodsorder.getId());
- transactions.setObjType(Constants.ONE);
- transactionsMapper.insert(transactions);
}
+ //瀛樺偍 娑堣垂浜ゆ槗娴佹按
+ Transactions transactions = new Transactions();
+ transactions.setId(Constants.getUUID());
+ transactions.setMemberId(goodsorder.getMemberId());
+ transactions.setCreateDate(new Date());
+ transactions.setIsdeleted(Constants.ZERO);
+ transactions.setOrderId(goodsorder.getId());
+ transactions.setMoney(goodsorder.getMoney().subtract(new BigDecimal(refundMoney)));
+ transactions.setType(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getKey());
+ transactions.setDoneDate(new Date());
+ transactions.setTitle(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getName());
+ transactions.setContent(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getInfo());
+ transactions.setBalance(BigDecimal.ZERO);
+ transactions.setObjId(goodsorder.getId());
+ transactions.setObjType(Constants.ONE);
+ transactionsMapper.insert(transactions);
//淇敼璁㈠崟淇℃伅
goodsorderMapper.updateById(update);
}
@@ -632,7 +633,11 @@
memberRidesResponse.setRideStartTime(s.getRentDate());
memberRidesResponse.setRideEndTime(endTime);
memberRidesResponse.setRideTime(rideTime);
- memberRidesResponse.setDuration(s.getDuration());
+ if(!s.getStatus().equals(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey())){
+ memberRidesResponse.setDuration(finalFreeTime >= rideTime?0:rideTime);
+ }else{
+ memberRidesResponse.setDuration(s.getDuration());
+ }
memberRidesResponse.setBikeType(s.getParamName());
memberRidesResponse.setBikeCode(s.getBikeCode());
memberRidesResponse.setBasePrice(s.getBasePrice());
@@ -721,8 +726,12 @@
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(":",""))){
+ try {
+ if(Integer.valueOf(nowTime.replace(":",""))<= Integer.valueOf(businessStartTime.replace(":",""))
+ ||Integer.valueOf(nowTime.replace(":","")) > Integer.valueOf(businessEndTime.replace(":",""))){
+ return true;
+ }
+ }catch (Exception e){
return true;
}
return false;
@@ -773,11 +782,14 @@
}
@Override
- public void goodsOrderSettlement(String orderId) {
- if(StringUtils.isBlank(orderId)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST );
+ public void goodsOrderSettlement(String memberId) {
+ Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
+ .eq("member_id",memberId)
+ .eq("status",Constants.goodsorderStatus.pay)
+ .last(" limit 1 "));
+ if(Objects.isNull(goodsorder)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犻獞琛岃鍗曡褰�");
}
- Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
if(goodsorder == null ){
throw new BusinessException(ResponseStatus.DATA_EMPTY );
}
--
Gitblit v1.9.3