From 4653a17b8b2343affd5d86cbba423674a2645bad Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 03 十一月 2023 15:39:58 +0800
Subject: [PATCH] aa
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 c153bdc..bcf3b1e 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,7 +176,7 @@
goodsorderExportVOIPage.getRecords().forEach(s->{
s.setMoney(Constants.translateMoney(s.getMoney()));
s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
- s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()));
+ s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney()));
});
}
return PageData.from(goodsorderExportVOIPage);
@@ -189,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()));
});
}
@@ -281,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);
@@ -310,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)) {
@@ -750,7 +751,7 @@
try {
Object response = null;
WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
- request.setBody("鏀粯鎶奸噾");
+ request.setBody("楠戣鎶奸噾");
request.setAttach("createGoodsOrder");
request.setOutTradeNo(goodsorder.getId());
request.setTotalFee(goodsorder.getMoney().intValue());
--
Gitblit v1.9.3