From c58d5cee59d33139434d36b13b55b1125209baef Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 21 Sep 2024 09:12:25 +0800 Subject: [PATCH] fix --- .../controller/basic/WxMerchantController.java | 13 ++++++++----- .../resources/db/migration/V202409000000001.sql | 6 +++++- .../java/com/iformall/domain/po/WxMerchant.java | 2 ++ .../com/iformall/service/WxMerchantService.java | 2 +- .../impl/MarkingDataReportServiceImpl.java | 4 ++-- .../service/impl/WxAllBillServiceImpl.java | 2 +- .../iformall/service/impl/WxChartServiceImpl.java | 2 +- .../service/impl/WxMerchantServiceImpl.java | 15 +++++++++------ .../impl/WxMerchantTradeDailyServiceImpl.java | 2 +- .../impl/WxPropertyContractServiceImpl.java | 2 +- .../service/impl/WxRentContractServiceImpl.java | 2 +- .../impl/WxRentPropertyContractServiceImpl.java | 2 +- 12 files changed, 33 insertions(+), 21 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 d590b20b1..5d75aebf5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -106,11 +106,14 @@ public class WxMerchantController extends BaseController { }else { 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 page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql index 8546cec49..d5eec8d37 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql @@ -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`) 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; @@ -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 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; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 39930c525..5cd9c8b46 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -496,4 +496,6 @@ public class WxMerchant extends TenantEntity { public Integer advanceHasMoney; @TableField(exist = false) public Date receiveDate; + @TableField(exist = false) + public Integer isAll; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index fa8defe26..a66c7490a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -202,7 +202,7 @@ public interface WxMerchantService { Map detailByShopId(TenantEntity tenantInfo, Long shopId); - List getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ,String shopNumber) ; + List getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,String shopTypeForRule,Integer merchantShopDel,Integer shopDel ,String shopNumber) ; List findMerchantListByProduct(TenantEntity tenantEntity,Long productId,boolean hasShop); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 787e326db..60f96b889 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -627,7 +627,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override public PageInfo pageMerchantMicroPay(PageMerchantMicroPayDTO dto) { if (null != dto.getFloorForRule()) { - List mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0,null); + List mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null,null, 0, 0,null); if (null == mids || mids.size() <= 0 ) { dto.setMerchantId(-1L); }else { @@ -649,7 +649,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override public void exportMerchantMicroPay(PageMerchantMicroPayDTO dto, HttpServletResponse response) { if (null != dto.getFloorForRule()) { - List mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0,null); + List mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null,null, 0, 0,null); if (null == mids || mids.size() <= 0 ) { dto.setMerchantId(-1L); }else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java index 0e7630c1d..ee960c001 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -118,7 +118,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill private void updateQueryParam(WxAllBill wxBillRent) { if (StringUtils.isNotBlank(wxBillRent.getShopNumber()) || null != wxBillRent.getFloorForRule() || null != wxBillRent.getFloor() || null != wxBillRent.getBuilding()) { - List merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, wxBillRent.getFloorForRule(), wxBillRent.getBuilding(), wxBillRent.getFloor(), 0, 0,wxBillRent.getShopNumber()); + List merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, wxBillRent.getFloorForRule(), wxBillRent.getBuilding(), wxBillRent.getFloor(),wxBillRent.getShopTypeForRule(), 0, 0,wxBillRent.getShopNumber()); if (null != merchantIds) { wxBillRent.setMerchantIdList(merchantIds); }else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 9f01c93da..64fc3b032 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -790,7 +790,7 @@ public class WxChartServiceImpl implements WxChartDataService { if (!StringUtils.isBlank(floorId)) { floor = Long.parseLong(floorId); } - List merchantIds = wxMerchantService.getFloorBuildMerchantIds(tenantEntity, null, building, floor, 0, 0,null); + List merchantIds = wxMerchantService.getFloorBuildMerchantIds(tenantEntity, null, building, floor,null, 0, 0,null); if (merchantIds != null) { query.put("ids", merchantIds); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 5dc41f913..f8adfc450 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -228,7 +228,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public PageInfo listAsPageCVo(WxMerchantDto wxMerchantDto, Integer pageIndex, Integer pageSize,boolean hasShop) { if (null != wxMerchantDto.getBuilding() || null != wxMerchantDto.getFloor()) { - List merchantIds = getFloorBuildMerchantIds(wxMerchantDto, null, wxMerchantDto.getBuilding(), wxMerchantDto.getFloor(), null, null,null); + List merchantIds = getFloorBuildMerchantIds(wxMerchantDto, null, wxMerchantDto.getBuilding(), wxMerchantDto.getFloor(),null, null, null,null); wxMerchantDto.setIds(merchantIds); } if(wxMerchantDto.getIsAdmin() == null){ @@ -1067,7 +1067,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } if (null != wxMerchant.getFloorForRule() || null != wxMerchant.getBuilding() || null != wxMerchant.getFloor()) { - List floorMerchantIds = getFloorBuildingMerchantIds(wxMerchant,wxMerchant.getFloorForRule(),wxMerchant.getBuilding(),wxMerchant.getFloor()); + List floorMerchantIds = getFloorBuildingMerchantIds(wxMerchant,wxMerchant.getFloorForRule(),wxMerchant.getBuilding(),wxMerchant.getFloor(),wxMerchant.getShopTypeForRule()); if (null != floorMerchantIds && floorMerchantIds.size() > 0 ) { wxMerchant.setIds(floorMerchantIds); }else { @@ -1273,7 +1273,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } } - List floorMerchantIds = getFloorBuildingMerchantIds(record,record.getFloorForRule(),record.getBuilding(),record.getFloor()); + List floorMerchantIds = getFloorBuildingMerchantIds(record,record.getFloorForRule(),record.getBuilding(),record.getFloor(),record.getShopTypeForRule()); if(floorMerchantIds != null){ if(merchantIds.size() > 0){ merchantIds.retainAll(floorMerchantIds); @@ -1322,14 +1322,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { } - private List getFloorBuildingMerchantIds(TenantEntity tenantEntity,String floorForRule,Long buildingId,Long floor) { + private List getFloorBuildingMerchantIds(TenantEntity tenantEntity,String floorForRule,Long buildingId,Long floor,String shopTypeForRule) { String floorRule = StringUtils.trimToNull(floorForRule); - List floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor, 0, 0,null); + List floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor,shopTypeForRule, 0, 0,null); return floorMerchantIds; } @Override - public List getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel,String shopNumber ) { + public List getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,String shopTypeForRule,Integer merchantShopDel,Integer shopDel,String shopNumber ) { if (null != floorRule || null != building || null != floor) { List floorMerchantIds = null; WxShop shopQ = new WxShop(); @@ -1346,6 +1346,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (null != floor) { shopQ.setFloor(floor); } + if (null != shopTypeForRule) { + shopQ.setShopTypeForRule(shopTypeForRule); + } shopQ.setShopNumber(shopNumber); List shopIds = wxShopMapper.findIdList(shopQ); if (null == shopIds || shopIds.size() <= 0) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 61a1b8a1b..aa94610a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -185,7 +185,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ private void handleQueryParam(WxMerchantTradeDaily record) { //楼层楼座 - List floorMids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode(),null); + List 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())) { WxMerchant m = new WxMerchant(); m.updateTenantInfo(record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 1bef1b332..cd7e7af20 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -99,7 +99,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public PageInfo listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { if (StringUtils.isNotBlank(record.getFloorForRule())) { - List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0,null); + List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); if (null == mids || mids.size() <= 0 ) { record.setId(-1L); } else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index a09cfab79..81281edc5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1504,7 +1504,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public PageInfo getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { if (StringUtils.isNoneBlank(rentContract.getFloorForRule())) { - List mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0,null); + List mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null,rentContract.getShopTypeForRule(), 0, 0,null); if (null == mids || mids.size() <= 0 ) { rentContract.setId(-1L); } else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index af40e676f..e1b7a63cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -58,7 +58,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract @Override public PageInfo listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { - List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0,null); + List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); if (null == mids || mids.size() <= 0 ) { record.setId(-1L); } else {