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

Merge branch 'release_real_202008' of https://git.malls.iformall.com/server/formallProject into release_real_202008

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
719b13cc91
4 измененных файлов: 8 добавлений и 12 удалений
  1. +1
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  3. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -75,12 +75,7 @@ public class WxPropertyContractController extends WxContractBaseController {
@SystemControllerLog(description = "物业合同-新增")
public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add");
//MallUserInfo user = getUser();
MallUserInfo user = new MallUserInfo();
user.setId(321127266275430400L);
user.setName("alitest");
user.setTenantId("789");
user.setParentTenantId("788");
MallUserInfo user = getUser();
wxPropertyContract.updateTenantInfo(user);
wxPropertyContract.setAdjustPeriodHandle();
Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode());


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

@@ -215,7 +215,7 @@ public class WxRentContractController extends WxContractBaseController {
try {
update = wxRentContractService.update(rentContract, user.getId(), user.getName(), EnumFromType.OTHER.getCode(), oldDate);
} catch (MallinkException e) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR);
return new ResultData(update.code,update.message);
}
return update;
}else {


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

@@ -327,7 +327,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
propertyContractQuery.setRentContractId(record.getRentContractId());
int propertyContractCount = wxPropertyContractMapper.selectCount(new QueryWrapper(propertyContractQuery));
if (propertyContractCount > 0) {
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR);
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"租金合同编号["+record.getRentContractId()+"]存在关联的物业合同");
}
}
hasFlow = false;
@@ -401,10 +401,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
// record.setStatus(EnumRentContractStatus.INTENTION.getCode());
// }

if (CollectionUtils.isEmpty(record.getFlowParams())) {
hasFlow = false;
record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode());
}
// if (CollectionUtils.isEmpty(record.getFlowParams())) {
// hasFlow = false;
// record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode());
// }
try {
wxPropertyContractMapper.updateById(record);
} catch (Exception e) {


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

@@ -234,6 +234,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
WxPropertyContract propertyContract = new WxPropertyContract();
propertyContract.setRentContractId(id);
result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract));
result.put("protertyContract", wxPropertyContractMapper.findOneByRentId(wxRentContract));
//押金欠缴
result.put("depositOweCount",wxBillDepositMapper.queryOweCount(wxRentContract));
//押金状态


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