Browse Source

[审批][修改][添加终止审批]

release_toaliyun_real
luozukai 7 years ago
parent
commit
0d706b553c
4 changed files with 34 additions and 1 deletions
  1. +7
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  4. +22
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 7
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -300,6 +300,13 @@ public class WxRentContractController extends BaseController {
return wxRentContractService.hasContractNumber(wxRentContract);
}

@PostMapping("endContract")
@SystemControllerLog(description = "租赁合同-终止合同")
public ResultData endContract(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::endContract");
wxRentContractService.endContract(wxRentContract);
return new ResultData();
}
}



+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -87,6 +87,10 @@ public class WxRentContract extends BaseEntity {
@SortColumn(column = "latePayPrice")
private Integer latePayPrice;

@io.swagger.annotations.ApiModelProperty(value = "是否同时终止物业", name = "endProperty")
@Transient
private Integer endProperty;

@io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId")
private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value = "月租金/分成(分)", name = "price")


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java View File

@@ -88,4 +88,5 @@ public interface WxRentContractService {

Integer getShopType(WxRentContract wxRentContract);

void endContract(WxRentContract wxRentContract);
}

+ 22
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -103,7 +103,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
WxFlowRecordMapper wxFlowRecordMapper;

@Autowired
WxPropertyContractService wxPropertyContractService;
WxBillPropertyMapper wxBillPropertyMapper;

@Override
public Map<String, Object> listAsPage(WxRentContract record, Integer pageIndex, Integer pageSize) {
@@ -2017,6 +2017,27 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
return list;
}

@Override
public void endContract(WxRentContract wxRentContract) {
//终止租赁合同,同时终止物业合同
if(EnumEndProperty.END_RENT_AND_PROPERTY.getCode().equals(wxRentContract.getEndProperty())){
WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.setRentContractId(wxRentContract.getId());
wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode());
wxPropertyContractMapper.updateStatusByRentContractId(wxPropertyContract);

//物业账单失效
wxBillPropertyMapper.updateInvalidStatusByRent(wxRentContract);
}
//租赁账单失效
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setRentContractId(wxRentContract.getId());
wxBillRentMapper.updateInvalidStatus(wxBillRent);

//解绑商户和商铺关系
wxMerchantService.disable(wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()).getMerchantId());
}
}




Loading…
Cancel
Save