|
|
|
@@ -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()); |
|
|
|
|