| @@ -217,9 +217,9 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | ||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| logger.debug("[" + getIpAddr() + "] WxPropertyContractController::findById"); | logger.debug("[" + getIpAddr() + "] WxPropertyContractController::findById"); | ||||
| WxBillProperty wxBillProperty = new WxBillProperty(); | |||||
| wxBillProperty.updateTenantInfo(getTenantInfo()); | |||||
| wxBillPropertyService.updateBillStatus(wxBillProperty); | |||||
| // WxBillProperty wxBillProperty = new WxBillProperty(); | |||||
| // wxBillProperty.updateTenantInfo(getTenantInfo()); | |||||
| // wxBillPropertyService.updateBillStatus(wxBillProperty); | |||||
| try { | try { | ||||
| Map<String, Object> data = wxPropertyContractService.getById(id); | Map<String, Object> data = wxPropertyContractService.getById(id); | ||||
| return new ResultData(data); | return new ResultData(data); | ||||
| @@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode; | |||||
| import lombok.ToString; | import lombok.ToString; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.math.RoundingMode; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -150,4 +151,10 @@ public class WxBillProperty extends WxBillBaseEntity { | |||||
| return EnumBillAllType.PROPERTY.getCode(); | return EnumBillAllType.PROPERTY.getCode(); | ||||
| } | } | ||||
| @TableField(exist = false) | |||||
| private String totalFee; | |||||
| public void calcuteTotalFee(Integer decimalSize) { | |||||
| this.totalFee = new BigDecimal(this.receivePay).setScale(decimalSize, RoundingMode.HALF_UP).toPlainString(); | |||||
| } | |||||
| } | } | ||||
| @@ -237,10 +237,10 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||||
| @Override | @Override | ||||
| public void updateBillStatus(WxBillProperty record) { | public void updateBillStatus(WxBillProperty record) { | ||||
| logger.info("更新物业账单状态开始..."); | logger.info("更新物业账单状态开始..."); | ||||
| //更新逾期天数及状态 | |||||
| updateNotPaidStatus(record); | |||||
| //更新待缴的状态 | |||||
| updateWaidPayStatus(record); | |||||
| // //更新逾期天数及状态 | |||||
| // updateNotPaidStatus(record); | |||||
| // //更新待缴的状态 | |||||
| // updateWaidPayStatus(record); | |||||
| logger.info("更新物业账单状态结束..."); | logger.info("更新物业账单状态结束..."); | ||||
| } | } | ||||
| @@ -735,6 +735,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo)); | wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo)); | ||||
| } | } | ||||
| wxBillProperty.setLatePayRatio(0); | wxBillProperty.setLatePayRatio(0); | ||||
| wxBillProperty.calcuteTotalFee(wxPropertyContract.getDecimalSize()); | |||||
| //计算手续费 | //计算手续费 | ||||
| BigDecimal servicePay = new BigDecimal(wxBillProperty.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), wxPropertyContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP); | BigDecimal servicePay = new BigDecimal(wxBillProperty.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), wxPropertyContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP); | ||||