Ver código fonte

[租赁合同][修改][生成账单]

release_toaliyun_real
gongbiao 7 anos atrás
pai
commit
f2c0202ed0
2 arquivos alterados com 31 adições e 8 exclusões
  1. +22
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  2. +9
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 22
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Ver arquivo

@@ -59,6 +59,12 @@ public class WxRentContract implements Serializable {
@Transient
private String buildArea;

@Transient
private String priceStr;

@Transient
private String depositStr;

public String getBuilding() {
return building;
}
@@ -592,6 +598,22 @@ public class WxRentContract implements Serializable {
this.fileNames = fileNames;
}

public String getPriceStr() {
return priceStr;
}

public void setPriceStr(String priceStr) {
this.priceStr = priceStr;
}

public String getDepositStr() {
return depositStr;
}

public void setDepositStr(String depositStr) {
this.depositStr = depositStr;
}

public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), Price_ASC("`price` ASC"), Price_DESC("`price` DESC"), RentalStartDate_ASC("`rental_start_date` ASC"), RentalStartDate_DESC("`rental_start_date` DESC"), RentalEndDate_ASC("`rental_end_date` ASC"), RentalEndDate_DESC("`rental_end_date` DESC"), SignDate_ASC("`sign_date` ASC"), SignDate_DESC("`sign_date` DESC"), ReceivePeriod_ASC("`receive_period` ASC"), ReceivePeriod_DESC("`receive_period` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), Filepath_ASC("`filepath` ASC"), Filepath_DESC("`filepath` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ContractNumber_ASC("`contract_number` ASC"), ContractNumber_DESC("`contract_number` DESC"), Deposit_ASC("`deposit` ASC"), Deposit_DESC("`deposit` DESC"), PayDate_ASC("`pay_date` ASC"), PayDate_DESC("`pay_date` DESC"), IsDel_ASC("`is_del` ASC"), IsDel_DESC("`is_del` DESC"), MerchantName_ASC("`merchant_name` ASC"), MerchantName_DESC("`merchant_name` DESC"), Brand_ASC("`brand` ASC"), Brand_DESC("`brand` DESC"), BusinessId_ASC("`business_id` ASC"), BusinessId_DESC("`business_id` DESC"), ShopType_ASC("`shop_type` ASC"), ShopType_DESC("`shop_type` DESC"), ShopId_ASC("`shop_id` ASC"), ShopId_DESC("`shop_id` DESC"), Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` DESC"), Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC");
private String value;


+ 9
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Ver arquivo

@@ -285,13 +285,16 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
List<WxBillRent> resultList = wxBillRentMapper.findList(wxBillRent);

ResultData resultData = null;
// 更新
ResultData resultData = getResultDataForUpdate(record, userId);

if (dbRent.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) {
// 更新
resultData = getResultDataForUpdate(record, userId);
//删除预账单,重新生成
wxBillRentMapper.deletePreviewBill(record);
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode());
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null) {

//删除预账单,重新生成
wxBillRentMapper.deletePreviewBill(record);
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode());
}
}else{
boolean change = false;
if (CollectionUtils.isEmpty(resultList)) {
@@ -330,8 +333,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
}
}
// 更新
resultData = getResultDataForUpdate(record, userId);
//有改变,删除预账单,重新生成
if (change) {
wxBillRentMapper.deletePreviewBill(record);


Carregando…
Cancelar
Salvar