| @@ -106,11 +106,14 @@ public class WxMerchantController extends BaseController { | |||||
| }else { | }else { | ||||
| wxMerchant.setNoCarVendor(1); | wxMerchant.setNoCarVendor(1); | ||||
| } | } | ||||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | |||||
| if (null != dataRule) { | |||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | |||||
| //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| if (null != wxMerchant.getIsAll() && EnumYesOrNo.YES.getCode() == wxMerchant.getIsAll()) { | |||||
| }else { | |||||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | |||||
| if (null != dataRule) { | |||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | |||||
| //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | |||||
| } | } | ||||
| final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); | final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -1,5 +1,7 @@ | |||||
| INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) | INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) | ||||
| VALUES (213, '写字楼住宅', 201, 'Y', NULL, 1, NULL, NULL, 'xzlzzlist', NULL, 0, 213); | VALUES (213, '写字楼住宅', 201, 'Y', NULL, 1, NULL, NULL, 'xzlzzlist', NULL, 0, 213); | ||||
| INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) | |||||
| VALUES (228, '全部商户', 202, 'Y', NULL, 1, NULL, NULL, 'qbshgnlist', NULL, 0, 221); | |||||
| ALTER TABLE wx_merchant DROP COLUMN TYPE; | ALTER TABLE wx_merchant DROP COLUMN TYPE; | ||||
| @@ -213,4 +215,6 @@ ALTER TABLE wx_rent_contract DROP COLUMN contract_type; | |||||
| ALTER TABLE wx_property_contract DROP COLUMN rent_shop_type; | ALTER TABLE wx_property_contract DROP COLUMN rent_shop_type; | ||||
| ALTER TABLE wx_property_contract DROP COLUMN contract_type; | ALTER TABLE wx_property_contract DROP COLUMN contract_type; | ||||
| UPDATE mall_permission SET available = 'N' WHERE id = 222; | |||||
| UPDATE mall_permission SET NAME = '楼栋商户管理' WHERE id = 221; | |||||
| UPDATE mall_permission SET sort = 222 WHERE id = 221; | |||||
| @@ -496,4 +496,6 @@ public class WxMerchant extends TenantEntity { | |||||
| public Integer advanceHasMoney; | public Integer advanceHasMoney; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| public Date receiveDate; | public Date receiveDate; | ||||
| @TableField(exist = false) | |||||
| public Integer isAll; | |||||
| } | } | ||||
| @@ -202,7 +202,7 @@ public interface WxMerchantService { | |||||
| Map<String, Object> detailByShopId(TenantEntity tenantInfo, Long shopId); | Map<String, Object> detailByShopId(TenantEntity tenantInfo, Long shopId); | ||||
| List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ,String shopNumber) ; | |||||
| List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,String shopTypeForRule,Integer merchantShopDel,Integer shopDel ,String shopNumber) ; | |||||
| List<WxMerchantVo> findMerchantListByProduct(TenantEntity tenantEntity,Long productId,boolean hasShop); | List<WxMerchantVo> findMerchantListByProduct(TenantEntity tenantEntity,Long productId,boolean hasShop); | ||||
| @@ -627,7 +627,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { | |||||
| @Override | @Override | ||||
| public PageInfo<PageMerchantMicroPayVO> pageMerchantMicroPay(PageMerchantMicroPayDTO dto) { | public PageInfo<PageMerchantMicroPayVO> pageMerchantMicroPay(PageMerchantMicroPayDTO dto) { | ||||
| if (null != dto.getFloorForRule()) { | if (null != dto.getFloorForRule()) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0,null); | |||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null,null, 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | if (null == mids || mids.size() <= 0 ) { | ||||
| dto.setMerchantId(-1L); | dto.setMerchantId(-1L); | ||||
| }else { | }else { | ||||
| @@ -649,7 +649,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { | |||||
| @Override | @Override | ||||
| public void exportMerchantMicroPay(PageMerchantMicroPayDTO dto, HttpServletResponse response) { | public void exportMerchantMicroPay(PageMerchantMicroPayDTO dto, HttpServletResponse response) { | ||||
| if (null != dto.getFloorForRule()) { | if (null != dto.getFloorForRule()) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0,null); | |||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null,null, 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | if (null == mids || mids.size() <= 0 ) { | ||||
| dto.setMerchantId(-1L); | dto.setMerchantId(-1L); | ||||
| }else { | }else { | ||||
| @@ -118,7 +118,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill | |||||
| private void updateQueryParam(WxAllBill wxBillRent) { | private void updateQueryParam(WxAllBill wxBillRent) { | ||||
| if (StringUtils.isNotBlank(wxBillRent.getShopNumber()) || null != wxBillRent.getFloorForRule() || null != wxBillRent.getFloor() || null != wxBillRent.getBuilding()) { | if (StringUtils.isNotBlank(wxBillRent.getShopNumber()) || null != wxBillRent.getFloorForRule() || null != wxBillRent.getFloor() || null != wxBillRent.getBuilding()) { | ||||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, wxBillRent.getFloorForRule(), wxBillRent.getBuilding(), wxBillRent.getFloor(), 0, 0,wxBillRent.getShopNumber()); | |||||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, wxBillRent.getFloorForRule(), wxBillRent.getBuilding(), wxBillRent.getFloor(),wxBillRent.getShopTypeForRule(), 0, 0,wxBillRent.getShopNumber()); | |||||
| if (null != merchantIds) { | if (null != merchantIds) { | ||||
| wxBillRent.setMerchantIdList(merchantIds); | wxBillRent.setMerchantIdList(merchantIds); | ||||
| }else { | }else { | ||||
| @@ -790,7 +790,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| if (!StringUtils.isBlank(floorId)) { | if (!StringUtils.isBlank(floorId)) { | ||||
| floor = Long.parseLong(floorId); | floor = Long.parseLong(floorId); | ||||
| } | } | ||||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(tenantEntity, null, building, floor, 0, 0,null); | |||||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(tenantEntity, null, building, floor,null, 0, 0,null); | |||||
| if (merchantIds != null) { | if (merchantIds != null) { | ||||
| query.put("ids", merchantIds); | query.put("ids", merchantIds); | ||||
| } | } | ||||
| @@ -228,7 +228,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| @Override | @Override | ||||
| public PageInfo<WxMerchantVo> listAsPageCVo(WxMerchantDto wxMerchantDto, Integer pageIndex, Integer pageSize,boolean hasShop) { | public PageInfo<WxMerchantVo> listAsPageCVo(WxMerchantDto wxMerchantDto, Integer pageIndex, Integer pageSize,boolean hasShop) { | ||||
| if (null != wxMerchantDto.getBuilding() || null != wxMerchantDto.getFloor()) { | if (null != wxMerchantDto.getBuilding() || null != wxMerchantDto.getFloor()) { | ||||
| List<Long> merchantIds = getFloorBuildMerchantIds(wxMerchantDto, null, wxMerchantDto.getBuilding(), wxMerchantDto.getFloor(), null, null,null); | |||||
| List<Long> merchantIds = getFloorBuildMerchantIds(wxMerchantDto, null, wxMerchantDto.getBuilding(), wxMerchantDto.getFloor(),null, null, null,null); | |||||
| wxMerchantDto.setIds(merchantIds); | wxMerchantDto.setIds(merchantIds); | ||||
| } | } | ||||
| if(wxMerchantDto.getIsAdmin() == null){ | if(wxMerchantDto.getIsAdmin() == null){ | ||||
| @@ -1067,7 +1067,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| } | } | ||||
| if (null != wxMerchant.getFloorForRule() || null != wxMerchant.getBuilding() || null != wxMerchant.getFloor()) { | if (null != wxMerchant.getFloorForRule() || null != wxMerchant.getBuilding() || null != wxMerchant.getFloor()) { | ||||
| List<Long> floorMerchantIds = getFloorBuildingMerchantIds(wxMerchant,wxMerchant.getFloorForRule(),wxMerchant.getBuilding(),wxMerchant.getFloor()); | |||||
| List<Long> floorMerchantIds = getFloorBuildingMerchantIds(wxMerchant,wxMerchant.getFloorForRule(),wxMerchant.getBuilding(),wxMerchant.getFloor(),wxMerchant.getShopTypeForRule()); | |||||
| if (null != floorMerchantIds && floorMerchantIds.size() > 0 ) { | if (null != floorMerchantIds && floorMerchantIds.size() > 0 ) { | ||||
| wxMerchant.setIds(floorMerchantIds); | wxMerchant.setIds(floorMerchantIds); | ||||
| }else { | }else { | ||||
| @@ -1273,7 +1273,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| } | } | ||||
| } | } | ||||
| List<Long> floorMerchantIds = getFloorBuildingMerchantIds(record,record.getFloorForRule(),record.getBuilding(),record.getFloor()); | |||||
| List<Long> floorMerchantIds = getFloorBuildingMerchantIds(record,record.getFloorForRule(),record.getBuilding(),record.getFloor(),record.getShopTypeForRule()); | |||||
| if(floorMerchantIds != null){ | if(floorMerchantIds != null){ | ||||
| if(merchantIds.size() > 0){ | if(merchantIds.size() > 0){ | ||||
| merchantIds.retainAll(floorMerchantIds); | merchantIds.retainAll(floorMerchantIds); | ||||
| @@ -1322,14 +1322,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| } | } | ||||
| private List<Long> getFloorBuildingMerchantIds(TenantEntity tenantEntity,String floorForRule,Long buildingId,Long floor) { | |||||
| private List<Long> getFloorBuildingMerchantIds(TenantEntity tenantEntity,String floorForRule,Long buildingId,Long floor,String shopTypeForRule) { | |||||
| String floorRule = StringUtils.trimToNull(floorForRule); | String floorRule = StringUtils.trimToNull(floorForRule); | ||||
| List<Long> floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor, 0, 0,null); | |||||
| List<Long> floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor,shopTypeForRule, 0, 0,null); | |||||
| return floorMerchantIds; | return floorMerchantIds; | ||||
| } | } | ||||
| @Override | @Override | ||||
| public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel,String shopNumber ) { | |||||
| public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,String shopTypeForRule,Integer merchantShopDel,Integer shopDel,String shopNumber ) { | |||||
| if (null != floorRule || null != building || null != floor) { | if (null != floorRule || null != building || null != floor) { | ||||
| List<Long> floorMerchantIds = null; | List<Long> floorMerchantIds = null; | ||||
| WxShop shopQ = new WxShop(); | WxShop shopQ = new WxShop(); | ||||
| @@ -1346,6 +1346,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| if (null != floor) { | if (null != floor) { | ||||
| shopQ.setFloor(floor); | shopQ.setFloor(floor); | ||||
| } | } | ||||
| if (null != shopTypeForRule) { | |||||
| shopQ.setShopTypeForRule(shopTypeForRule); | |||||
| } | |||||
| shopQ.setShopNumber(shopNumber); | shopQ.setShopNumber(shopNumber); | ||||
| List<Long> shopIds = wxShopMapper.findIdList(shopQ); | List<Long> shopIds = wxShopMapper.findIdList(shopQ); | ||||
| if (null == shopIds || shopIds.size() <= 0) { | if (null == shopIds || shopIds.size() <= 0) { | ||||
| @@ -185,7 +185,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||||
| private void handleQueryParam(WxMerchantTradeDaily record) { | private void handleQueryParam(WxMerchantTradeDaily record) { | ||||
| //楼层楼座 | //楼层楼座 | ||||
| List<Long> floorMids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode(),null); | |||||
| List<Long> floorMids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuildingId(), record.getFloorId(),record.getShopTypeForRule(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode(),null); | |||||
| if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName()) || StringUtils.isNotBlank(record.getShopTypeForRule())) { | if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName()) || StringUtils.isNotBlank(record.getShopTypeForRule())) { | ||||
| WxMerchant m = new WxMerchant(); | WxMerchant m = new WxMerchant(); | ||||
| m.updateTenantInfo(record); | m.updateTenantInfo(record); | ||||
| @@ -99,7 +99,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| @Override | @Override | ||||
| public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { | ||||
| if (StringUtils.isNotBlank(record.getFloorForRule())) { | if (StringUtils.isNotBlank(record.getFloorForRule())) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0,null); | |||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | if (null == mids || mids.size() <= 0 ) { | ||||
| record.setId(-1L); | record.setId(-1L); | ||||
| } else { | } else { | ||||
| @@ -1504,7 +1504,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| @Override | @Override | ||||
| public PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { | public PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { | ||||
| if (StringUtils.isNoneBlank(rentContract.getFloorForRule())) { | if (StringUtils.isNoneBlank(rentContract.getFloorForRule())) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0,null); | |||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null,rentContract.getShopTypeForRule(), 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | if (null == mids || mids.size() <= 0 ) { | ||||
| rentContract.setId(-1L); | rentContract.setId(-1L); | ||||
| } else { | } else { | ||||
| @@ -58,7 +58,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract | |||||
| @Override | @Override | ||||
| public PageInfo<WxRentPropertyContractVo> listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxRentPropertyContractVo> listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0,null); | |||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | if (null == mids || mids.size() <= 0 ) { | ||||
| record.setId(-1L); | record.setId(-1L); | ||||
| } else { | } else { | ||||