From c41add1b619226de813795e4f0be54bb7155c93a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 02 十一月 2023 17:08:56 +0800
Subject: [PATCH] 硬件协议对接
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 7f6f0be..f879d2e 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()));
});
}
return PageData.from(goodsorderExportVOIPage);
@@ -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)) {
@@ -520,6 +522,7 @@
MPJLambdaWrapper<MemberRides> wrapper = new MPJLambdaWrapper<>();
wrapper.eq(MemberRides::getOrdreId,id);
+ wrapper.ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
wrapper.selectAll(MemberRides.class).selectAs(BaseParam::getName, MemberRides::getParamName);
wrapper.leftJoin(BaseParam.class, BaseParam::getId, MemberRides::getParamId);
wrapper.orderByDesc(BaseParam::getSortnum);
@@ -552,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());
@@ -634,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" );
@@ -659,6 +666,7 @@
.selectAs(BaseParam::getName,MemberRides::getParamName)
.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
.eq(MemberRides::getOrdreId,id)
+ .in(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey())
.orderByDesc(MemberRides::getCreateDate));
if (!CollectionUtils.isEmpty(memberRides)){
//棰勮缁撶畻浠锋牸鍜岃绠楁椂闀�
--
Gitblit v1.9.3