From 483465e9d579bcc73864164361907f928a189383 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Tue, 10 Dec 2024 18:37:21 +0800 Subject: [PATCH] fix --- .../contract/WxRentContractController.java | 1 + .../iformall/domain/po/WxRentContract.java | 20 +++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 54d0e39c1..6b3501e90 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -196,6 +196,7 @@ public class WxRentContractController extends WxContractBaseController { wxRentContract.setAdjustPeriodHandle(); wxRentContract.calcutePrice(); //wxRentContract.setRentPriceHandle(); + wxRentContract.calcuteDepositTotal(); Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index b785e25fc..62cf0045c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -125,10 +125,26 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") private String deposit; - @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "cashtypeContentLsit") + @io.swagger.annotations.ApiModelProperty(value = "押金金额详细", name = "cashtypeContentLsit") private String cashtypeContentLsit; - @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "cashtypeLsit") + @io.swagger.annotations.ApiModelProperty(value = "押金科目详细(弃用)", name = "cashtypeLsit") private String cashtypeLsit; + public void calcuteDepositTotal() { + if (StringUtils.isNotBlank(cashtypeContentLsit)) { + JSONArray rentInfoArray = JSONArray.parseArray(cashtypeContentLsit); + int size = rentInfoArray.size(); + BigDecimal dt = new BigDecimal(0); + for (int i = 0; i < size; i++) { + JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); + String deposit = rentInfoObject.getString("deposit"); + if (StringUtils.isNotBlank(deposit)) { + dt = dt.add(new BigDecimal(deposit)); + } + } + this.deposit = dt.toPlainString(); + } + } + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") private Integer isDel;