| @@ -124,7 +124,11 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ | |||||
| valueMap.put("lastRemaining", handleExcelData(record.getLastRemaining())); | valueMap.put("lastRemaining", handleExcelData(record.getLastRemaining())); | ||||
| valueMap.put("pointsRate", handleExcelData(record.getPointsRate())); | valueMap.put("pointsRate", handleExcelData(record.getPointsRate())); | ||||
| if (needCalcute) { | 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())); | valueMap.put("pointsMoney", handleExcelData(record.getPointsMoney())); | ||||
| BigDecimal totalTempMoney = calcuteAdd(record.getRentMoney(),record.getPropertyMoney(),record.getEmployeeManageMoney(),record.getSalesSlipMoney(), | BigDecimal totalTempMoney = calcuteAdd(record.getRentMoney(),record.getPropertyMoney(),record.getEmployeeManageMoney(),record.getSalesSlipMoney(), | ||||
| @@ -132,7 +136,7 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ | |||||
| valueMap.put("totalTempMoney", totalTempMoney); | valueMap.put("totalTempMoney", totalTempMoney); | ||||
| if (needCalcute) { | if (needCalcute) { | ||||
| record.setTotalMoney(calcuteAdd(totalReduceMoney,totalTempMoney)); | |||||
| record.setTotalMoney(totalSaleMoney.subtract(calcuteAdd(totalReduceMoney,totalTempMoney))); | |||||
| } | } | ||||
| valueMap.put("totalMoney", record.getTotalMoney()); | valueMap.put("totalMoney", record.getTotalMoney()); | ||||