| @@ -41,7 +41,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()); | |||||
| wxMallBuilding.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| return wxMallBuildingService.getBuildingFloorList(wxMallBuilding,this.getUser()); | return wxMallBuildingService.getBuildingFloorList(wxMallBuilding,this.getUser()); | ||||
| } | } | ||||
| @@ -79,7 +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()); | |||||
| 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); | ||||
| @@ -107,7 +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()); | |||||
| 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); | ||||
| @@ -379,7 +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()); | |||||
| wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| wxMerchantService.exportData(wxMerchant,request,response); | wxMerchantService.exportData(wxMerchant,request,response); | ||||
| } | } | ||||
| @@ -39,7 +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()); | |||||
| wxShop.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| } | } | ||||
| @@ -79,7 +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()); | |||||
| wxPropertyContract.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| @@ -76,7 +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()); | |||||
| wxRentContract.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); | PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| @@ -56,7 +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()); | |||||
| wxRentPropertyContractVo.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| @@ -52,7 +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.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| 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); | ||||
| @@ -69,7 +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()); | |||||
| wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily); | return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily); | ||||
| } | } | ||||
| @@ -163,7 +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()); | |||||
| wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); | wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); | ||||
| } | } | ||||
| @@ -83,7 +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.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| record.updateTenantInfo(getTenantInfo()); | record.updateTenantInfo(getTenantInfo()); | ||||
| record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | ||||
| @@ -82,7 +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()); | |||||
| dto.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| PageInfo<PageMerchantMicroPayVO> page = markingDataReportService.pageMerchantMicroPay(dto); | PageInfo<PageMerchantMicroPayVO> page = markingDataReportService.pageMerchantMicroPay(dto); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -97,7 +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()); | |||||
| dto.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| markingDataReportService.exportMerchantMicroPay(dto, response); | markingDataReportService.exportMerchantMicroPay(dto, response); | ||||
| } | } | ||||
| @@ -121,7 +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()); | |||||
| wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,null)); | return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,null)); | ||||
| } | } | ||||
| @@ -190,7 +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()); | |||||
| wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| 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); | ||||
| @@ -359,7 +359,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.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| if (isOwe) { | if (isOwe) { | ||||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | ||||
| @@ -420,7 +420,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.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | ||||
| wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | ||||
| @@ -451,7 +451,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.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | ||||
| wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | ||||
| @@ -617,7 +617,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.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,EnumBillStatus.STOP_TO_SETTLE.getCode())); | return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,EnumBillStatus.STOP_TO_SETTLE.getCode())); | ||||
| } | } | ||||
| @@ -729,7 +729,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()); | |||||
| record.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| if (null != record.getOnlyOweOrNear()) { | if (null != record.getOnlyOweOrNear()) { | ||||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { | if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { | ||||
| @@ -752,7 +752,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()); | |||||
| wxBillRent.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| if (null != wxBillRent.getOnlyOweOrNear()) { | if (null != wxBillRent.getOnlyOweOrNear()) { | ||||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { | if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { | ||||
| @@ -775,7 +775,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()); | |||||
| record.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| if (null != record.getOnlyOweOrNear()) { | if (null != record.getOnlyOweOrNear()) { | ||||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { | if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { | ||||
| @@ -135,7 +135,7 @@ public class WxMallAdminController extends BaseController { | |||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| tenantEntity.setFloorForRule(dataRule.getFloorIds()); | tenantEntity.setFloorForRule(dataRule.getFloorIds()); | ||||
| tenantEntity.setBusinessForRule(dataRule.getBussinessIds()); | tenantEntity.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| tenantEntity.setShopTypeForRule(dataRule.getShopType()); | |||||
| tenantEntity.setShopTypeForRule(dataRule.getShopTypes()); | |||||
| } | } | ||||
| } | } | ||||
| @@ -382,8 +382,8 @@ public class WxMallAdminController extends BaseController { | |||||
| @ApiOperation("抄表数据分页列表接口") | @ApiOperation("抄表数据分页列表接口") | ||||
| @GetMapping("readingList") | @GetMapping("readingList") | ||||
| public ResultData readingList(@ModelAttribute WxEnergyMeterReading record) { | public ResultData readingList(@ModelAttribute WxEnergyMeterReading record) { | ||||
| record.updateTenantInfo(getTenantInfo()); | |||||
| record.setIsDel(EnumYesOrNo.NO.getCode()); | record.setIsDel(EnumYesOrNo.NO.getCode()); | ||||
| setQueryDataRule(record); | |||||
| record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | ||||
| PageInfo<WxEnergyMeterReading> page = wxEnergyService.readingListAsPage(record, 1, 1000); | PageInfo<WxEnergyMeterReading> page = wxEnergyService.readingListAsPage(record, 1, 1000); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -392,7 +392,7 @@ public class WxMallAdminController extends BaseController { | |||||
| //能源抄表费用 | //能源抄表费用 | ||||
| @PostMapping("commitEnergyReading") | @PostMapping("commitEnergyReading") | ||||
| public ResultData commitEnergyReading(@RequestBody WxEnergyMeterReading record) { | public ResultData commitEnergyReading(@RequestBody WxEnergyMeterReading record) { | ||||
| record.updateTenantInfo(getTenantInfo()); | |||||
| setQueryDataRule(record); | |||||
| wxEnergyService.commitReading(record,this.getLoginMallUserInfo()); | wxEnergyService.commitReading(record,this.getLoginMallUserInfo()); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -51,5 +51,13 @@ public class WxUserDataRule extends TenantEntity { | |||||
| }*/ | }*/ | ||||
| return null; | return null; | ||||
| } | } | ||||
| public String getShopTypes() { | |||||
| if (StringUtils.isNotEmpty(shopType)) { | |||||
| Object[] data = JSONArray.parseArray(shopType).toArray(); | |||||
| return StringUtils.join(data, ","); | |||||
| } | |||||
| return null; | |||||
| } | |||||
| } | } | ||||