diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java index 6f8f7ae22..fbcbc1319 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java @@ -27,7 +27,7 @@ public class WxBillSum implements Serializable { private String noTaxNeedPay = "0"; public String getNoTaxNeedPay() { if (StringUtils.isNotBlank(taxRate)) { - noTaxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString(); + noTaxNeedPay = new BigDecimal(needPay).subtract(new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString(); return noTaxNeedPay; } return needPay; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 0ec9d9abb..498a3016c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -544,20 +544,22 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillDeposit.setReceivePay(needpay); //wxBillDeposit.setOwe(needpay); Date date = new Date(); - Calendar instance = Calendar.getInstance(); - instance.setTime(wxPropertyContract.getRentalStartDate()); - instance.add(Calendar.DAY_OF_MONTH, -1); - Date time = instance.getTime(); - //账单开始时间 - instance.clear(); - instance.setTime(time); - instance.add(Calendar.DAY_OF_MONTH, 1); - wxBillDeposit.setStarttime(instance.getTime()); - //账单结束时间 - instance.clear(); - instance.setTime(time); - instance.add(dayType, wxPropertyContract.getLease()); - wxBillDeposit.setEndtime(instance.getTime()); +// Calendar instance = Calendar.getInstance(); +// instance.setTime(wxPropertyContract.getRentalStartDate()); +// instance.add(Calendar.DAY_OF_MONTH, -1); +// Date time = instance.getTime(); +// //账单开始时间 +// instance.clear(); +// instance.setTime(time); +// instance.add(Calendar.DAY_OF_MONTH, 1); +// wxBillDeposit.setStarttime(instance.getTime()); + wxBillDeposit.setStarttime(record.getFirstBillDateStart()); +// //账单结束时间 +// instance.clear(); +// instance.setTime(time); +// instance.add(dayType, wxPropertyContract.getLease()); +// wxBillDeposit.setEndtime(instance.getTime()); + wxBillDeposit.setEndtime(record.getFirstBillDateEnd()); wxBillDeposit.setStatus(EnumBillStatus.WAIT_PAY.getCode()); wxBillDeposit.updateTenantInfo(wxPropertyContract); wxBillDeposit.setMerchantId(record.getMerchantId());