| @@ -42,6 +42,7 @@ public class WxMallBuildingController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMallBuilding.setFloorForRule(dataRule.getFloorIds()); | wxMallBuilding.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxMallBuilding.setBusinessForRule(dataRule.getBussinessIds()); | wxMallBuilding.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMallBuilding.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| return wxMallBuildingService.getBuildingFloorList(wxMallBuilding,this.getUser()); | return wxMallBuildingService.getBuildingFloorList(wxMallBuilding,this.getUser()); | ||||
| } | } | ||||
| @@ -79,6 +79,7 @@ public class WxMerchantController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchant.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| 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); | ||||
| @@ -106,6 +107,7 @@ public class WxMerchantController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchant.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| 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); | ||||
| @@ -377,6 +379,7 @@ public class WxMerchantController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchant.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| wxMerchantService.exportData(wxMerchant,request,response); | wxMerchantService.exportData(wxMerchant,request,response); | ||||
| } | } | ||||
| @@ -39,6 +39,7 @@ public class WxShopController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxShop.setFloorForRule(dataRule.getFloorIds()); | wxShop.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxShop.setBusinessForRule(dataRule.getBussinessIds()); | wxShop.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxShop.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| } | } | ||||
| @@ -79,6 +79,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxPropertyContract.setFloorForRule(dataRule.getFloorIds()); | wxPropertyContract.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); | wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxPropertyContract.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| @@ -76,6 +76,7 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxRentContract.setFloorForRule(dataRule.getFloorIds()); | wxRentContract.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); | wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxRentContract.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); | PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| @@ -56,6 +56,7 @@ public class WxRentPropertyContractController extends WxContractBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds()); | wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); | wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxRentPropertyContractVo.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| @@ -52,6 +52,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); | wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); | ||||
| //wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); | //wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.CreateDate_DESC); | wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.CreateDate_DESC); | ||||
| PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); | PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); | ||||
| @@ -68,6 +69,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); | wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); | wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily); | return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily); | ||||
| } | } | ||||
| @@ -161,6 +163,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); | wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); | ||||
| //wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); | //wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); | wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); | ||||
| } | } | ||||
| @@ -83,6 +83,7 @@ public class WxEnergyController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| record.setFloorForRule(dataRule.getFloorIds()); | record.setFloorForRule(dataRule.getFloorIds()); | ||||
| record.setBusinessForRule(dataRule.getBussinessIds()); | record.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| record.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| record.updateTenantInfo(getTenantInfo()); | record.updateTenantInfo(getTenantInfo()); | ||||
| record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | ||||
| @@ -82,6 +82,7 @@ public class WxMerchantMicroPayController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| dto.setFloorForRule(dataRule.getFloorIds()); | dto.setFloorForRule(dataRule.getFloorIds()); | ||||
| dto.setBusinessForRule(dataRule.getBussinessIds()); | dto.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| dto.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| PageInfo<PageMerchantMicroPayVO> page = markingDataReportService.pageMerchantMicroPay(dto); | PageInfo<PageMerchantMicroPayVO> page = markingDataReportService.pageMerchantMicroPay(dto); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -96,6 +97,7 @@ public class WxMerchantMicroPayController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| dto.setFloorForRule(dataRule.getFloorIds()); | dto.setFloorForRule(dataRule.getFloorIds()); | ||||
| dto.setBusinessForRule(dataRule.getBussinessIds()); | dto.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| dto.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| markingDataReportService.exportMerchantMicroPay(dto, response); | markingDataReportService.exportMerchantMicroPay(dto, response); | ||||
| } | } | ||||
| @@ -121,6 +121,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchant.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,null)); | return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,null)); | ||||
| } | } | ||||
| @@ -189,6 +190,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchant.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| PageInfo<WxMerchantBillVo> page = getVoPage(wxMerchant, 1, 10000,null); | PageInfo<WxMerchantBillVo> page = getVoPage(wxMerchant, 1, 10000,null); | ||||
| excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxMerchantBillVo.class, "商户账单总览数据.xlsx", response, false); | excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxMerchantBillVo.class, "商户账单总览数据.xlsx", response, false); | ||||
| @@ -355,6 +357,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchant.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| if (isOwe) { | if (isOwe) { | ||||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | ||||
| @@ -415,6 +418,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchant.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | ||||
| wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | ||||
| @@ -445,6 +449,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchant.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | ||||
| wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | ||||
| @@ -609,6 +614,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxMerchant.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,EnumBillStatus.STOP_TO_SETTLE.getCode())); | return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,EnumBillStatus.STOP_TO_SETTLE.getCode())); | ||||
| } | } | ||||
| @@ -720,6 +726,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| record.setFloorForRule(dataRule.getFloorIds()); | record.setFloorForRule(dataRule.getFloorIds()); | ||||
| record.setBusinessForRule(dataRule.getBussinessIds()); | record.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| record.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| if (null != record.getOnlyOweOrNear()) { | if (null != record.getOnlyOweOrNear()) { | ||||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { | if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { | ||||
| @@ -742,6 +749,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxBillRent.setFloorForRule(dataRule.getFloorIds()); | wxBillRent.setFloorForRule(dataRule.getFloorIds()); | ||||
| wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); | wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxBillRent.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| if (null != wxBillRent.getOnlyOweOrNear()) { | if (null != wxBillRent.getOnlyOweOrNear()) { | ||||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { | if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { | ||||
| @@ -764,6 +772,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| record.setFloorForRule(dataRule.getFloorIds()); | record.setFloorForRule(dataRule.getFloorIds()); | ||||
| record.setBusinessForRule(dataRule.getBussinessIds()); | record.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| record.setShopTypeForRule(dataRule.getShopType()); | |||||
| } | } | ||||
| if (null != record.getOnlyOweOrNear()) { | if (null != record.getOnlyOweOrNear()) { | ||||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { | if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { | ||||
| @@ -54,6 +54,9 @@ public class WxEnergyMeter extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "是否总表", name = "isPublic") | @io.swagger.annotations.ApiModelProperty(value = "是否总表", name = "isPublic") | ||||
| private Integer isPublic; | private Integer isPublic; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "店铺类型EnumRentShopType", name = "shopType") | |||||
| private Integer shopType; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "楼栋ID", name = "buildingId") | @io.swagger.annotations.ApiModelProperty(value = "楼栋ID", name = "buildingId") | ||||
| private Long buildingId; | private Long buildingId; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -20,7 +20,7 @@ public class WxUserDataRule extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId") | @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId") | ||||
| private Long userId; | private Long userId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "权限类型", name = "type") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "权限类型EnumUserDataRuleType", name = "type") | |||||
| private Integer type; | private Integer type; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "楼层楼座", name = "buildingFloor") | @io.swagger.annotations.ApiModelProperty(value = "楼层楼座", name = "buildingFloor") | ||||
| private String buildingFloor; | private String buildingFloor; | ||||
| @@ -32,6 +32,8 @@ public class WxUserDataRule extends TenantEntity { | |||||
| private Date createTime; | private Date createTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") | @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "店铺类型", name = "shopType") | |||||
| private String shopType; | |||||
| public String getFloorIds() { | public String getFloorIds() { | ||||
| if (StringUtils.isNotEmpty(buildingFloor)) { | if (StringUtils.isNotEmpty(buildingFloor)) { | ||||
| @@ -39,6 +39,9 @@ public class BaseEntity implements Serializable { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| protected String businessForRule; | protected String businessForRule; | ||||
| @TableField(exist = false) | |||||
| protected String shopTypeForRule; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| protected String[] tempShop; | protected String[] tempShop; | ||||
| @@ -82,6 +82,7 @@ public class WxBillAllHelper { | |||||
| bill.updateTenantInfo(wxMerchant); | bill.updateTenantInfo(wxMerchant); | ||||
| bill.setFloorForRule(wxMerchant.getFloorForRule()); | bill.setFloorForRule(wxMerchant.getFloorForRule()); | ||||
| bill.setBusinessForRule(wxMerchant.getBusinessForRule()); | bill.setBusinessForRule(wxMerchant.getBusinessForRule()); | ||||
| bill.setShopTypeForRule(wxMerchant.getShopTypeForRule()); | |||||
| bill.setBuilding(wxMerchant.getBuilding()); | bill.setBuilding(wxMerchant.getBuilding()); | ||||
| bill.setFloor(wxMerchant.getFloor()); | bill.setFloor(wxMerchant.getFloor()); | ||||
| bill.setMerchantName(wxMerchant.getName()); | bill.setMerchantName(wxMerchant.getName()); | ||||
| @@ -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(); | WxMerchant mq = new WxMerchant(); | ||||
| mq.updateTenantInfo(wxBillRent); | mq.updateTenantInfo(wxBillRent); | ||||
| mq.setName(StringUtils.trimToNull(wxBillRent.getMerchantName())); | mq.setName(StringUtils.trimToNull(wxBillRent.getMerchantName())); | ||||
| mq.setShopTypeForRule(wxBillRent.getShopTypeForRule()); | |||||
| List<Long> mids = wxMerchantService.findIdList(mq); | List<Long> mids = wxMerchantService.findIdList(mq); | ||||
| if (null != mids && mids.size() > 0 ) { | if (null != mids && mids.size() > 0 ) { | ||||
| if (null != wxBillRent.getMerchantIdList()) { | if (null != wxBillRent.getMerchantIdList()) { | ||||
| @@ -186,11 +186,12 @@ 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(), 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(); | WxMerchant m = new WxMerchant(); | ||||
| m.updateTenantInfo(record); | m.updateTenantInfo(record); | ||||
| m.setName(StringUtils.trimToNull(record.getMerchantName())); | m.setName(StringUtils.trimToNull(record.getMerchantName())); | ||||
| m.setIds(floorMids); | m.setIds(floorMids); | ||||
| m.setShopTypeForRule(record.getShopTypeForRule()); | |||||
| List<Long> merchantIdList = wxMerchantService.findIdList(m); | List<Long> merchantIdList = wxMerchantService.findIdList(m); | ||||
| if (null != merchantIdList && merchantIdList.size() > 0 ) { | if (null != merchantIdList && merchantIdList.size() > 0 ) { | ||||
| record.setMerchantIdList(merchantIdList); | record.setMerchantIdList(merchantIdList); | ||||
| @@ -15,10 +15,11 @@ | |||||
| <result column="building_id" jdbcType="BIGINT" property="buildingId"/> | <result column="building_id" jdbcType="BIGINT" property="buildingId"/> | ||||
| <result column="floor_id" jdbcType="BIGINT" property="floorId"/> | <result column="floor_id" jdbcType="BIGINT" property="floorId"/> | ||||
| <result column="shop_id" jdbcType="BIGINT" property="shopId"/> | <result column="shop_id" jdbcType="BIGINT" property="shopId"/> | ||||
| <result column="shop_type" jdbcType="INTEGER" property="shopType"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -36,10 +37,14 @@ | |||||
| <if test=" null != buildingId ">and `building_id` = #{buildingId}</if> | <if test=" null != buildingId ">and `building_id` = #{buildingId}</if> | ||||
| <if test=" null != floorId ">and `floor_id` = #{floorId}</if> | <if test=" null != floorId ">and `floor_id` = #{floorId}</if> | ||||
| <if test=" null != shopId ">and `shop_id` = #{shopId}</if> | <if test=" null != shopId ">and `shop_id` = #{shopId}</if> | ||||
| <if test=" null != shopType ">and `shop_type` = #{shopType}</if> | |||||
| <if test=" null != name and '' != name ">and name like concat('%', #{name},'%')</if> | <if test=" null != name and '' != name ">and name like concat('%', #{name},'%')</if> | ||||
| <if test=" null != floorForRule and '' != floorForRule "> | <if test=" null != floorForRule and '' != floorForRule "> | ||||
| and `floor_id` in (${floorForRule}) | and `floor_id` in (${floorForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != shopTypeForRule and '' != shopTypeForRule "> | |||||
| and `shop_type` in (${shopTypeForRule}) | |||||
| </if> | |||||
| <if test=" null != shopIds "> | <if test=" null != shopIds "> | ||||
| and shop_id in | and shop_id in | ||||
| <foreach collection="shopIds" index="index" item="sidItem" open="(" separator="," close=")"> | <foreach collection="shopIds" index="index" item="sidItem" open="(" separator="," close=")"> | ||||
| @@ -124,6 +124,9 @@ | |||||
| <if test=" null != businessForRule and '' != businessForRule "> | <if test=" null != businessForRule and '' != businessForRule "> | ||||
| and m.business_id in (${businessForRule}) and m.is_del=0 | and m.business_id in (${businessForRule}) and m.is_del=0 | ||||
| </if> | </if> | ||||
| <if test=" null != shopTypeForRule and '' != shopTypeForRule "> | |||||
| and m.type in (${shopTypeForRule}) | |||||
| </if> | |||||
| <if test=" null != businessTypes "> | <if test=" null != businessTypes "> | ||||
| and JSON_CONTAINS(m.business_types,JSON_OBJECT('id', #{businessTypes})) | and JSON_CONTAINS(m.business_types,JSON_OBJECT('id', #{businessTypes})) | ||||
| @@ -126,6 +126,9 @@ | |||||
| <if test=" null != businessForRule and '' != businessForRule "> | <if test=" null != businessForRule and '' != businessForRule "> | ||||
| and business_id in (${businessForRule}) | and business_id in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != shopTypeForRule and '' != shopTypeForRule "> | |||||
| and rent_shop_type in (${shopTypeForRule}) | |||||
| </if> | |||||
| <if test=" null != merchantIds "> | <if test=" null != merchantIds "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | ||||
| @@ -208,6 +208,10 @@ | |||||
| and business_id in (${businessForRule}) | and business_id in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != shopTypeForRule and '' != shopTypeForRule "> | |||||
| and rent_shop_type in (${shopTypeForRule}) | |||||
| </if> | |||||
| <if test=" null != merchantIds "> | <if test=" null != merchantIds "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | ||||
| @@ -437,6 +441,9 @@ | |||||
| <if test=" null != businessForRule and '' != businessForRule "> | <if test=" null != businessForRule and '' != businessForRule "> | ||||
| and rc.business_id in (${businessForRule}) | and rc.business_id in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != shopTypeForRule and '' != shopTypeForRule "> | |||||
| and rc.rent_shop_type in (${shopTypeForRule}) | |||||
| </if> | |||||
| <if test=" null != merchantIds "> | <if test=" null != merchantIds "> | ||||
| and rc.merchant_id in | and rc.merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | ||||
| @@ -133,6 +133,10 @@ | |||||
| <if test=" null != floorForRule and '' != floorForRule "> | <if test=" null != floorForRule and '' != floorForRule "> | ||||
| and `floor` in (${floorForRule}) | and `floor` in (${floorForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != shopTypeForRule and '' != shopTypeForRule "> | |||||
| and type in (${shopTypeForRule}) | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||
| @@ -334,6 +338,10 @@ | |||||
| <if test=" null != businessForRule and '' != businessForRule "> | <if test=" null != businessForRule and '' != businessForRule "> | ||||
| and s.`business_id` in (${businessForRule}) | and s.`business_id` in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != shopTypeForRule and '' != shopTypeForRule "> | |||||
| and s.`type` in (${shopTypeForRule}) | |||||
| </if> | |||||
| <if test="null != sortColumn"> | <if test="null != sortColumn"> | ||||
| order by ${sortColumn} ${sortOrder} | order by ${sortColumn} ${sortOrder} | ||||
| @@ -446,6 +454,10 @@ | |||||
| <if test=" null != businessForRule and '' != businessForRule "> | <if test=" null != businessForRule and '' != businessForRule "> | ||||
| and s.`business_id` in (${businessForRule}) | and s.`business_id` in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != shopTypeForRule and '' != shopTypeForRule "> | |||||
| and s.`type` in (${shopTypeForRule}) | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and s.id in | and s.id in | ||||
| @@ -7,15 +7,16 @@ | |||||
| <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> | <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> | ||||
| <result column="user_id" jdbcType="BIGINT" property="userId"/> | <result column="user_id" jdbcType="BIGINT" property="userId"/> | ||||
| <result column="type" jdbcType="INTEGER" property="type"/> | <result column="type" jdbcType="INTEGER" property="type"/> | ||||
| <result column="buildingFloor" jdbcType="VARCHAR" property="buildingFloor"/> | |||||
| <result column="building_floor" jdbcType="VARCHAR" property="buildingFloor"/> | |||||
| <result column="business" jdbcType="VARCHAR" property="business"/> | <result column="business" jdbcType="VARCHAR" property="business"/> | ||||
| <result column="target" jdbcType="VARCHAR" property="target"/> | <result column="target" jdbcType="VARCHAR" property="target"/> | ||||
| <result column="shop_type" jdbcType="VARCHAR" property="shopType"/> | |||||
| <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> | <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> | ||||
| <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> | <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> | ||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||