|
|
@@ -168,6 +168,12 @@ public class WxMerchantController extends BaseController { |
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); |
|
|
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); |
|
|
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
|
|
if (null != dataRule) { |
|
|
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
|
|
} |
|
|
final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); |
|
|
final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); |
|
|
return new ResultData(page); |
|
|
return new ResultData(page); |
|
|
} |
|
|
} |
|
|
@@ -191,6 +197,12 @@ public class WxMerchantController extends BaseController { |
|
|
} |
|
|
} |
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); |
|
|
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); |
|
|
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
|
|
if (null != dataRule) { |
|
|
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
|
|
} |
|
|
final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); |
|
|
final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); |
|
|
return new ResultData(page); |
|
|
return new ResultData(page); |
|
|
} |
|
|
} |
|
|
@@ -246,6 +258,12 @@ public class WxMerchantController extends BaseController { |
|
|
wxMerchant.setType(type); |
|
|
wxMerchant.setType(type); |
|
|
wxMerchant.setCarVendorType(0); |
|
|
wxMerchant.setCarVendorType(0); |
|
|
wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); |
|
|
wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); |
|
|
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
|
|
if (null != dataRule) { |
|
|
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
|
|
} |
|
|
return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); |
|
|
return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|