From 647d596c7cbc5c65a7f4facfb82a3f31db31ed82 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期二, 07 十一月 2023 17:29:45 +0800 Subject: [PATCH] # 实时车位信息 --- server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java index 1181f86..cad86af 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java @@ -95,7 +95,7 @@ @Override public WxBill findOne(WxBill wxBill) { QueryWrapper<WxBill> wrapper = new QueryWrapper<>(wxBill); - return wxBillMapper.selectOne(wrapper); + return wxBillMapper.selectOne(wrapper.last(" limit 1")); } @Override @@ -149,6 +149,7 @@ } else if(StringUtils.equals(detail.getBillStatus(), "REFUND")){ //閫�娆炬暟鎹� bill4.setSumRefundBill(detail.getSumBill());//閫�娆剧瑪鏁� + bill4.setSumRefundFee(detail.getRefundFee()); bill4.setSumRefundCmmsAmt(Constants.formatDecimalNum(detail.getCmmsAmt()));//閫�娆炬墜缁垂 } } @@ -304,10 +305,6 @@ bill.setSumTotalFee(formatStringToDecimal(response.getTotalAmount())); //搴旂粨璁㈠崟鎬婚噾棰� bill.setSumSuccessFee(formatStringToDecimal(response.getTotalFee())); - //閫�娆炬�婚噾棰� - bill.setSumRefundFee(formatStringToDecimal(response.getTotalFee())); - //閫�娆炬�婚噾棰� - bill.setSumApplyRefundFee(formatStringToDecimal(response.getTotalAppliedRefundFee())); //浜ゆ槗鎬绘墜缁垂閲戦 bill.setSumCmmsAmt(formatStringToDecimal(response.getTotalPoundageFee())); detailList.addAll(getDetialModelByInfo(bill,response.getBillInfoList())); @@ -316,8 +313,12 @@ //閫�娆惧崟鎬绘暟绱杩涘叆 // bill.setSumBill(bill.getSumBill()+(Integer.parseInt(response.getTotalRecord())); bill.setSumRefundBill(Integer.parseInt(responseRefund.getTotalRecord()));//閫�娆剧殑璁㈠崟鏁� + //閫�娆炬�婚噾棰� + bill.setSumRefundFee(formatStringToDecimal(responseRefund.getTotalRefundFee())); + //閫�娆炬�婚噾棰� + bill.setSumApplyRefundFee(formatStringToDecimal(responseRefund.getTotalAppliedRefundFee())); bill.setSumRefundCmmsAmt(formatStringToDecimal(responseRefund.getTotalPoundageFee()));//閫�娆炬�绘墜缁垂 - bill.setSumCouponRefundFee(formatStringToDecimal(responseRefund.getTotalCouponFee()));//閫�娆炬�绘墜缁垂 + bill.setSumCouponRefundFee(formatStringToDecimal(responseRefund.getTotalCouponFee()));//閫�娆炬�婚噾棰� detailList.addAll(getDetialModelByInfo(bill,responseRefund.getBillInfoList())); } wxBillMapper.delete(new UpdateWrapper<WxBill>().lambda().eq( WxBill::getId, bill.getId())); -- Gitblit v1.9.3