From 9859d1e0441a6cf895c7ef4e077b269f95ca9d91 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 28 Mar 2024 22:35:56 +0800 Subject: [PATCH] fix --- .../service/impl/WxSettleMerchantServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java index 67806c705..41e591428 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java @@ -124,7 +124,11 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ valueMap.put("lastRemaining", handleExcelData(record.getLastRemaining())); valueMap.put("pointsRate", handleExcelData(record.getPointsRate())); if (needCalcute) { - record.setPointsMoney(calcuteByMoneyAndRate(totalSaleMoney,record.getPointsRate())); + if (null == record.getPointsRate() && null != record.getPointsMoney()) { + //do nothing + }else { + record.setPointsMoney(calcuteByMoneyAndRate(totalSaleMoney,record.getPointsRate())); + } } valueMap.put("pointsMoney", handleExcelData(record.getPointsMoney())); BigDecimal totalTempMoney = calcuteAdd(record.getRentMoney(),record.getPropertyMoney(),record.getEmployeeManageMoney(),record.getSalesSlipMoney(), @@ -132,7 +136,7 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ valueMap.put("totalTempMoney", totalTempMoney); if (needCalcute) { - record.setTotalMoney(calcuteAdd(totalReduceMoney,totalTempMoney)); + record.setTotalMoney(totalSaleMoney.subtract(calcuteAdd(totalReduceMoney,totalTempMoney))); } valueMap.put("totalMoney", record.getTotalMoney());