|
|
|
@@ -107,7 +107,7 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ |
|
|
|
valueMap.put("totalTempMoney", totalTempMoney); |
|
|
|
|
|
|
|
if (needCalcute) { |
|
|
|
record.setTotalMoney(totalSaleMoney.subtract(calcuteAdd(totalReduceMoney,totalTempMoney))); |
|
|
|
record.setTotalMoney(calcuteAdd(totalReduceMoney,totalTempMoney)); |
|
|
|
} |
|
|
|
|
|
|
|
valueMap.put("totalMoney", record.getTotalMoney()); |
|
|
|
@@ -127,7 +127,7 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ |
|
|
|
if (null == saleMoney || null == rate) { |
|
|
|
return new BigDecimal(0); |
|
|
|
} |
|
|
|
return saleMoney.multiply(rate).setScale(3,BigDecimal.ROUND_HALF_UP); |
|
|
|
return saleMoney.multiply(rate).divide(new BigDecimal(100)).setScale(3,BigDecimal.ROUND_HALF_UP); |
|
|
|
} |
|
|
|
|
|
|
|
private BigDecimal calcuteAdd(BigDecimal... args) { |
|
|
|
@@ -135,12 +135,19 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ |
|
|
|
for (int i = 0 ; i < args.length ; i ++) { |
|
|
|
BigDecimal _c = args[i]; |
|
|
|
if (null != _c) { |
|
|
|
result.add(_c); |
|
|
|
result = result.add(_c); |
|
|
|
} |
|
|
|
} |
|
|
|
return result.setScale(3,BigDecimal.ROUND_HALF_UP); |
|
|
|
} |
|
|
|
|
|
|
|
public static void main(String[] args) { |
|
|
|
BigDecimal result = new BigDecimal(0); |
|
|
|
BigDecimal result1 = new BigDecimal(10.000); |
|
|
|
System.out.println(result.add(result1)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private Object handleExcelData(Object value) { |
|
|
|
if (null == value) { |
|
|
|
|