winter 1 год назад
Родитель
Сommit
c8be7ec696
2 измененных файлов: 14 добавлений и 13 удалений
  1. +14
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +0
    -13
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

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

@@ -60,6 +60,8 @@ public class WxPropertyContractController extends WxContractBaseController {
private WxShopService wxShopService;
@Autowired
private WxRentContractService rentContractService;
@Autowired
private WxMerchantService wxMerchantService;

@GetMapping("/list")
@ApiImplicitParams({
@@ -221,6 +223,18 @@ public class WxPropertyContractController extends WxContractBaseController {
wxPropertyContract.setRentInfo(rentContract.getRentInfo());
}
WxMerchant merchant = wxMerchantService.selectById(wxPropertyContract.getMerchantId());
if (merchant == null) {
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}
wxPropertyContract.setBusinessId(merchant.getBusinessId());
wxPropertyContract.setBrand(merchant.getBrand());
wxPropertyContract.setMerchantName(merchant.getName());
wxPropertyContract.setShopType(merchant.getShopType());
wxPropertyContract.setLinkPerson(merchant.getLinkPerson());
wxPropertyContract.setLinkPhone(merchant.getLinkPhone());
wxPropertyContract.setRentShopType(merchant.getRentShopType());
Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode());
wxPropertyContract.setContractType(contractType);
wxPropertyContract.setRentStartType(EnumRentStartType.RENTTIME.getCode());


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

@@ -304,19 +304,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
@Override
//@Transactional(rollbackFor = {Exception.class})
public ResultData save(WxPropertyContract record, Long userId, String userName,boolean writeComplate) {
// 保存调整金额(预账单调整)
WxMerchant merchant = wxMerchantMapper.selectById(record.getMerchantId());
if (merchant == null) {
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}
record.setBusinessId(merchant.getBusinessId());
record.setBrand(merchant.getBrand());
record.setMerchantName(merchant.getName());
record.setShopType(merchant.getShopType());
record.setLinkPerson(merchant.getLinkPerson());
record.setLinkPhone(merchant.getLinkPhone());
record.setRentShopType(merchant.getRentShopType());
//保存物业合同信息
if (record.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) {
record.setEndDate(setEndDate(record.getStartDate(),record.getRentalStartDate()));


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