1 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
Apvienotais skats
Salīdzināšanas iespējas
+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
Parādīt failu
| @@ -2859,7 +2859,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| BigDecimal shoprentArea = shopAreaRateMap.get(sid); | BigDecimal shoprentArea = shopAreaRateMap.get(sid); | ||||
| BigDecimal shoprate = shoprentArea.divide(new BigDecimal(rentcontract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP); | BigDecimal shoprate = shoprentArea.divide(new BigDecimal(rentcontract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP); | ||||
| String newmoney = bussinessmoney.multiply(shoprate).setScale(rentcontract.getDecimalSize()).toPlainString(); | |||||
| String newmoney = bussinessmoney.multiply(shoprate).setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toPlainString(); | |||||
| WxAllBill b = new WxAllBill(); | WxAllBill b = new WxAllBill(); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| b.setId(idWorker.nextId()); | b.setId(idWorker.nextId()); | ||||
| @@ -2937,7 +2937,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| BigDecimal shoprentArea = shopAreaRateMap.get(sid); | BigDecimal shoprentArea = shopAreaRateMap.get(sid); | ||||
| BigDecimal shoprate = shoprentArea.divide(new BigDecimal(rentcontract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP); | BigDecimal shoprate = shoprentArea.divide(new BigDecimal(rentcontract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP); | ||||
| String newmoney = bussinessmoney.multiply(shoprate).setScale(rentcontract.getDecimalSize()).toPlainString(); | |||||
| String newmoney = bussinessmoney.multiply(shoprate).setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toPlainString(); | |||||
| WxAllBill bmbill = new WxAllBill(); | WxAllBill bmbill = new WxAllBill(); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| bmbill.setId(idWorker.nextId()); | bmbill.setId(idWorker.nextId()); | ||||
| @@ -3015,7 +3015,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| BigDecimal shoprentArea = shopAreaRateMap.get(sid); | BigDecimal shoprentArea = shopAreaRateMap.get(sid); | ||||
| BigDecimal shoprate = shoprentArea.divide(new BigDecimal(rentcontract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP); | BigDecimal shoprate = shoprentArea.divide(new BigDecimal(rentcontract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP); | ||||
| String newmoney = moneyb.multiply(shoprate).setScale(rentcontract.getDecimalSize()).toPlainString(); | |||||
| String newmoney = moneyb.multiply(shoprate).setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toPlainString(); | |||||
| WxAllBill bmbill = new WxAllBill(); | WxAllBill bmbill = new WxAllBill(); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| bmbill.setId(idWorker.nextId()); | bmbill.setId(idWorker.nextId()); | ||||