Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
483465e9d5
2 zmienionych plików z 19 dodań i 2 usunięć
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +18
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Wyświetl plik

@@ -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());


+ 18
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Wyświetl plik

@@ -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;


Ładowanie…
Anuluj
Zapisz