From 1450ec326a4ceb5e608b0df89f3d14c0914c6fe6 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:37:16 +0800
Subject: [PATCH] #车型序号内置
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 a27f44c..0b87604 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
@@ -216,7 +216,6 @@
queryWrapper.like(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
- queryWrapper.eq(Goodsorder::getStatus,Constants.ONE);
queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
queryWrapper.orderByDesc(Goodsorder::getPayDate);
return queryWrapper;
@@ -242,13 +241,15 @@
@Override
public HomeResponse getHome(String memberId){
HomeResponse homeResponse = new HomeResponse();
+ String fullPath = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode() +
+ systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode() ;
homeResponse.setParkName(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PROJECT_NAME).getCode());
homeResponse.setServerPhone(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.SERVER_PHONE).getCode());
- homeResponse.setLeaseNoticeUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE_URL).getCode());
+ homeResponse.setLeaseNoticeUrl(fullPath + systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE_URL).getCode());
homeResponse.setLeaseNotice(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE).getCode());
homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode());
- homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
+ homeResponse.setLeaseVideoUrl(fullPath + 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);
@@ -258,6 +259,11 @@
.eq("status",Constants.ZERO)
.orderByDesc("create_date")
));;
+ if(!Objects.isNull(homeResponse.getAdList())&&homeResponse.getAdList().size()>Constants.ZERO){
+ homeResponse.getAdList().forEach(i->{
+ i.setImgfullurl(fullPath + i.getImgurl());
+ });
+ }
homeResponse.setRideStatus(-1);
//鏌ヨ鏄惁瀛樺湪 宸叉敮浠樼殑 鎶奸噾璁㈠崟
Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
@@ -282,13 +288,19 @@
}
memberRidesResponse.setRideId(memberRides.getId());
memberRidesResponse.setRideStartTime(memberRides.getRentDate());
+ memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
memberRidesResponse.setRideEndTime(memberRides.getBackDate());
- memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRidesResponse.getRideStartTime(),memberRidesResponse.getRideEndTime()));
+ memberRidesResponse.setRideEndTimeStr(DateUtil.DateToStr(memberRides.getBackDate(),"HH:mm"));
+ memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRides.getRentDate(),memberRides.getBackDate()));
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()));
homeResponse.setMemberRidesResponse(memberRidesResponse);
}
}
@@ -502,6 +514,8 @@
refundDTO.setReason(reason);
refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
Refund refund = wxMiniUtilService.wxRefund(refundDTO);
+ }else {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閫�娆鹃噾棰濅笉鍏佽瓒呰繃"+canBalance);
}
}
@@ -673,8 +687,8 @@
request.setBody("鏀粯鎶奸噾");
request.setAttach("createGoodsOrder");
request.setOutTradeNo(goodsorder.getId());
-// request.setTotalFee(BaseWxPayRequest.yuanToFen(goodsorder.getMoney().toString()));
- request.setTotalFee(1);
+ request.setTotalFee(BaseWxPayRequest.yuanToFen(goodsorder.getMoney().toString()));
+// request.setTotalFee(1);
request.setSpbillCreateIp(this.getIpAddr());
request.setTimeStart(DateUtil.DateToString(new Date(), "yyyyMMddHHmmss"));
request.setOpenid(member.getOpenid());
@@ -733,8 +747,10 @@
Date date = new Date();
list.forEach(s->{
try {
- goodsorder.setEditDate(date);
- goodsorder.setEditor(null);
+ s.setEditDate(date);
+ s.setEditor(null);
+ s.setCloseDate(date);
+
closeGoodsorder(s,Constants.REFUND_TYPE.PLAT_AUTO.getKey());
}catch (BusinessException e){
--
Gitblit v1.9.3