From 03805f3cfd53cbb2f94e4b67bba4728ca22dfc80 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期五, 03 十一月 2023 15:36:21 +0800 Subject: [PATCH] # log日志 --- server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 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 89030a6..99b728c 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 @@ -176,6 +176,7 @@ goodsorderExportVOIPage.getRecords().forEach(s->{ s.setMoney(Constants.translateMoney(s.getMoney())); s.setRefundMoney(Constants.translateMoney(s.getRefundMoney())); + s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney())); }); } return PageData.from(goodsorderExportVOIPage); @@ -188,7 +189,7 @@ if (!CollectionUtils.isEmpty(goodsorderList)){ goodsorderList.forEach(s->{ s.setMoney(Constants.translateMoney(s.getMoney())); - s.setCloseMoney(Constants.translateMoney(s.getCloseMoney())); + s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney())); s.setRefundMoney(Constants.translateMoney(s.getRefundMoney())); }); } @@ -243,7 +244,7 @@ public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) { IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel()); - queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date limit 1) as memberRidesStatus"); + queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus"); if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){ queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey()); } @@ -280,7 +281,7 @@ homeResponse.setLeaseNoticeUrl(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()).multiply(BigDecimal.valueOf(100))); - homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode()); + homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_NOTICE).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); @@ -309,6 +310,7 @@ MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda() .eq(MemberRides::getMemberId, memberId) .eq(MemberRides::getOrdreId,goodsorder.getId()) + .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey()) .orderByDesc(MemberRides::getCreateDate) .last(" limit 1 ")); if (!Objects.isNull(memberRides)) { @@ -553,7 +555,7 @@ if(canBalance.compareTo(money) >= Constants.ZERO){ RefundDTO refundDTO = new RefundDTO(); refundDTO.setOrderId(orderId); - refundDTO.setCanBalance(canBalance); + refundDTO.setCanBalance(canBalance.multiply(new BigDecimal(100))); refundDTO.setRefundAmount(money.multiply(new BigDecimal(100))); refundDTO.setTotalAmount(goodsorder.getMoney()); refundDTO.setMemberId(goodsorder.getMemberId()); @@ -635,8 +637,12 @@ } } QueryWrapper<Refund> queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.lambda().ge(param.getStartDate() !=null,Refund::getDoneDate,Utils.Date.getStart(param.getStartDate())); - queryWrapper2.lambda().le(param.getEndDate() !=null,Refund::getDoneDate,Utils.Date.getEnd(param.getEndDate())); + if(Objects.nonNull(param.getStartDate())) { + queryWrapper2.lambda().ge(Refund::getDoneDate, Utils.Date.getStart(param.getStartDate())); + } + if(Objects.nonNull(param.getEndDate())) { + queryWrapper2.lambda().le(Refund::getDoneDate, Utils.Date.getEnd(param.getEndDate())); + } queryWrapper2.lambda().eq(Refund::getIsdeleted, Constants.ZERO); queryWrapper2.select( "count(id) as count_num" ,"sum(money) as money" ); -- Gitblit v1.9.3