| @@ -689,6 +689,19 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| if (null == wxRentContract.getIsPrivateMerchant()) { | if (null == wxRentContract.getIsPrivateMerchant()) { | ||||
| wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); | wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); | ||||
| } | } | ||||
| //如果是已售,则查询虚拟商户,并且店铺类型是商业的 | |||||
| if (wxRentContract.getIsPrivateMerchant()==2) { | |||||
| wxRentContract.setIsPrivateMerchant(EnumYesOrNo.YES.getCode()); | |||||
| List<Integer> rentShopTypeList = new ArrayList<Integer>(); | |||||
| rentShopTypeList.add(EnumRentShopType.SHOP.getCode()); | |||||
| rentShopTypeList.add(EnumRentShopType.POINT.getCode()); | |||||
| wxRentContract.setPrivateRentShopTypeList(rentShopTypeList); | |||||
| }else if (wxRentContract.getIsPrivateMerchant()==1) { | |||||
| wxRentContract.setIsPrivateMerchant(EnumYesOrNo.YES.getCode()); | |||||
| wxRentContract.setPrivateRentShopType(EnumRentShopType.XIZILOU.getCode()); | |||||
| } | |||||
| } | } | ||||
| wxRentContract.setSortColumns(SortField.Createtime_DESC); | wxRentContract.setSortColumns(SortField.Createtime_DESC); | ||||