Просмотр исходного кода

[铜锣湾][添加][预账单]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
f8b82286c7
1 измененных файлов: 15 добавлений и 16 удалений
  1. +15
    -16
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 15
- 16
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -14,6 +14,7 @@ import com.iformall.service.WxFlowRecordService;
import com.iformall.service.WxFlowService;
import com.iformall.service.WxPropertyContractService;
import com.iformall.utils.Constant;
import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -566,19 +567,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
params.put("tenantId", record.getTenantId());
params.put("rentShopType", record.getRentShopType());
List<WxRentContract> contractList = wxPropertyContractMapper.getRentContractList(params);
//生成预览账单
if(!CollectionUtils.isEmpty(contractList)){
for (WxRentContract wxRentContract:contractList) {
//根据租赁合同找到对应的物业合同,生成物业账单
WxPropertyContract propertyContract = wxPropertyContractMapper.findOneByRentId(wxRentContract);
if(propertyContract!=null && propertyContract.getReceivePeriod() != null && propertyContract.getLease()!=null) {
wxBillPropertyMapper.deletePreviewBill(propertyContract);
//重新生成
List<WxBillProperty> billList = buildProperty(new WxMerchant(),propertyContract);
wxRentContract.setReviewBillPropertyPList(billList);
}
}
}
return contractList;
}

@@ -607,7 +595,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
if (null == rentContractId) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "rentContractId不能为空");
}
Map<String,Object> resultMap = new HashedMap();
WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(rentContractId);
if (wxRentContract != null) {
WxPropertyContract wxPropertyContract = new WxPropertyContract();
@@ -619,11 +607,22 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
propertyContract.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) ||
propertyContract.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count();
if (count > 0) {
return new ResultData(true);
resultMap.put("hasRent",true);
}
}
}
return new ResultData(false);

//生成预览账单
//根据租赁合同找到对应的物业合同,生成物业账单
WxPropertyContract propertyContract = wxPropertyContractMapper.findOneByRentId(wxRentContract);
if(propertyContract!=null && propertyContract.getReceivePeriod() != null && propertyContract.getLease()!=null) {
wxBillPropertyMapper.deletePreviewBill(propertyContract);
//重新生成
List<WxBillProperty> billList = buildProperty(new WxMerchant(),propertyContract);
resultMap.put("billList",billList);
}
resultMap.put("hasRent",false);
return new ResultData(resultMap);
}

public Map<String, Object> updateStatus(WxPropertyContract record) {


Загрузка…
Отмена
Сохранить