diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index f40fb8af7..ecb103d41 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -217,9 +217,9 @@ public class WxPropertyContractController extends WxContractBaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { 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 { Map data = wxPropertyContractService.getById(id); return new ResultData(data); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index 55f22ac51..89ea189fd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Date; import java.util.List; @@ -150,4 +151,10 @@ public class WxBillProperty extends WxBillBaseEntity { 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(); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 79295d415..c07583035 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -237,10 +237,10 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi @Override public void updateBillStatus(WxBillProperty record) { logger.info("更新物业账单状态开始..."); - //更新逾期天数及状态 - updateNotPaidStatus(record); - //更新待缴的状态 - updateWaidPayStatus(record); +// //更新逾期天数及状态 +// updateNotPaidStatus(record); +// //更新待缴的状态 +// updateWaidPayStatus(record); logger.info("更新物业账单状态结束..."); } 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 64d85cd4d..404ca8587 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -735,6 +735,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo)); } 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);