Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
6e2ac82d53
3 changed files with 12 additions and 3 deletions
  1. +4
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +4
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  3. +4
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java

+ 4
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java View File

@@ -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<Integer> rentShopTypeList = new ArrayList<Integer>();
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));
}


+ 4
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java View File

@@ -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<Integer> rentShopTypeList = new ArrayList<Integer>();
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<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize);
Integer hasFlow = null;


+ 4
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -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<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());
}
PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize);
Integer hasFlow = null;


Loading…
Cancel
Save