diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java index 32f87ba9c..95dd183a3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -42,6 +42,7 @@ public class WxMallBuildingController extends BaseController { if (null != dataRule) { wxMallBuilding.setFloorForRule(dataRule.getFloorIds()); wxMallBuilding.setBusinessForRule(dataRule.getBussinessIds()); + wxMallBuilding.setShopTypeForRule(dataRule.getShopType()); } return wxMallBuildingService.getBuildingFloorList(wxMallBuilding,this.getUser()); } 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 e605c81d9..086c9cc9b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -79,6 +79,7 @@ public class WxMerchantController extends BaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopType()); } final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); @@ -106,6 +107,7 @@ public class WxMerchantController extends BaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopType()); } final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); @@ -377,6 +379,7 @@ public class WxMerchantController extends BaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopType()); } wxMerchantService.exportData(wxMerchant,request,response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 6e75523a3..8688fbb7b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -39,6 +39,7 @@ public class WxShopController extends BaseController { if (null != dataRule) { wxShop.setFloorForRule(dataRule.getFloorIds()); wxShop.setBusinessForRule(dataRule.getBussinessIds()); + wxShop.setShopTypeForRule(dataRule.getShopType()); } } 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 07e430cef..052ba1244 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -79,6 +79,7 @@ public class WxPropertyContractController extends WxContractBaseController { if (null != dataRule) { wxPropertyContract.setFloorForRule(dataRule.getFloorIds()); wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); + wxPropertyContract.setShopTypeForRule(dataRule.getShopType()); } 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 3acf7a0ed..eadd8c663 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -76,6 +76,7 @@ public class WxRentContractController extends WxContractBaseController { if (null != dataRule) { wxRentContract.setFloorForRule(dataRule.getFloorIds()); wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); + wxRentContract.setShopTypeForRule(dataRule.getShopType()); } PageInfo page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); Integer hasFlow = null; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index b322893b9..95c0407c3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -56,6 +56,7 @@ public class WxRentPropertyContractController extends WxContractBaseController { if (null != dataRule) { wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds()); wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); + wxRentPropertyContractVo.setShopTypeForRule(dataRule.getShopType()); } PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); Integer hasFlow = null; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index 951dea6b7..30bebbe0d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -52,6 +52,7 @@ public class WxMerchantTradeDailyController extends BaseController { if (null != dataRule) { wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); //wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType()); } wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.CreateDate_DESC); PageInfo page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); @@ -68,6 +69,7 @@ public class WxMerchantTradeDailyController extends BaseController { if (null != dataRule) { wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType()); } return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily); } @@ -161,6 +163,7 @@ public class WxMerchantTradeDailyController extends BaseController { if (null != dataRule) { wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); //wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType()); } wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index f7c37ed50..f59db3ac0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -83,6 +83,7 @@ public class WxEnergyController extends BaseController { if (null != dataRule) { record.setFloorForRule(dataRule.getFloorIds()); record.setBusinessForRule(dataRule.getBussinessIds()); + record.setShopTypeForRule(dataRule.getShopType()); } record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index a2ebbaa3b..5c1449187 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -82,6 +82,7 @@ public class WxMerchantMicroPayController extends BaseController { if (null != dataRule) { dto.setFloorForRule(dataRule.getFloorIds()); dto.setBusinessForRule(dataRule.getBussinessIds()); + dto.setShopTypeForRule(dataRule.getShopType()); } PageInfo page = markingDataReportService.pageMerchantMicroPay(dto); return new ResultData(page); @@ -96,6 +97,7 @@ public class WxMerchantMicroPayController extends BaseController { if (null != dataRule) { dto.setFloorForRule(dataRule.getFloorIds()); dto.setBusinessForRule(dataRule.getBussinessIds()); + dto.setShopTypeForRule(dataRule.getShopType()); } markingDataReportService.exportMerchantMicroPay(dto, response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index c5141efd5..090ce85df 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -121,6 +121,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopType()); } return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,null)); } @@ -189,6 +190,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopType()); } PageInfo page = getVoPage(wxMerchant, 1, 10000,null); excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxMerchantBillVo.class, "商户账单总览数据.xlsx", response, false); @@ -355,6 +357,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopType()); } if (isOwe) { wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); @@ -415,6 +418,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopType()); } wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); @@ -445,6 +449,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopType()); } wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); @@ -609,6 +614,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopType()); } return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,EnumBillStatus.STOP_TO_SETTLE.getCode())); } @@ -720,6 +726,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { record.setFloorForRule(dataRule.getFloorIds()); record.setBusinessForRule(dataRule.getBussinessIds()); + record.setShopTypeForRule(dataRule.getShopType()); } if (null != record.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { @@ -742,6 +749,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxBillRent.setFloorForRule(dataRule.getFloorIds()); wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); + wxBillRent.setShopTypeForRule(dataRule.getShopType()); } if (null != wxBillRent.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { @@ -764,6 +772,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { record.setFloorForRule(dataRule.getFloorIds()); record.setBusinessForRule(dataRule.getBussinessIds()); + record.setShopTypeForRule(dataRule.getShopType()); } if (null != record.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java index 98eb6e43e..bbe114111 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java @@ -54,6 +54,9 @@ public class WxEnergyMeter extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否总表", name = "isPublic") private Integer isPublic; + @io.swagger.annotations.ApiModelProperty(value = "店铺类型EnumRentShopType", name = "shopType") + private Integer shopType; + @io.swagger.annotations.ApiModelProperty(value = "楼栋ID", name = "buildingId") private Long buildingId; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java index d61899834..013cc3df8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java @@ -20,7 +20,7 @@ public class WxUserDataRule extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId") private Long userId; - @io.swagger.annotations.ApiModelProperty(value = "权限类型", name = "type") + @io.swagger.annotations.ApiModelProperty(value = "权限类型EnumUserDataRuleType", name = "type") private Integer type; @io.swagger.annotations.ApiModelProperty(value = "楼层楼座", name = "buildingFloor") private String buildingFloor; @@ -32,6 +32,8 @@ public class WxUserDataRule extends TenantEntity { private Date createTime; @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value = "店铺类型", name = "shopType") + private String shopType; public String getFloorIds() { if (StringUtils.isNotEmpty(buildingFloor)) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java index 10dd7706e..f58e6f4bd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java @@ -39,6 +39,9 @@ public class BaseEntity implements Serializable { @TableField(exist = false) protected String businessForRule; + + @TableField(exist = false) + protected String shopTypeForRule; @TableField(exist = false) protected String[] tempShop; diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index 80c453872..e9b8a0979 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -82,6 +82,7 @@ public class WxBillAllHelper { bill.updateTenantInfo(wxMerchant); bill.setFloorForRule(wxMerchant.getFloorForRule()); bill.setBusinessForRule(wxMerchant.getBusinessForRule()); + bill.setShopTypeForRule(wxMerchant.getShopTypeForRule()); bill.setBuilding(wxMerchant.getBuilding()); bill.setFloor(wxMerchant.getFloor()); bill.setMerchantName(wxMerchant.getName()); 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 bd35feaf2..f722f5f36 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -126,10 +126,11 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill } } - if (StringUtils.isNotBlank(wxBillRent.getMerchantName())) { + if (StringUtils.isNotBlank(wxBillRent.getMerchantName()) || StringUtils.isNotBlank(wxBillRent.getShopTypeForRule())) { WxMerchant mq = new WxMerchant(); mq.updateTenantInfo(wxBillRent); mq.setName(StringUtils.trimToNull(wxBillRent.getMerchantName())); + mq.setShopTypeForRule(wxBillRent.getShopTypeForRule()); List mids = wxMerchantService.findIdList(mq); if (null != mids && mids.size() > 0 ) { if (null != wxBillRent.getMerchantIdList()) { 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 42e7ffd33..61a1b8a1b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -186,11 +186,12 @@ 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); - if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName())) { + if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName()) || StringUtils.isNotBlank(record.getShopTypeForRule())) { WxMerchant m = new WxMerchant(); m.updateTenantInfo(record); m.setName(StringUtils.trimToNull(record.getMerchantName())); m.setIds(floorMids); + m.setShopTypeForRule(record.getShopTypeForRule()); List merchantIdList = wxMerchantService.findIdList(m); if (null != merchantIdList && merchantIdList.size() > 0 ) { record.setMerchantIdList(merchantIdList); diff --git a/mallinkService/src/main/resources/mapper/WxEnergyMeterMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyMeterMapper.xml index 2dbf460d4..9d1d55ddf 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyMeterMapper.xml @@ -15,10 +15,11 @@ + - `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`type`,`rate`,`is_public`,`building_id`,`floor_id`,`shop_id` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`type`,`rate`,`is_public`,`building_id`,`floor_id`,`shop_id`,`shop_type` @@ -36,10 +37,14 @@ and `building_id` = #{buildingId} and `floor_id` = #{floorId} and `shop_id` = #{shopId} + and `shop_type` = #{shopType} and name like concat('%', #{name},'%') and `floor_id` in (${floorForRule}) + + and `shop_type` in (${shopTypeForRule}) + and shop_id in diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 22ed64ba1..f5f97cf1e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -124,6 +124,9 @@ and m.business_id in (${businessForRule}) and m.is_del=0 + + and m.type in (${shopTypeForRule}) + and JSON_CONTAINS(m.business_types,JSON_OBJECT('id', #{businessTypes})) diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 963e71dfa..72000d5bb 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -126,6 +126,9 @@ and business_id in (${businessForRule}) + + and rent_shop_type in (${shopTypeForRule}) + and merchant_id in diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index e7a2a7f6a..a0cc300fc 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -208,6 +208,10 @@ and business_id in (${businessForRule}) + + and rent_shop_type in (${shopTypeForRule}) + + and merchant_id in @@ -437,6 +441,9 @@ and rc.business_id in (${businessForRule}) + + and rc.rent_shop_type in (${shopTypeForRule}) + and rc.merchant_id in diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 08a6e893f..272bbd252 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -133,6 +133,10 @@ and `floor` in (${floorForRule}) + + + and type in (${shopTypeForRule}) + and id in @@ -334,6 +338,10 @@ and s.`business_id` in (${businessForRule}) + + + and s.`type` in (${shopTypeForRule}) + order by ${sortColumn} ${sortOrder} @@ -446,6 +454,10 @@ and s.`business_id` in (${businessForRule}) + + + and s.`type` in (${shopTypeForRule}) + and s.id in diff --git a/mallinkService/src/main/resources/mapper/WxUserDataRuleMapper.xml b/mallinkService/src/main/resources/mapper/WxUserDataRuleMapper.xml index e73ad02d3..24927a1e8 100644 --- a/mallinkService/src/main/resources/mapper/WxUserDataRuleMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxUserDataRuleMapper.xml @@ -7,15 +7,16 @@ - + + - `id`,`tenant_id`,`parent_tenant_id`,`user_id`,`type`,`business`,`target`,`create_time`,`update_time` + `id`,`tenant_id`,`parent_tenant_id`,`user_id`,`type`,`building_floor`,`business`,`target`,`shop_type`,`create_time`,`update_time`