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

[租赁合同][修改][添加合同状态及补录合同调整]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
e9c8fe1b7b
4 измененных файлов: 6 добавлений и 38 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  4. +3
    -36
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java Просмотреть файл

@@ -132,7 +132,7 @@ public class WxRentContractController extends BaseController {
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData updateRentContractStatus(Long id) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus");
return wxRentContractService.updateRentContractStatus(id, getUser().getId());
return wxRentContractService.updateRentContractStatus(id);
}

}

+ 1
- 0
mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java Просмотреть файл

@@ -7,6 +7,7 @@ package com.iformall.enums;

public enum EnumRentContractStatus {

INTENTION(0, "意向"),
WAIT_SIGN(1, "待签约"),
SIGNED_RENT_UNPAID(2, "已签约未记租"),
RENT_PAID(3, "计租中"),


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java Просмотреть файл

@@ -63,7 +63,7 @@ public interface WxRentContractService {

ResultData updateFile(WxRentContract wxRentContract, Long userId);

ResultData updateRentContractStatus(Long id, Long userId);
ResultData updateRentContractStatus(Long id);

void updateApplyStatus(WxRentContract wxRentContract);



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

@@ -181,22 +181,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND);
}
wxRentContractMapper.insertSelective(record);
//建立账单
if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())
&& record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) {
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setMerchantId(record.getMerchantId());
List<Map<String, Object>> billRentList = wxBillRentMapper.queryBillRentList(wxBillRent);
if (billRentList.size() == 0) {
WxMerchant wxMerchant = new WxMerchant();
wxMerchant.setId(record.getMerchantId());
wxMerchant.setTenantId(record.getTenantId());
//租金
buildRent(wxMerchant, userId);
//押金
buildDeposit(wxMerchant, userId);
}
}
} catch (Exception e) {
logger.error("保存租赁合同信息失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
@@ -257,27 +241,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND);
}
wxRentContractMapper.updateByPrimaryKeySelective(record);
//建立账单
/*if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())
&& record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) {
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setMerchantId(record.getMerchantId());
List<Map<String, Object>> billRentList = wxBillRentMapper.queryBillRentList(wxBillRent);
if (billRentList.size() == 0) {
WxMerchant wxMerchant = new WxMerchant();
wxMerchant.setId(record.getMerchantId());
wxMerchant.setTenantId(record.getTenantId());
//租金
buildRent(wxMerchant, userId);
//押金
buildDeposit(wxMerchant, userId);
}
}*/
} catch (Exception e) {
logger.error("更新租赁合同信息失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
// return new ResultData(Result.SUCCESS, "更新租赁合同信息成功");
return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", wxRentContract);
}

@@ -815,7 +782,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}

@Override
public ResultData updateRentContractStatus(Long id, Long userId) {
public ResultData updateRentContractStatus(Long id) {
if (id == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
}
@@ -840,9 +807,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxMerchant.setId(record.getMerchantId());
wxMerchant.setTenantId(record.getTenantId());
//租金
buildRent(wxMerchant, userId);
buildRent(wxMerchant, null);
//押金
buildDeposit(wxMerchant, userId);
buildDeposit(wxMerchant, null);
}
}
return new ResultData(Result.SUCCESS, "操作成功");


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