From 6e2ac82d538b5d6c401cf4d84ec9ae84431e151a Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 28 Sep 2024 18:53:53 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/basic/WxMerchantController.java | 5 ++++- .../controller/contract/WxPropertyContractController.java | 5 ++++- .../controller/contract/WxRentContractController.java | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index a1cdd7813..1ff2486e3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -272,12 +272,15 @@ public class WxMerchantController extends BaseController { wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); } //如果是已售,则查询虚拟商户,并且店铺类型是商业的 - if (wxMerchant.getIsPrivate()==EnumShopSellStatus.SELLED.getCode()) { + if (wxMerchant.getIsPrivate()==2) { wxMerchant.setIsPrivate(EnumYesOrNo.YES.getCode()); List rentShopTypeList = new ArrayList(); rentShopTypeList.add(EnumRentShopType.SHOP.getCode()); rentShopTypeList.add(EnumRentShopType.POINT.getCode()); wxMerchant.setPrivateRentShopTypeList(rentShopTypeList); + }else if (wxMerchant.getIsPrivate()==1) { + wxMerchant.setIsPrivate(EnumYesOrNo.YES.getCode()); + wxMerchant.setCreateShopType(EnumRentShopType.XIZILOU.getCode()); } return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 9f24b542b..1f2d814b9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -86,12 +86,15 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); } //如果是已售,则查询虚拟商户,并且店铺类型是商业的 - if (wxPropertyContract.getIsPrivateMerchant()==EnumShopSellStatus.SELLED.getCode()) { + if (wxPropertyContract.getIsPrivateMerchant()==2) { wxPropertyContract.setIsPrivateMerchant(EnumYesOrNo.YES.getCode()); List rentShopTypeList = new ArrayList(); rentShopTypeList.add(EnumRentShopType.SHOP.getCode()); rentShopTypeList.add(EnumRentShopType.POINT.getCode()); wxPropertyContract.setPrivateRentShopTypeList(rentShopTypeList); + }else if (wxPropertyContract.getIsPrivateMerchant()==1) { + wxPropertyContract.setIsPrivateMerchant(EnumYesOrNo.YES.getCode()); + wxPropertyContract.setPrivateRentShopType(EnumRentShopType.XIZILOU.getCode()); } PageInfo pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); Integer hasFlow = null; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index a62a9ce23..557ff264c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -82,12 +82,15 @@ public class WxRentContractController extends WxContractBaseController { wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); } //如果是已售,则查询虚拟商户,并且店铺类型是商业的 - if (wxRentContract.getIsPrivateMerchant()==EnumShopSellStatus.SELLED.getCode()) { + if (wxRentContract.getIsPrivateMerchant()==2) { wxRentContract.setIsPrivateMerchant(EnumYesOrNo.YES.getCode()); List rentShopTypeList = new ArrayList(); 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()); } PageInfo page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); Integer hasFlow = null;