|
|
|
@@ -54,12 +54,37 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ |
|
|
|
valueMap.put("merchantPhone", record.getMerchantPhone()); |
|
|
|
|
|
|
|
if (needCalcute) { |
|
|
|
record.setCardMoney(calcuteByMoneyAndRate(record.getCardSaleMoney(),record.getCardRate())); |
|
|
|
record.setZfbMoney(calcuteByMoneyAndRate(record.getZfbSaleMoney(),record.getZfbRate())); |
|
|
|
record.setUnionMoney(calcuteByMoneyAndRate(record.getUnionSaleMoney(),record.getUnionRate())); |
|
|
|
record.setWxMoney(calcuteByMoneyAndRate(record.getWxSaleMoney(),record.getWxRate())); |
|
|
|
record.setEraseZeroMoney(calcuteByMoneyAndRate(record.getEraseZeroSaleMoney(),record.getEraseZeroRate())); |
|
|
|
record.setCashMoney(calcuteByMoneyAndRate(record.getCashSaleMoney(),record.getCashRate())); |
|
|
|
if (null == record.getCardRate() && null != record.getCardMoney()) { |
|
|
|
//do nothing |
|
|
|
}else { |
|
|
|
record.setCardMoney(calcuteByMoneyAndRate(record.getCardSaleMoney(),record.getCardRate())); |
|
|
|
} |
|
|
|
|
|
|
|
if (null == record.getZfbRate() && null != record.getZfbMoney()) { |
|
|
|
//do nothing |
|
|
|
}else { |
|
|
|
record.setZfbMoney(calcuteByMoneyAndRate(record.getZfbSaleMoney(),record.getZfbRate())); |
|
|
|
} |
|
|
|
if (null == record.getUnionRate() && null != record.getUnionMoney()) { |
|
|
|
//do nothing |
|
|
|
}else { |
|
|
|
record.setUnionMoney(calcuteByMoneyAndRate(record.getUnionSaleMoney(),record.getUnionRate())); |
|
|
|
} |
|
|
|
if (null == record.getWxRate() && null != record.getWxMoney()) { |
|
|
|
//do nothing |
|
|
|
}else { |
|
|
|
record.setWxMoney(calcuteByMoneyAndRate(record.getWxSaleMoney(),record.getWxRate())); |
|
|
|
} |
|
|
|
if (null == record.getEraseZeroRate() && null != record.getEraseZeroMoney()) { |
|
|
|
|
|
|
|
}else { |
|
|
|
record.setEraseZeroMoney(calcuteByMoneyAndRate(record.getEraseZeroSaleMoney(),record.getEraseZeroRate())); |
|
|
|
} |
|
|
|
if (null == record.getCashRate() && null != record.getCashMoney()) { |
|
|
|
|
|
|
|
}else { |
|
|
|
record.setCashMoney(calcuteByMoneyAndRate(record.getCashSaleMoney(),record.getCashRate())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@@ -112,9 +137,9 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ |
|
|
|
|
|
|
|
valueMap.put("totalMoney", record.getTotalMoney()); |
|
|
|
valueMap.put("actualMoney", record.getActualMoney()); |
|
|
|
valueMap.put("totalMoneyDX", PriceUtilV2.number2CNMontrayUnit(record.getTotalMoney())); |
|
|
|
valueMap.put("totalMoneyDX", toChineseBig(record.getTotalMoney())); |
|
|
|
if (null != record.getActualMoney()) { |
|
|
|
valueMap.put("actualMoneyDX", PriceUtilV2.number2CNMontrayUnit(record.getActualMoney())); |
|
|
|
valueMap.put("actualMoneyDX", toChineseBig(record.getActualMoney())); |
|
|
|
} |
|
|
|
|
|
|
|
valueMap.put("accountName", record.getAccountName()); |
|
|
|
@@ -141,12 +166,6 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ |
|
|
|
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) { |
|
|
|
@@ -155,6 +174,11 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ |
|
|
|
} |
|
|
|
return value; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public String toChineseBig(BigDecimal money) { |
|
|
|
return PriceUtilV2.number2CNMontrayUnit(money); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void saveOrUpdate(WxSettleMerchant record,MallUserInfo operator) { |
|
|
|
@@ -181,4 +205,5 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |