Explorar el Código

fix

release_toaliyun_real
winter hace 2 años
padre
commit
9859d1e044
Se han modificado 1 ficheros con 6 adiciones y 2 borrados
  1. +6
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java

+ 6
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java Ver fichero

@@ -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());


Cargando…
Cancelar
Guardar