From e56ec82e855979b8b32bee973db6039948b46492 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 28 Jun 2020 19:17:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9B=86=E5=9B=A2=E7=89=88?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/config/MyBatisConfiguration.java | 2 +- .../controller/base/BaseController.java | 4 +- .../datatower/DataTowerController.java | 3 +- .../datatower/WxChartDataController.java | 2 +- .../controller/mem/WxCUserDataController.java | 4 +- .../mem/WxScoreRulesController.java | 4 +- .../msg/WxMsgValidationcodeController.java | 12 +- .../controller/sys/HomeController.java | 12 +- .../controller/sys/SysMenuController.java | 4 +- .../controller/sys/UploadController.java | 4 +- .../controller/sys/WechatLoginController.java | 4 +- .../java/com/iformall/shiro/MyShiroRealm.java | 4 +- .../java/com/iformall/shiro/UserSession.java | 2 +- .../com/iformall/tenant/TenantInfoImpl.java | 8 +- .../com/iformall/ueditor/upload/Uploader.java | 8 +- ...6281647__GROUP_UPDATE_PARENT_TENANT_ID.sql | 450 ++++++++++++++++++ .../iformall/config/MyBatisConfiguration.java | 2 +- .../iformall/controller/BaseController.java | 4 +- .../iformall/controller/UploadController.java | 4 +- .../controller/WxCouponSendController.java | 4 +- .../iformall/controller/WxInfoController.java | 8 +- .../controller/WxMerchantBUserController.java | 2 +- .../WxMsgValidationcodeController.java | 6 +- .../com/iformall/tenant/TenantInfoImpl.java | 10 +- .../iformall/config/MyBatisConfiguration.java | 2 +- .../iformall/controller/BaseController.java | 8 +- .../iformall/controller/UploadController.java | 4 +- .../controller/WxMerchantController.java | 4 +- .../controller/WxUserGrantController.java | 24 +- .../interceptor/AuthorizationInterceptor.java | 4 +- .../com/iformall/tenant/TenantInfoImpl.java | 10 +- .../callback/WxCarETCPCallBackController.java | 6 +- .../callback/WxCarTJDCallBackController.java | 2 +- .../iformall/service/impl/PosServiceImpl.java | 12 +- .../schedule/BillNotificationSchedule.java | 8 +- .../iformall/schedule/ChartDataSchedule.java | 12 +- .../iformall/schedule/CouponSendSchedule.java | 4 +- .../com/iformall/domain/po/MallUserInfo.java | 2 +- .../iformall/domain/po/WxChartDataEntity.java | 4 +- .../java/com/iformall/domain/po/WxMall.java | 6 +- .../domain/po/base/BaseTenantEntity.java | 12 +- .../iformall/domain/po/base/TenantEntity.java | 12 +- .../domain/po/invest/InvestBaseEntity.java | 6 +- .../com/iformall/domain/po/msg/BaseMsg.java | 10 +- .../domain/po/msg/FmInsideCLoginMsg.java | 4 +- .../po/msg/FmInsideCouponVerifyMsg.java | 4 +- .../po/msg/FmInsideOrderSuccessMsg.java | 4 +- .../com/iformall/domain/po/msg/WxMsg.java | 4 +- .../mapper/KwMerchantMeterMapper.java | 2 +- .../iformall/mapper/PosMallConfigMapper.java | 2 +- .../com/iformall/mapper/WxBusinessMapper.java | 4 +- .../com/iformall/mapper/WxCampaignMapper.java | 2 +- .../mapper/WxCouponActionLogMapper.java | 4 +- .../iformall/mapper/WxCouponOrderMapper.java | 2 +- .../iformall/mapper/WxRentContractMapper.java | 2 +- .../service/impl/DataTowerServiceImpl.java | 24 +- .../impl/MallPermissionServiceImpl.java | 6 +- .../impl/MarkingDataReportServiceImpl.java | 50 +- .../impl/PosMallConfigServiceImpl.java | 2 +- .../service/impl/PushLimitServiceImpl.java | 8 +- .../service/impl/QrCodeServiceImpl.java | 4 +- .../service/impl/WxBillAllServiceImpl.java | 8 +- .../service/impl/WxBillDailyServiceImpl.java | 8 +- .../service/impl/WxBusinessServiceImpl.java | 4 +- .../service/impl/WxCampaignServiceImpl.java | 2 +- .../service/impl/WxChartServiceImpl.java | 96 ++-- .../impl/WxCouponActionLogServiceImpl.java | 2 +- .../impl/WxCouponOrderServiceImpl.java | 6 +- .../service/impl/WxFlowServiceImpl.java | 4 +- .../service/impl/WxMallServiceImpl.java | 10 +- .../service/impl/WxMsgServiceImpl.java | 2 +- .../service/impl/WxOrderServiceImpl.java | 12 +- .../impl/WxProfitSharingOrderServiceImpl.java | 8 +- .../impl/WxRentContractServiceImpl.java | 2 +- .../service/impl/WxShopServiceImpl.java | 8 +- .../kw/impl/KwMerchantMeterServiceImpl.java | 2 +- .../java/com/iformall/utils/Constant.java | 2 +- .../mapper/KwBoxCmdHistoryMapper.xml | 8 +- .../src/main/resources/mapper/KwBoxMapper.xml | 8 +- .../mapper/KwMerchantMeterMapper.xml | 28 +- .../resources/mapper/KwMeterDataMapper.xml | 10 +- .../main/resources/mapper/KwMeterMapper.xml | 8 +- .../resources/mapper/MallResourceMapper.xml | 8 +- .../main/resources/mapper/MallRoleMapper.xml | 8 +- .../mapper/MallRolePermissionMapper.xml | 12 +- .../resources/mapper/MallUserActionMapper.xml | 12 +- .../resources/mapper/MallUserInfoMapper.xml | 16 +- .../mapper/PosCouponOrderVerifyMapper.xml | 8 +- .../resources/mapper/PosMallConfigMapper.xml | 10 +- .../main/resources/mapper/PosOrderMapper.xml | 6 +- .../resources/mapper/PosPayOrderMapper.xml | 8 +- .../main/resources/mapper/PushLimitMapper.xml | 8 +- .../resources/mapper/WxActivityJoinMapper.xml | 8 +- .../resources/mapper/WxActivityMapper.xml | 8 +- .../resources/mapper/WxAdminLogMapper.xml | 8 +- .../resources/mapper/WxBillActionMapper.xml | 8 +- .../main/resources/mapper/WxBillAllMapper.xml | 316 ++++++------ .../resources/mapper/WxBillDailyMapper.xml | 6 +- .../resources/mapper/WxBillDepositMapper.xml | 30 +- .../mapper/WxBillOtherDepositMapper.xml | 10 +- .../resources/mapper/WxBillOtherMapper.xml | 18 +- .../mapper/WxBillPropertyDepositMapper.xml | 14 +- .../resources/mapper/WxBillPropertyMapper.xml | 24 +- .../resources/mapper/WxBillRentMapper.xml | 22 +- .../mapper/WxBillSettleBillMapper.xml | 46 +- .../resources/mapper/WxBillSettleMapper.xml | 44 +- .../mapper/WxBillSettleRecordMapper.xml | 6 +- .../main/resources/mapper/WxBrandMapper.xml | 10 +- .../resources/mapper/WxBusinessMapper.xml | 4 +- .../main/resources/mapper/WxCUserMapper.xml | 4 +- .../resources/mapper/WxCampaignMapper.xml | 12 +- .../resources/mapper/WxCarCmdLogMapper.xml | 32 +- .../resources/mapper/WxCarPayRecordMapper.xml | 8 +- .../resources/mapper/WxCardInfoMapper.xml | 16 +- .../resources/mapper/WxCardSpendMapper.xml | 32 +- .../mapper/WxCouponActionLogMapper.xml | 36 +- .../resources/mapper/WxCouponCarMapper.xml | 12 +- .../mapper/WxCouponChannelMapper.xml | 18 +- .../resources/mapper/WxCouponInjectMapper.xml | 8 +- .../main/resources/mapper/WxCouponMapper.xml | 30 +- .../mapper/WxCouponMerchantMapper.xml | 8 +- .../resources/mapper/WxCouponOrderMapper.xml | 106 ++--- .../mapper/WxCouponPasswordMapper.xml | 16 +- .../mapper/WxCouponPresentMapper.xml | 8 +- .../mapper/WxCouponSendConfigMapper.xml | 8 +- .../resources/mapper/WxCouponSendMapper.xml | 8 +- .../mapper/WxCreditHistoryMapper.xml | 24 +- .../mapper/WxDataRuleTargetMapper.xml | 8 +- .../mapper/WxDateAmountRecordMapper.xml | 10 +- .../main/resources/mapper/WxDeviceMapper.xml | 8 +- .../resources/mapper/WxFlowConfigMapper.xml | 4 +- .../resources/mapper/WxFlowModelMapper.xml | 12 +- .../resources/mapper/WxFlowRecordMapper.xml | 8 +- .../mapper/WxGameActionLogMapper.xml | 8 +- .../main/resources/mapper/WxGameMapper.xml | 8 +- .../mapper/WxLevelMerchantMapper.xml | 12 +- .../resources/mapper/WxMallBuildingMapper.xml | 8 +- .../resources/mapper/WxMallFloorMapper.xml | 8 +- .../mapper/WxMerchantBUserMapper.xml | 12 +- .../resources/mapper/WxMerchantCorpMapper.xml | 6 +- .../resources/mapper/WxMerchantMapper.xml | 36 +- .../WxMerchantPowerBillConfigMapper.xml | 8 +- .../resources/mapper/WxMerchantShopMapper.xml | 8 +- .../mapper/WxMerchantSubsidyMapper.xml | 20 +- .../resources/mapper/WxMerchantTaxMapper.xml | 6 +- .../mapper/WxMerchantTradeDailyMapper.xml | 35 +- .../resources/mapper/WxMsgCallbackMapper.xml | 4 +- .../resources/mapper/WxMsgConfigMapper.xml | 8 +- .../resources/mapper/WxMsgLimitMapper.xml | 4 +- .../src/main/resources/mapper/WxMsgMapper.xml | 8 +- .../resources/mapper/WxMsgModelMapper.xml | 8 +- .../resources/mapper/WxMsgRecordMapper.xml | 12 +- .../resources/mapper/WxMsgSignatureMapper.xml | 8 +- .../mapper/WxMsgValidationcodeMapper.xml | 6 +- .../mapper/WxMsgValidationcodeModelMapper.xml | 6 +- .../resources/mapper/WxOrderGroupMapper.xml | 52 +- .../main/resources/mapper/WxOrderMapper.xml | 106 ++--- .../main/resources/mapper/WxParkMapper.xml | 8 +- .../mapper/WxPayAccountBillMapper.xml | 8 +- .../main/resources/mapper/WxPayBillMapper.xml | 8 +- .../resources/mapper/WxPayOrderMapper.xml | 14 +- .../mapper/WxPowerBillAutoConfigMapper.xml | 8 +- .../mapper/WxPrepaymentHistoryMapper.xml | 8 +- .../resources/mapper/WxPrepaymentMapper.xml | 8 +- .../mapper/WxProfitSharingOrderMapper.xml | 26 +- .../mapper/WxProfitSharingReceiverMapper.xml | 8 +- .../mapper/WxProfitSharingResultMapper.xml | 8 +- .../mapper/WxPropertyContractMapper.xml | 6 +- .../resources/mapper/WxRefundOrderMapper.xml | 8 +- .../resources/mapper/WxRentContractMapper.xml | 22 +- .../resources/mapper/WxScoreHistoryMapper.xml | 18 +- .../resources/mapper/WxScreenAdMapper.xml | 12 +- .../main/resources/mapper/WxShopMapper.xml | 41 +- .../main/resources/mapper/WxSubsidyMapper.xml | 8 +- .../resources/mapper/WxTemplateMsgMapper.xml | 8 +- .../main/resources/mapper/WxTopicMapper.xml | 8 +- .../resources/mapper/WxUserDataRuleMapper.xml | 8 +- .../resources/mapper/WxWiwideInfoMapper.xml | 8 +- .../controller/base/BaseController.java | 4 +- .../controller/sys/UploadController.java | 4 +- .../java/com/iformall/shiro/UserSession.java | 2 +- .../iformall/controller/BaseController.java | 4 +- .../interceptor/AuthHandshakeInterceptor.java | 2 +- .../com/iformall/plugin/MultiTenancy.java | 46 +- .../java/com/iformall/plugin/TenantInfo.java | 2 +- .../com/iformall/plugin/TenantInfoImpl.java | 2 +- 186 files changed, 1683 insertions(+), 1230 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V202006281647__GROUP_UPDATE_PARENT_TENANT_ID.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java index 2eccb410b..2c2e4bd9e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -19,7 +19,7 @@ public class MyBatisConfiguration { MultiTenancy multiTenancy = new MultiTenancy(); Properties properties = new Properties(); properties.setProperty("tenantIdColumn", "tenant_id"); - properties.setProperty("subTenantIdColumn", "sub_tenant_id"); + properties.setProperty("parentTenantIdColumn", "parent_tenant_id"); properties.setProperty("dialect", "mysql"); properties.setProperty("tenantInfo", "com.iformall.tenant.TenantInfoImpl"); multiTenancy.setProperties(properties); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index fb38124a7..bc83c79a8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -66,10 +66,10 @@ public class BaseController { public TenantEntity getTenantInfo(){ Session session = SecurityUtils.getSubject().getSession(); String tenantId = (String)session.getAttribute(UserSession.tenantId); - String subTenantId = (String)session.getAttribute(UserSession.subTenantId); + String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); TenantEntity tenantEntity = new TenantEntity(){{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}; return tenantEntity; } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java index 05d4adb6b..a24b97ce8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java @@ -3,9 +3,11 @@ package com.iformall.controller.datatower; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.DataTowerService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -28,7 +30,6 @@ public class DataTowerController extends BaseController { @SystemControllerLog(description = "数据塔台-查询运营") public ResultData queryRunningPotal() { logger.debug("[" + getIpAddr() + "] DataTowerController::queryRunningPotal"); - Map data = dataTowerService.queryRunningPotal(getTenantInfo()); return new ResultData(data); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java index b378737be..4720420d8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java @@ -72,7 +72,7 @@ public class WxChartDataController extends BaseController { logger.info("[" + getIpAddr() + "] WxChartDataController::queryData chart: " + chart); TenantEntity tenantEntity = getTenantInfo(); params.put("tenantId",tenantEntity.getTenantId()); - params.put("subTenantId", tenantEntity.getSubTenantId()); + params.put("parentTenantId", tenantEntity.getParentTenantId()); ResultData data = wxChartDataService.queryData(params); logger.info("[" + getIpAddr() + "] WxChartDataController::queryData chart: " + chart + " end"); return data; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index 204f578d1..5360e5b67 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -170,8 +170,8 @@ public class WxCUserDataController extends BaseController { params.put("startTime", startTime); params.put("endTime", endTime); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); markingCouponDataReportDto.updateTenantInfo(tenantEntity); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index a02b03b79..385f5cbc5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -43,7 +43,7 @@ public class WxScoreRulesController extends BaseController { public ResultData add(@RequestBody WxScoreRules wxScoreRules) { logger.debug("[" + getIpAddr() + "] WxScoreRulesController::add"); TenantEntity tenantEntity = getTenantInfo(); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } wxScoreRules.updateTenantInfo(tenantEntity); @@ -72,7 +72,7 @@ public class WxScoreRulesController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "creditLocked不能为空"); } TenantEntity tenantEntity = getTenantInfo(); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } wxScoreRules.updateTenantInfo(tenantEntity); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java index ab0f4b92b..18582b229 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java @@ -74,16 +74,16 @@ public class WxMsgValidationcodeController extends BaseController { @GetMapping("sendvalidationcode") @ApiImplicitParams({ @ApiImplicitParam(name = "tenantId", value = "租户ID", dataType = "String", paramType = "query"), - @ApiImplicitParam(name = "subTenantId", value = "子租户ID", dataType = "String", paramType = "query"), + @ApiImplicitParam(name = "parentTenantId", value = "父租户ID", dataType = "String", paramType = "query"), @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) - public ResultData sendvalidationcode(String tenantId, String subTenantId, String phone, Integer type, String appid) { + public ResultData sendvalidationcode(String tenantId, String parentTenantId, String phone, Integer type, String appid) { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::sendvalidationcode"); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); @@ -94,17 +94,17 @@ public class WxMsgValidationcodeController extends BaseController { @GetMapping("hasvalidationcode") @ApiImplicitParams({ @ApiImplicitParam(name = "tenantId", value = "租户ID", dataType = "String", paramType = "query"), - @ApiImplicitParam(name = "subTenantId", value = "子租户ID", dataType = "String", paramType = "query"), + @ApiImplicitParam(name = "parentTenantId", value = "父租户ID", dataType = "String", paramType = "query"), @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "code", value = "验证码", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) - public ResultData hasvalidationcode(String tenantId, String subTenantId, String phone, Integer type, String code, String appid) { + public ResultData hasvalidationcode(String tenantId, String parentTenantId, String phone, Integer type, String code, String appid) { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::hasvalidationcode"); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index a0079823b..1b533b2c0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -160,7 +160,7 @@ public class HomeController extends BaseController { } Map map = new HashMap(); if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && - StringUtils.isBlank(info.getSubTenantId())) { + StringUtils.isBlank(info.getParentTenantId())) { // 集团用户获取子商场 List mallList = mallService.getSubByParentTenantId(info.getTenantId()); map.put("subMalls", JSON.toJSONString(mallList)); @@ -193,12 +193,12 @@ public class HomeController extends BaseController { } @PostMapping("/selectMall") - @ApiOperation(value = "用户选中子广场及父广场", notes = "{\"tenantId\":\"string\",\"subTenantId\":\"string\"}") + @ApiOperation(value = "用户选中子广场及父广场", notes = "{\"tenantId\":\"string\",\"parentTenantId\":\"string\"}") public ResultData selectMall(@RequestBody Map map) { logger.debug(map.toString()); String tenantId = map.get("tenantId"); - String subTenantId = map.get("subTenantId"); + String parentTenantId = map.get("parentTenantId"); if (StringUtils.isBlank(tenantId)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "tenantId不能为空"); @@ -208,10 +208,10 @@ public class HomeController extends BaseController { if (userInfo.getTenantId().equalsIgnoreCase(tenantId)) { Session session = SecurityUtils.getSubject().getSession(); session.setAttribute(UserSession.tenantId, tenantId); - if (StringUtils.isNotBlank(subTenantId)) { - session.setAttribute(UserSession.subTenantId, subTenantId); + if (StringUtils.isNotBlank(parentTenantId)) { + session.setAttribute(UserSession.parentTenantId, parentTenantId); } else { - session.setAttribute(UserSession.subTenantId, null); + session.setAttribute(UserSession.parentTenantId, null); } } return new ResultData(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index 070389634..a98c0cbe7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -74,8 +74,8 @@ public class SysMenuController extends BaseController { MallUserInfo user = getUser(); if (user.checkGroupAdmin()) { TenantEntity tenantEntity = getTenantInfo(); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - user.setSubTenantId(tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + user.setParentTenantId(tenantEntity.getParentTenantId()); } } List menuList = mallPermissionService.getUserMenuList(user, 0L, false); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index d61a455e6..d8f51bb62 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -38,10 +38,10 @@ public class UploadController extends BaseController { private QrCodeService qrCodeService; private String getFileName(TenantEntity tenantEntity, String fileName) { - if (StringUtils.isBlank(tenantEntity.getSubTenantId())) { + if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { fileName = tenantEntity.getTenantId() + "/" + fileName; } else { - fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getSubTenantId() + "/" +fileName; + fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" +fileName; } return fileName; } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index 5f8825bce..83a9fb528 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -460,8 +460,8 @@ public class WechatLoginController extends BaseController { if(StringUtils.isBlank(userInfo.getTenantId())) { userInfo.setTenantId(user.getTenantId()); } - if(StringUtils.isBlank(userInfo.getSubTenantId())) { - userInfo.setSubTenantId(user.getSubTenantId()); + if(StringUtils.isBlank(userInfo.getParentTenantId())) { + userInfo.setParentTenantId(user.getParentTenantId()); } if(userInfo.getId() == null && userInfo.getUsername() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java b/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java index 960205ead..d75179957 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java @@ -66,8 +66,8 @@ public class MyShiroRealm extends AuthorizingRealm { session.setAttribute(UserSession.userInfo, user); session.setAttribute(UserSession.userId, user.getId()); session.setAttribute(UserSession.tenantId, user.getTenantId()); - if (StringUtils.isNotBlank(user.getSubTenantId())) { - session.setAttribute(UserSession.subTenantId, user.getSubTenantId()); + if (StringUtils.isNotBlank(user.getParentTenantId())) { + session.setAttribute(UserSession.parentTenantId, user.getParentTenantId()); } return authenticationInfo; } diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/UserSession.java b/mallinkAdmin/src/main/java/com/iformall/shiro/UserSession.java index aba5865b0..7d9a25e11 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/UserSession.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/UserSession.java @@ -8,6 +8,6 @@ public class UserSession { public static String tenantId ="TENANT_ID"; - public static String subTenantId ="SUB_TENANT_ID"; + public static String parentTenantId ="PARENT_TENANT_ID"; } diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 3f7a9609f..9533c8cb5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -23,14 +23,14 @@ public class TenantInfoImpl implements TenantInfo { } @Override - public String getSubTenantId() { - String subTenantId = null; + public String getParentTenantId() { + String parentTenantId = null; try { - subTenantId = (String) SecurityUtils.getSubject().getSession().getAttribute(UserSession.subTenantId); + parentTenantId = (String) SecurityUtils.getSubject().getSession().getAttribute(UserSession.parentTenantId); } catch (InvalidSessionException e) { logger.error("InvalidSession: " + e.getMessage()); } - return subTenantId; + return parentTenantId; } @Override diff --git a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java index 29f20cc32..62d1e3137 100644 --- a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java +++ b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java @@ -42,10 +42,10 @@ public class Uploader { private AmazonS3 s3 = null; private String getFileName(TenantEntity tenantEntity, String fileName) { - if (StringUtils.isBlank(tenantEntity.getSubTenantId())) { + if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { fileName = tenantEntity.getTenantId() + "/" + fileName; } else { - fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getSubTenantId() + "/" + fileName; + fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" + fileName; } return fileName; } @@ -81,10 +81,10 @@ public class Uploader { MultipartFile multiReq= ((MultipartHttpServletRequest) this.request).getFile("upfile"); Session session = SecurityUtils.getSubject().getSession(); String tenantId = (String)session.getAttribute(UserSession.tenantId); - String subTenantId = (String)session.getAttribute(UserSession.subTenantId); + String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); TenantEntity tenantEntity = new TenantEntity(){{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}; if (StringUtils.isBlank(tenantId)) { logger.error("TENANT is null"); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202006281647__GROUP_UPDATE_PARENT_TENANT_ID.sql b/mallinkAdmin/src/main/resources/db/migration/V202006281647__GROUP_UPDATE_PARENT_TENANT_ID.sql new file mode 100644 index 000000000..a3ccfecb1 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202006281647__GROUP_UPDATE_PARENT_TENANT_ID.sql @@ -0,0 +1,450 @@ + + +ALTER TABLE `invest_customer` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `invest_demand` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `invest_follow_record` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `invest_message` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `invest_operate_record` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `invest_remind` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `invest_task` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `kw_box` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `kw_box_cmd_history` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `kw_merchant_meter` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `kw_meter` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `kw_meter_data` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `mall_resource` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `mall_role` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `mall_role_permission` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `mall_user_action` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `mall_user_info` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `pos_coupon_order_verify` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `pos_mall_config` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `pos_order` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `pos_pay_order` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `push_limit` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `schedule_job` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `schedule_job_log` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_activity` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_activity_join` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_admin_log` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_action` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_daily` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_other` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_other_deposit` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_property` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_property_deposit` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_rent` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_rent_deposit` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_settle` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_settle_bill` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_bill_settle_record` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_brand` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_c_user` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_c_user_from_b` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_campaign` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_car_cmd_log` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_car_pay_record` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + +ALTER TABLE `wx_card_info` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_card_spend` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_card_transfer_info` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_chart_data` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon_action_log` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon_car` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon_channel` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon_inject` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon_merchant` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon_order` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon_password` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon_present` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon_send` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_coupon_send_config` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_credit_history` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_date_amount_record` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_device` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_flow_config` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_flow_model` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_flow_record` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_game` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_game_action_log` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_level_merchant` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_mall_building` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_mall_floor` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_merchant` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_merchant_b_user` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_merchant_corp` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_merchant_power_bill_config` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_merchant_shop` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_merchant_subsidy` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + +ALTER TABLE `wx_merchant_tax` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_merchant_trade_daily` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_msg` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_msg_callback` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_msg_config` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_msg_limit` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_msg_model` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_msg_record` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_msg_signature` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_msg_validationcode` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_msg_validationcode_model` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_order` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_order_group` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_order_press` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_park` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_pay_account` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_pay_account_bill` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_pay_bill` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_pay_order` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_power_bill_auto_config` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_prepayment` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_prepayment_history` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_profit_sharing_order` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_profit_sharing_receiver` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_profit_sharing_result` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_property_contract` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_refund_order` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_rent_contract` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_score_validity_period` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_score_history` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_screen_ad` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_shop` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_subsidy` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_template_msg` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_topic` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_user_data_rule` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_wiwide_info` +CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; diff --git a/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java index 512e838e5..d3baf02c6 100644 --- a/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -14,7 +14,7 @@ public class MyBatisConfiguration { MultiTenancy multiTenancy = new MultiTenancy(); Properties properties = new Properties(); properties.setProperty("tenantIdColumn", "tenant_id"); - properties.setProperty("subTenantIdColumn", "sub_tenant_id"); + properties.setProperty("parentTenantIdColumn", "parent_tenant_id"); properties.setProperty("dialect", "mysql"); properties.setProperty("tenantInfo", "com.iformall.tenant.TenantInfoImpl"); multiTenancy.setProperties(properties); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index a6088c059..76576dbbd 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -99,10 +99,10 @@ public class BaseController { public TenantEntity getTenantInfo() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String tenantId = (String) request.getAttribute(Constant.TENANT_ID); - String subTenantId = (String) request.getAttribute(Constant.SUB_TENANT_ID); + String parentTenantId = (String) request.getAttribute(Constant.PARENT_TENANT_ID); TenantEntity tenantEntity = new TenantEntity() {{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}; return tenantEntity; } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java index a4e377533..a40a9010e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java @@ -53,10 +53,10 @@ public class UploadController extends BaseController { private AmazonS3 s3 = null; private String getFileName(TenantEntity tenantEntity, String fileName) { - if (StringUtils.isBlank(tenantEntity.getSubTenantId())) { + if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { fileName = tenantEntity.getTenantId() + "/" + fileName; } else { - fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getSubTenantId() + "/" + fileName; + fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" + fileName; } return fileName; } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index 8ed6b53bc..72e583acd 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -138,8 +138,8 @@ public class WxCouponSendController extends BaseController { } TenantEntity tenantEntity = getTenantInfo(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("channelType", channelType); params.put("merchantId", getUser().getMerchantId()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index df396c777..b8668b3a1 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -176,8 +176,8 @@ public class WxInfoController extends BaseController { resultMap.put("token", token); request.setAttribute(Constant.LOGIN_USER_KEY, oldUser.getId()); request.setAttribute(Constant.TENANT_ID, buUser.getTenantId()); - if (StringUtils.isNotBlank(buUser.getSubTenantId())) { - request.setAttribute(Constant.SUB_TENANT_ID, buUser.getSubTenantId()); + if (StringUtils.isNotBlank(buUser.getParentTenantId())) { + request.setAttribute(Constant.PARENT_TENANT_ID, buUser.getParentTenantId()); } oldUser.setRegisterIp(ipaddress); @@ -214,8 +214,8 @@ public class WxInfoController extends BaseController { resultMap.put("token", token); request.setAttribute(Constant.LOGIN_USER_KEY, newUser.getId()); request.setAttribute(Constant.TENANT_ID, buUser.getTenantId()); - if (StringUtils.isNotBlank(buUser.getSubTenantId())) { - request.setAttribute(Constant.SUB_TENANT_ID, buUser.getSubTenantId()); + if (StringUtils.isNotBlank(buUser.getParentTenantId())) { + request.setAttribute(Constant.PARENT_TENANT_ID, buUser.getParentTenantId()); } } return new ResultData(resultMap); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 240c9c7c9..ff94814dd 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -86,7 +86,7 @@ public class WxMerchantBUserController extends BaseController { resultMap.put("creditLocked", EnumCreditLockedStatus.CLOSE.getCode()); } resultMap.put("tenant_id",merchant.getTenantId()); - resultMap.put("sub_tenant_id",merchant.getSubTenantId()); + resultMap.put("parent_tenant_id",merchant.getParentTenantId()); resultMap.put("phone", user.getPhone()); resultMap.put("name", user.getName()); resultMap.put("merchant_name", merchant.getName()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index bf8e3b4e6..47a915203 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -80,16 +80,16 @@ public class WxMsgValidationcodeController extends BaseController { @GetMapping("hasvalidationcode") @ApiImplicitParams({ @ApiImplicitParam(name = "tenantId", value = "租户ID", dataType = "String", paramType = "query"), - @ApiImplicitParam(name = "subTenantId", value = "子租户ID", dataType = "String", paramType = "query"), + @ApiImplicitParam(name = "parentTenantId", value = "父租户ID", dataType = "String", paramType = "query"), @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "code", value = "验证码", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) - public ResultData hasvalidationcode(String tenantId, String subTenantId, String phone, Integer type, String code, String appid) { + public ResultData hasvalidationcode(String tenantId, String parentTenantId, String phone, Integer type, String code, String appid) { WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(EnumMsgModel.VALIDATION_CODE.getCode()); diff --git a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 50c4d445f..37c1b215f 100644 --- a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -27,16 +27,16 @@ public class TenantInfoImpl implements TenantInfo { } @Override - public String getSubTenantId() { - String subTenantId = null; + public String getParentTenantId() { + String parentTenantId = null; try { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - subTenantId = (String) request.getAttribute(Constant.SUB_TENANT_ID); - return subTenantId; + parentTenantId = (String) request.getAttribute(Constant.PARENT_TENANT_ID); + return parentTenantId; } catch (Exception e) { logger.error(e.getMessage()); } - return subTenantId; + return parentTenantId; } @Override diff --git a/mallinkCApi/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkCApi/src/main/java/com/iformall/config/MyBatisConfiguration.java index 512e838e5..d3baf02c6 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkCApi/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -14,7 +14,7 @@ public class MyBatisConfiguration { MultiTenancy multiTenancy = new MultiTenancy(); Properties properties = new Properties(); properties.setProperty("tenantIdColumn", "tenant_id"); - properties.setProperty("subTenantIdColumn", "sub_tenant_id"); + properties.setProperty("parentTenantIdColumn", "parent_tenant_id"); properties.setProperty("dialect", "mysql"); properties.setProperty("tenantInfo", "com.iformall.tenant.TenantInfoImpl"); multiTenancy.setProperties(properties); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 999daab0f..ec1ca568a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -79,10 +79,10 @@ public class BaseController { public TenantEntity getTenantInfo() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String tenantId = (String) request.getAttribute(Constant.TENANT_ID); - String subTenantId = (String) request.getAttribute(Constant.SUB_TENANT_ID); + String parentTenantId = (String) request.getAttribute(Constant.PARENT_TENANT_ID); TenantEntity tenantEntity = new TenantEntity() {{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}; return tenantEntity; } @@ -106,8 +106,8 @@ public class BaseController { if (user.getTenantId() == null) { user.setTenantId(tenantEntity.getTenantId()); } - if (user.getSubTenantId() == null) { - user.setSubTenantId(tenantEntity.getSubTenantId()); + if (user.getParentTenantId() == null) { + user.setParentTenantId(tenantEntity.getParentTenantId()); } return user; } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java index 291870825..9e281050f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java @@ -103,10 +103,10 @@ public class UploadController extends BaseController { } private String getFileName(TenantEntity tenantEntity, String fileName) { - if (StringUtils.isBlank(tenantEntity.getSubTenantId())) { + if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { fileName = tenantEntity.getTenantId() + "/" + fileName; } else { - fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getSubTenantId() + "/" + fileName; + fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" + fileName; } return fileName; } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index f13a0577e..5a6c6d5c4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -61,8 +61,8 @@ public class WxMerchantController extends BaseController { HashMap params = new HashMap(); TenantEntity tenantEntity = getTenantInfo(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("merchantCode", codeMD5); WxMerchantVo wxMerchant = wxMerchantService.getMerchantInfo(params); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 3550b3ec3..fef73f5d2 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -266,8 +266,8 @@ public class WxUserGrantController extends BaseController { // 老用户,给出来已选中的mall if (mallList != null) { WxMall selectedMall = null; - if (StringUtils.isNotBlank(oldUser.getSubTenantId())) { - final String lastSubTenant = oldUser.getSubTenantId(); + if (StringUtils.isNotBlank(oldUser.getParentTenantId())) { + final String lastSubTenant = oldUser.getParentTenantId(); List selMallList = mallList.stream().filter(ml -> ml.getTenantId().equalsIgnoreCase(lastSubTenant)).collect(Collectors.toList()); if (selMallList.size() > 0) { selectedMall = selMallList.get(0); @@ -280,9 +280,9 @@ public class WxUserGrantController extends BaseController { } } if (selectedMall != null) { - request.setAttribute(Constant.SUB_TENANT_ID, selectedMall.getTenantId()); + request.setAttribute(Constant.PARENT_TENANT_ID, selectedMall.getTenantId()); resultMap.put("selectedMall", selectedMall.getTenantId()); - oldUser.setSubTenantId(selectedMall.getTenantId()); + oldUser.setParentTenantId(selectedMall.getTenantId()); } } @@ -361,9 +361,9 @@ public class WxUserGrantController extends BaseController { WxMall firstMall = mallList.get(0); if (firstMall != null) { // 默认选中第一个mall, 或者经纬度最近的那个 - request.setAttribute(Constant.SUB_TENANT_ID, firstMall.getTenantId()); + request.setAttribute(Constant.PARENT_TENANT_ID, firstMall.getTenantId()); resultMap.put("selectedMall", firstMall.getTenantId()); - newUser.setSubTenantId(firstMall.getTenantId()); + newUser.setParentTenantId(firstMall.getTenantId()); } } @@ -376,26 +376,26 @@ public class WxUserGrantController extends BaseController { } @PostMapping("/selectMall") - @ApiOperation(value = "用户选中子广场", notes = "{\"tenantId\":\"string\",\"subTenantId\":\"string\"}") + @ApiOperation(value = "用户选中子广场", notes = "{\"tenantId\":\"string\",\"parentTenantId\":\"string\"}") public ResultData selectMall(@RequestBody Map map) { logger.debug(map.toString()); String tenantId = map.get("tenantId"); - String subTenantId = map.get("subTenantId"); + String parentTenantId = map.get("parentTenantId"); if (StringUtils.isBlank(tenantId)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "tenantId不能为空"); } - if (StringUtils.isBlank(subTenantId)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "subTenantId不能为空"); + if (StringUtils.isBlank(parentTenantId)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "parentTenantId不能为空"); } WxCUser user = getUser(); if (user.getTenantId().equalsIgnoreCase(tenantId)) { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); request.setAttribute(Constant.TENANT_ID, tenantId); - request.setAttribute(Constant.SUB_TENANT_ID, subTenantId); - user.setSubTenantId(subTenantId); + request.setAttribute(Constant.PARENT_TENANT_ID, parentTenantId); + user.setParentTenantId(parentTenantId); userTokenService.saveOrUpdate(user); } diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index dbce04130..ce05884fb 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -65,8 +65,8 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { //设置userId到request里,后续根据userId,获取用户信息 request.setAttribute(Constant.LOGIN_USER_KEY, wxCUser.getId()); request.setAttribute(Constant.TENANT_ID, wxCUser.getTenantId()); - if (StringUtils.isNotBlank(wxCUser.getSubTenantId())) { - request.setAttribute(Constant.SUB_TENANT_ID, wxCUser.getSubTenantId()); + if (StringUtils.isNotBlank(wxCUser.getParentTenantId())) { + request.setAttribute(Constant.PARENT_TENANT_ID, wxCUser.getParentTenantId()); } return true; diff --git a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 3d81a5187..1fec66f71 100644 --- a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -27,16 +27,16 @@ public class TenantInfoImpl implements TenantInfo { } @Override - public String getSubTenantId() { - String subTenantId = null; + public String getParentTenantId() { + String parentTenantId = null; try { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - subTenantId = (String) request.getAttribute(Constant.SUB_TENANT_ID); - return subTenantId; + parentTenantId = (String) request.getAttribute(Constant.PARENT_TENANT_ID); + return parentTenantId; } catch (Exception e) { logger.error(e.getMessage()); } - return subTenantId; + return parentTenantId; } @Override diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java index 59b71654b..a2a07c0f6 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java @@ -326,8 +326,8 @@ public class WxCarETCPCallBackController extends BaseController { if (StringUtils.isNotBlank(wxCarCmdLog.getTenantId())) { map.put("tenantId", wxCarCmdLog.getTenantId()); } - if (StringUtils.isNotBlank(wxCarCmdLog.getSubTenantId())) { - map.put("subTenantId", wxCarCmdLog.getSubTenantId()); + if (StringUtils.isNotBlank(wxCarCmdLog.getParentTenantId())) { + map.put("parentTenantId", wxCarCmdLog.getParentTenantId()); } WxCarCmdLog carCmdLog = wxCarCmdLogService.getBySynId(map); if(carCmdLog != null) { @@ -357,7 +357,7 @@ public class WxCarETCPCallBackController extends BaseController { List userCarList = wxCUserCarService.getList(userCarQ); boolean bFirst = true; for (WxCUserCar userCar : userCarList) { - userCar.setSubTenantId(park.getSubTenantId()); + userCar.setParentTenantId(park.getParentTenantId()); wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar); WxCUser cUser = wxCUserService.getById(userCar.getCUserId()); if(cUser != null){ diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java index 91d357f11..93a679680 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java @@ -164,7 +164,7 @@ public class WxCarTJDCallBackController extends BaseController { List userCarList = wxCUserCarService.getList(userCarQ); boolean bFirst = true; for (WxCUserCar userCar : userCarList) { - userCar.setSubTenantId(park.getSubTenantId()); + userCar.setParentTenantId(park.getParentTenantId()); wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar); WxCUser cUser = wxCUserService.getById(userCar.getCUserId()); if(cUser != null){ diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 041eff2fe..f6d8a65be 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -120,10 +120,10 @@ public class PosServiceImpl implements PosService { WxMerchant merchant = checkAndGetMerchant(orgUser.getMerchantId()); // check password if (orgUser.getUserPwd().equalsIgnoreCase(password)) { - if (StringUtils.isBlank(orgUser.getSubTenantId())) { + if (StringUtils.isBlank(orgUser.getParentTenantId())) { retMap.put(WxPayConstant.TENANT_ID, orgUser.getTenantId()); } else { - retMap.put(WxPayConstant.TENANT_ID, orgUser.getSubTenantId()); + retMap.put(WxPayConstant.TENANT_ID, orgUser.getParentTenantId()); } retMap.put(WxPayConstant.MALL_NAME, mall.getName()); retMap.put(WxPayConstant.MERCHANT_ID, String.valueOf(orgUser.getMerchantId())); @@ -336,8 +336,8 @@ public class PosServiceImpl implements PosService { if (!config.getCoupon().equals(EnumPosCouponEnableType.Disable.getCode())) { Map coQ = new HashMap<>(); coQ.put("tenantId", tenantId); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - coQ.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + coQ.put("parentTenantId", tenantEntity.getParentTenantId()); } coQ.put("cUserId", user.getId()); coQ.put("merchantId", merchantId); @@ -941,8 +941,8 @@ public class PosServiceImpl implements PosService { if (!config.getCoupon().equals(EnumPosCouponEnableType.Disable.getCode())) { Map coQ = new HashMap<>(); coQ.put("tenantId", tenantId); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - coQ.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + coQ.put("parentTenantId", tenantEntity.getParentTenantId()); } coQ.put("cUserId", user.getId()); coQ.put("merchantId", merchantId); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index 3264fc85d..777c27724 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -55,7 +55,7 @@ public class BillNotificationSchedule { List> oweBillList = wxBillAllMapper.getOweBill(); for (Map bill : oweBillList) { String tenantId = bill.get("tenantId").toString(); - String subTenantId = bill.get("subTenantId").toString(); + String parentTenantId = bill.get("parentTenantId").toString(); logger.info("欠缴账单:" + JSONObject.toJSONString(bill)); BigDecimal owe = (BigDecimal) bill.get("owe"); BigDecimal price = owe.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); @@ -70,7 +70,7 @@ public class BillNotificationSchedule { wxMsgRecord.setReceiver(phone); wxMsgRecord.updateTenantInfo(new TenantEntity(){{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}); Map map = new HashedMap(); map.put("price", price.toString()); @@ -86,7 +86,7 @@ public class BillNotificationSchedule { List> waitBillList = wxBillAllMapper.getWaitPayBill(); for (Map bill : waitBillList) { String tenantId = bill.get("tenantId").toString(); - String subTenantId = bill.get("subTenantId").toString(); + String parentTenantId = bill.get("parentTenantId").toString(); logger.info("待缴账单账单:" + JSONObject.toJSONString(bill)); String receiveDate = bill.get("receiveDate").toString(); @@ -103,7 +103,7 @@ public class BillNotificationSchedule { wxMsgRecord.setReceiver(phone); wxMsgRecord.updateTenantInfo(new TenantEntity(){{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}); Map map = new HashedMap(); map.put("price", price.toString()); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index 94addee48..8bd310fb7 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -81,8 +81,8 @@ public class ChartDataSchedule { for (WxMall wxMall : wxMalls) { TenantEntity tenantEntity = wxMall.getTenantInfo(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", wxMall.getTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", wxMall.getTenantId()); } wxChartDataEntity.updateTenantInfo(tenantEntity); wxChartDataEntity.setType(EnumChartType.CAR_OUT.getCode()); @@ -143,8 +143,8 @@ public class ChartDataSchedule { for (WxMall wxMall : wxMalls) { TenantEntity tenantEntity = wxMall.getTenantInfo(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } wxChartDataEntity.updateTenantInfo(tenantEntity); wxChartDataEntity.setType(EnumChartType.SALE_COUPON_PRICE.getCode()); @@ -177,8 +177,8 @@ public class ChartDataSchedule { for (WxMall wxMall : wxMalls) { TenantEntity tenantEntity = wxMall.getTenantInfo(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } wxChartDataEntity.updateTenantInfo(tenantEntity); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index a0feb8e87..4a4923737 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -161,8 +161,8 @@ public class CouponSendSchedule { int sentCount = couponSendList.stream().map(cs -> { Map params = new HashMap(); params.put("tenantId", cs.getTenantId()); - if (StringUtils.isNotBlank(cs.getSubTenantId())) { - params.put("subTenantId", cs.getSubTenantId()); + if (StringUtils.isNotBlank(cs.getParentTenantId())) { + params.put("parentTenantId", cs.getParentTenantId()); } params.put("cUserId", cu.getId()); params.put("couponId", cs.getCouponId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index f67263c46..3b5d3d7dc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -142,7 +142,7 @@ public class MallUserInfo extends TenantEntity { if(StringUtils.isBlank(getTenantId())) { return false; } - if(StringUtils.isBlank(getSubTenantId()) && + if(StringUtils.isBlank(getParentTenantId()) && isAdmin.equals(EnumUserAdmin.ADMIN.getCode())) { return true; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java index 02e9e8190..060cabb5c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java @@ -24,8 +24,8 @@ public class WxChartDataEntity extends TenantEntity { sb.append("WxChartDataEntity{") .append("id=").append(id) .append(", tenantId='").append(getTenantId()).append('\''); - if (getSubTenantId() != null) { - sb.append(", subTenantId='").append(getSubTenantId()).append('\''); + if (getParentTenantId() != null) { + sb.append(", parentTenantId='").append(getParentTenantId()).append('\''); } sb.append(", type=").append(type) .append(", result='").append(result).append('\'') diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 4f630c996..142626146 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -133,16 +133,16 @@ public class WxMall extends BaseEntity { } else { TenantEntity mul = new TenantEntity(); mul.setTenantId(getParentTenantId()); - mul.setSubTenantId(getTenantId()); + mul.setParentTenantId(getTenantId()); return mul; } } public void setTenantInfo(TenantEntity tenantInfo) { - if (StringUtils.isBlank(tenantInfo.getSubTenantId())) { + if (StringUtils.isBlank(tenantInfo.getParentTenantId())) { setTenantId(tenantInfo.getTenantId()); } else { - setTenantId(tenantInfo.getSubTenantId()); + setTenantId(tenantInfo.getParentTenantId()); setParentTenantId(tenantInfo.getTenantId()); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 844b41131..0345bc6f5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -17,8 +17,8 @@ public class BaseTenantEntity extends BaseEntity { private String tenantId; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="子租户ID",name="subTenantId") - private String subTenantId; + @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") + private String parentTenantId; @TableField(exist = false) @JsonProperty(access = JsonProperty.Access.READ_ONLY) @@ -26,15 +26,15 @@ public class BaseTenantEntity extends BaseEntity { public void updateTenantInfo(TenantEntity info) { setTenantId(info.getTenantId()); - if (StringUtils.isNotBlank(info.getSubTenantId())) { - setSubTenantId(info.getSubTenantId()); + if (StringUtils.isNotBlank(info.getParentTenantId())) { + setParentTenantId(info.getParentTenantId()); } } public void updateTenantInfo(BaseTenantEntity info) { setTenantId(info.getTenantId()); - if (StringUtils.isNotBlank(info.getSubTenantId())) { - setSubTenantId(info.getSubTenantId()); + if (StringUtils.isNotBlank(info.getParentTenantId())) { + setParentTenantId(info.getParentTenantId()); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 420583ca9..625cc1b3e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -14,20 +14,20 @@ public class TenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="子租户ID",name="subTenantId") - private String subTenantId; + @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") + private String parentTenantId; public void updateTenantInfo(TenantEntity info) { setTenantId(info.getTenantId()); - if (StringUtils.isNotBlank(info.getSubTenantId())) { - setSubTenantId(info.getSubTenantId()); + if (StringUtils.isNotBlank(info.getParentTenantId())) { + setParentTenantId(info.getParentTenantId()); } } public void updateTenantInfo(BaseTenantEntity info) { setTenantId(info.getTenantId()); - if (StringUtils.isNotBlank(info.getSubTenantId())) { - setSubTenantId(info.getSubTenantId()); + if (StringUtils.isNotBlank(info.getParentTenantId())) { + setParentTenantId(info.getParentTenantId()); } } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java index cb5bd4e1f..14797dc5b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java @@ -34,11 +34,11 @@ public class InvestBaseEntity extends TenantEntity { private String tenantId; /** - * 子租户ID + * 父租户ID */ - @io.swagger.annotations.ApiModelProperty(value = "子租户ID", name = "subTenantId") + @io.swagger.annotations.ApiModelProperty(value = "父租户ID", name = "parentTenantId") @JsonProperty(access = JsonProperty.Access.READ_ONLY) - private String subTenantId; + private String parentTenantId; /** * 创建时间 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java index 4b3d86a31..aac48392b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java @@ -28,8 +28,8 @@ public class BaseMsg extends BaseEntity { private String tenantId; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="子租户id",name="subTenantId") - private String subTenantId; + @io.swagger.annotations.ApiModelProperty(value="父租户id",name="parentTenantId") + private String parentTenantId; @io.swagger.annotations.ApiModelProperty(value="唯一标识",name="uuid") @TableField(exist = false) @@ -57,18 +57,18 @@ public class BaseMsg extends BaseEntity { public void updateTenantInfo(TenantEntity tenantEntity) { setTenantId(tenantEntity.getTenantId()); - setSubTenantId(tenantEntity.getSubTenantId()); + setParentTenantId(tenantEntity.getParentTenantId()); } public void updateTenantInfo(BaseTenantEntity tenantEntity) { setTenantId(tenantEntity.getTenantId()); - setSubTenantId(tenantEntity.getSubTenantId()); + setParentTenantId(tenantEntity.getParentTenantId()); } public TenantEntity getTenantInfo() { return new TenantEntity() {{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCLoginMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCLoginMsg.java index ec3975a68..aae11a6b7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCLoginMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCLoginMsg.java @@ -12,8 +12,8 @@ public class FmInsideCLoginMsg extends BaseMsg{ @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="子租户id",name="subTenantId") - private String subTenantId; + @io.swagger.annotations.ApiModelProperty(value="父租户id",name="parentTenantId") + private String parentTenantId; @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "cUserId") private Long cUserId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCouponVerifyMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCouponVerifyMsg.java index 9f4f62ffe..9e1d107d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCouponVerifyMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCouponVerifyMsg.java @@ -12,8 +12,8 @@ public class FmInsideCouponVerifyMsg extends BaseMsg{ @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="子租户id",name="subTenantId") - private String subTenantId; + @io.swagger.annotations.ApiModelProperty(value="父租户id",name="parentTenantId") + private String parentTenantId; @io.swagger.annotations.ApiModelProperty(value = "券包ID", name = "couponOrderId") private Long couponOrderId; @io.swagger.annotations.ApiModelProperty(value = "B端用户ID", name = "bUserId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderSuccessMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderSuccessMsg.java index 96db784e8..cf7a51dff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderSuccessMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderSuccessMsg.java @@ -11,8 +11,8 @@ public class FmInsideOrderSuccessMsg extends BaseMsg{ @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="子租户id",name="subTenantId") - private String subTenantId; + @io.swagger.annotations.ApiModelProperty(value="父租户id",name="parentTenantId") + private String parentTenantId; @io.swagger.annotations.ApiModelProperty(value = "成功订单ID", name = "orderId") private Long orderId; @io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java index 38069e19c..db7629a21 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java @@ -22,8 +22,8 @@ public class WxMsg extends BaseMsg { @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="子租户ID",name="subTenantId") - private String subTenantId; + @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") + private String parentTenantId; @io.swagger.annotations.ApiModelProperty(value = "模板id", name = "modelId") private Long modelId; @io.swagger.annotations.ApiModelProperty(value = "内容", name = "msg") diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java index 37ca31cd0..af5f83dd6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java @@ -28,6 +28,6 @@ public interface KwMerchantMeterMapper extends CommonMapper getMerchantMeter(@Param("tenantId") String tenantId, @Param("subTenantId") String subTenantId); + List getMerchantMeter(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java index 6371e06c3..8793b76eb 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java @@ -11,7 +11,7 @@ public interface PosMallConfigMapper extends CommonMapper { @Deprecated PosMallConfig getByTenantId(String tenantId); - PosMallConfig getByTenantInfo(String tenantId, String subTenantId); + PosMallConfig getByTenantInfo(String tenantId, String parentTenantId); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java index aad5748e8..3ea60cc2e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java @@ -11,8 +11,8 @@ public interface WxBusinessMapper extends CommonMapper { List findList(WxBusiness wxBusiness); List findListAll(); - List findListForMerchant(@Param("tenantId") String tenantId, @Param("subTenantId") String subTenantId); - List findListForCoupon(@Param("tenantId") String tenantId, @Param("subTenantId") String subTenantId); + List findListForMerchant(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); + List findListForCoupon(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); List> businessDataList(WxBusiness wxBusiness); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java index 03164987c..3bb228998 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java @@ -14,7 +14,7 @@ public interface WxCampaignMapper extends CommonMapper { List findCList(WxCampaign wxCampaign); - int getMaxSortNum(String tenantId, String subTenantId); + int getMaxSortNum(String tenantId, String parentTenantId); List queryNotify(WxCampaign wxCampaign); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java index bd7b7ed44..460e82d8d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java @@ -33,10 +33,10 @@ public interface WxCouponActionLogMapper extends CommonMapper { * @param endTime * @return */ - List queryPriceTotalGroup(@Param("tenantId")String tenantId, @Param("subTenantId")String subTenantId, @Param("startTime") Date startTime, @Param("endTime")Date endTime); + List queryPriceTotalGroup(@Param("tenantId")String tenantId, @Param("parentTenantId")String parentTenantId, @Param("startTime") Date startTime, @Param("endTime")Date endTime); List queryForSceneRepotyHistoryVerified(HashMap params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 8301785c2..a08a423e1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -63,7 +63,7 @@ public interface WxRentContractMapper extends CommonMapper List selectRentContractByShopIds(@Param("shopIds") Collection shopIds, @Param("shopIdsRegexp") String shopIdsRegexp, @Param("tenantId") String tenantId, - @Param("subTenantId") String subTenantId); + @Param("parentTenantId") String parentTenantId); int hasContractNumber(WxRentContract wxRentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 99cf51087..2b59ddc4e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -110,8 +110,8 @@ public class DataTowerServiceImpl implements DataTowerService { HashMap rentMap = new HashMap<>(); Map params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } Calendar instance = Calendar.getInstance(); @@ -183,8 +183,8 @@ public class DataTowerServiceImpl implements DataTowerService { HashMap carMap = new HashMap<>(); HashMap paramsCar = new HashMap<>(); paramsCar.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - paramsCar.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + paramsCar.put("parentTenantId", tenantEntity.getParentTenantId()); } paramsCar.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); String startdate = DateUtils.getTimeBefore(30, new Date()); @@ -428,8 +428,8 @@ public class DataTowerServiceImpl implements DataTowerService { //租金 Map params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } Calendar instance = Calendar.getInstance(); instance.set(Calendar.DAY_OF_YEAR, 1); @@ -494,8 +494,8 @@ public class DataTowerServiceImpl implements DataTowerService { logger.info("停车-月统计-开始"); HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); String startdate = DateUtils.getTimeBefore(30, new Date()); @@ -531,8 +531,8 @@ public class DataTowerServiceImpl implements DataTowerService { logger.info("停车-查询近一周的缴费车辆-开始"); HashMap weekParams = new HashMap<>(); weekParams.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - weekParams.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + weekParams.put("parentTenantId", tenantEntity.getParentTenantId()); } String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); @@ -704,8 +704,8 @@ public class DataTowerServiceImpl implements DataTowerService { logger.info("停车-绑定车牌-开始"); Map carParams=new HashMap<>(); carParams.put("tenantId",tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - carParams.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + carParams.put("parentTenantId", tenantEntity.getParentTenantId()); } carParams.put("startdate",DateUtils.getSystemTime("yyyy-MM-dd 00:00:00")); carParams.put("enddate",DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index ccb19777a..64f05ec73 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -78,10 +78,10 @@ public class MallPermissionServiceImpl implements MallPermissionService { if(userInfo.isFmSuperAdmin() || userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { WxMall q = new WxMall() {{ - if (StringUtils.isBlank(userInfo.getSubTenantId())) { + if (StringUtils.isBlank(userInfo.getParentTenantId())) { setTenantId(userInfo.getTenantId()); } else { - setTenantId(userInfo.getSubTenantId()); + setTenantId(userInfo.getParentTenantId()); setParentTenantId(userInfo.getTenantId()); } }}; @@ -135,7 +135,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { } else if (userInfo.checkAdmin()) { // 租户超管 WxMall q = new WxMall() {{ - setTenantId(userInfo.getSubTenantId()); + setTenantId(userInfo.getParentTenantId()); setParentTenantId(userInfo.getTenantId()); }}; String menus = wxMallMapper.queryMenusByTenantInfo(q); 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 205ae9a00..a727c7237 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -107,8 +107,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //couponData HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); @@ -149,9 +149,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override public Map getSceneData(TenantEntity tenantEntity) { //今日营销投放券数 - int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), addDay(0), addDay(1)); - int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), addDay(-1), addDay(0)); - int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), addDay(-7), addDay(-6)); + int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), addDay(0), addDay(1)); + int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), addDay(-1), addDay(0)); + int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), addDay(-7), addDay(-6)); NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2);//控制保留小数点后几位,2:表示保留2位小数点 @@ -166,8 +166,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); @@ -178,8 +178,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //停车发券被核销数 HashMap params1 = new HashMap<>(); params1.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params1.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params1.put("parentTenantId", tenantEntity.getParentTenantId()); } params1.put("startTime", addDay(-30)); params1.put("endTime", addDay(1)); @@ -190,8 +190,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //核销发券被核销数 HashMap params2 = new HashMap<>(); params2.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params2.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params2.put("parentTenantId", tenantEntity.getParentTenantId()); } params2.put("startTime", addDay(-30)); params2.put("endTime", addDay(1)); @@ -202,8 +202,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { // B端刷卡支付被核销数 HashMap params3 = new HashMap<>(); params3.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params3.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params3.put("parentTenantId", tenantEntity.getParentTenantId()); } params3.put("startTime", addDay(-30)); params3.put("endTime", addDay(1)); @@ -214,8 +214,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { // 购买发券被核销数 HashMap params4 = new HashMap<>(); params4.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params4.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params4.put("parentTenantId", tenantEntity.getParentTenantId()); } params4.put("startTime", addDay(-30)); params4.put("endTime", addDay(1)); @@ -285,8 +285,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { public PageInfo getCouponDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(), 0)); @@ -329,7 +329,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - params.put("subTenantId", tenantEntity.getSubTenantId()); + params.put("parentTenantId", tenantEntity.getParentTenantId()); if (markingCouponDataReportDto.getStartTime() != null) { params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(), 0)); @@ -372,8 +372,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params.clear(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 //停车发券被核销数 @@ -426,8 +426,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params.clear(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 //获取车辆进场数 @@ -753,8 +753,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //核销量 HashMap params2 = new HashMap<>(); params2.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params2.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params2.put("parentTenantId", tenantEntity.getParentTenantId()); } if (markingCouponDataReportDto.getStartTime() != null) params2.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); @@ -769,7 +769,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //查询UV PV HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { params.put("tenantId", tenantEntity.getTenantId()); } params.put("startTime", addDay(-30)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java index c0fab2a41..e72eb105c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java @@ -35,7 +35,7 @@ public class PosMallConfigServiceImpl implements PosMallConfigService { @Override public PosMallConfig getByTenantInfo(TenantEntity tenantEntity) { - PosMallConfig config = posMallConfigMapper.getByTenantInfo(tenantEntity.getTenantId(), tenantEntity.getSubTenantId()); + PosMallConfig config = posMallConfigMapper.getByTenantInfo(tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); return config; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java index 1dfe46dfc..c9e0cf6b6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java @@ -41,8 +41,8 @@ public class PushLimitServiceImpl implements PushLimitService { private String getKey(TenantEntity tenantEntity) { StringBuilder sb = new StringBuilder(); sb.append(Constant.PUSH_LIMIT_KEY_PREV).append(tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - sb.append("-").append(tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + sb.append("-").append(tenantEntity.getParentTenantId()); } return sb.toString(); } @@ -168,8 +168,8 @@ public class PushLimitServiceImpl implements PushLimitService { // 3. check 每人每天多少张券 Map params = new HashMap(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("cUserId", cUserId); int countForUser = wxCouponActionLogMapper.getCountByUser(params); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java index 1e60a5a96..10a0fb264 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java @@ -303,10 +303,10 @@ public class QrCodeServiceImpl implements QrCodeService { } private String getFileName(TenantEntity tenantEntity, String fn) { - if (StringUtils.isBlank(tenantEntity.getSubTenantId())) { + if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { fn = tenantEntity.getTenantId() + "/" + fn; } else { - fn = tenantEntity.getTenantId() + "/" + tenantEntity.getSubTenantId() + "/" + fn; + fn = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" + fn; } return fn; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index b956c68b9..fb0f0a2fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1639,14 +1639,14 @@ public class WxBillAllServiceImpl implements WxBillAllService { continue; } String tenantId = (String) mapList.get(0).get("tenantId"); - String subTenantId = (String) mapList.get(0).get("subTenantId"); + String parentTenantId = (String) mapList.get(0).get("parentTenantId"); String receiveDate = (String) mapList.get(0).get("receiveDate"); String manager = (String) mapList.get(0).get("manager"); String managerPhone = (String) mapList.get(0).get("managerPhone"); TenantEntity tenantEntity = new TenantEntity() {{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}; String billListStr = ""; @@ -1699,7 +1699,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { continue; } String tenantId = (String) mapList.get(0).get("tenantId"); - String subTenantId = (String) mapList.get(0).get("subTenantId"); + String parentTenantId = (String) mapList.get(0).get("parentTenantId"); String receiveDate = (String) mapList.get(0).get("receiveDate"); String manager = (String) mapList.get(0).get("manager"); String managerPhone = (String) mapList.get(0).get("managerPhone"); @@ -1707,7 +1707,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { TenantEntity tenantEntity = new TenantEntity() {{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}; String billListStr = ""; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 11de32dab..9ad10b407 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -106,8 +106,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { public void updateWaidPayStatus(WxBillDaily record) { Map params = new HashMap<>(); params.put("tenantId", record.getTenantId()); - if (StringUtils.isNotBlank(record.getSubTenantId())) { - params.put("subTenantId", record.getSubTenantId()); + if (StringUtils.isNotBlank(record.getParentTenantId())) { + params.put("parentTenantId", record.getParentTenantId()); } params.put("waitPay", EnumBillDailyStatus.WAIT_PAY.getCode()); params.put("paid", EnumBillRentStatus.PAID.getCode()); @@ -124,8 +124,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { public void updateNotPaidStatus(WxBillDaily record) { Map params = new HashMap<>(); params.put("tenantId", record.getTenantId()); - if (StringUtils.isNotBlank(record.getSubTenantId())) { - params.put("subTenantId", record.getSubTenantId()); + if (StringUtils.isNotBlank(record.getParentTenantId())) { + params.put("parentTenantId", record.getParentTenantId()); } params.put("notPaid", EnumBillDailyStatus.NOT_PAID.getCode()); params.put("paid", EnumBillRentStatus.PAID.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index dfaec6caa..a8e8db3be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -54,9 +54,9 @@ public class WxBusinessServiceImpl implements WxBusinessService { if (filter == null) return wxBusinessMapper.findListAll(); else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) - return wxBusinessMapper.findListForCoupon(tenantEntity.getTenantId(), tenantEntity.getSubTenantId()); + return wxBusinessMapper.findListForCoupon(tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) - return wxBusinessMapper.findListForMerchant(tenantEntity.getTenantId(), tenantEntity.getSubTenantId()); + return wxBusinessMapper.findListForMerchant(tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); else return wxBusinessMapper.findListAll(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index bb9df5c58..65c9b501b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -288,7 +288,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { @Override public int getMaxSortNum(TenantEntity tenantEntity) { - return wxCampaignMapper.getMaxSortNum(tenantEntity.getTenantId(), tenantEntity.getSubTenantId()); + return wxCampaignMapper.getMaxSortNum(tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); } @Override 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 6190c64e3..e992903ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -100,7 +100,7 @@ public class WxChartServiceImpl implements WxChartDataService { @Override public ResultData queryData(Map paramsMap) { String tenantId = paramsMap.get("tenantId"); - String subTenantId = paramsMap.get("subTenantId"); + String parentTenantId = paramsMap.get("parentTenantId"); Integer chart = Integer.valueOf(paramsMap.get("chart")); String startdate = paramsMap.get("startdate"); String enddate = paramsMap.get("enddate"); @@ -122,7 +122,7 @@ public class WxChartServiceImpl implements WxChartDataService { TenantEntity tenantEntity = new TenantEntity() {{ setTenantId(tenantId); - setSubTenantId(subTenantId); + setParentTenantId(parentTenantId); }}; //出租率 @@ -625,8 +625,8 @@ public class WxChartServiceImpl implements WxChartDataService { } Map query = new HashedMap(); query.put("tenantId",tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - query.put("subTenantId",tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + query.put("parentTenantId",tenantEntity.getParentTenantId()); } query.put("id",paramsMap.get("id")); query.put("buildingId",paramsMap.get("buildingId")); @@ -647,8 +647,8 @@ public class WxChartServiceImpl implements WxChartDataService { Map queryMap = new HashMap<>(); queryMap.put("tenantId",tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - queryMap.put("subTenantId",tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + queryMap.put("parentTenantId",tenantEntity.getParentTenantId()); } queryMap.put("dateType",dateType); @@ -757,8 +757,8 @@ public class WxChartServiceImpl implements WxChartDataService { //绑定车牌 Map carParams = new HashMap<>(); carParams.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - carParams.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + carParams.put("parentTenantId", tenantEntity.getParentTenantId()); } carParams.put("startdate", DateUtils.getSystemTime("yyyy-MM-dd 00:00:00")); carParams.put("enddate", DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); @@ -799,8 +799,8 @@ public class WxChartServiceImpl implements WxChartDataService { String lastweek = DateUtils.getTimeBefore(7, new Date()); HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); params.put("startdate", systemTime + " 05:00:00"); @@ -871,8 +871,8 @@ public class WxChartServiceImpl implements WxChartDataService { HashMap datamap = new HashMap<>(); HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); startdate = DateUtils.getTimeBefore(30, new Date()); @@ -948,8 +948,8 @@ public class WxChartServiceImpl implements WxChartDataService { HashMap datamap = new HashMap<>(); HashMap weekParams = new HashMap<>(); weekParams.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - weekParams.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + weekParams.put("parentTenantId", tenantEntity.getParentTenantId()); } String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); @@ -969,8 +969,8 @@ public class WxChartServiceImpl implements WxChartDataService { HashMap datamap = new HashMap<>(); HashMap weekParams = new HashMap<>(); weekParams.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - weekParams.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + weekParams.put("parentTenantId", tenantEntity.getParentTenantId()); } String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); @@ -1041,8 +1041,8 @@ public class WxChartServiceImpl implements WxChartDataService { HashMap datamap = new HashMap<>(); HashMap weekParams = new HashMap<>(); weekParams.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - weekParams.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + weekParams.put("parentTenantId", tenantEntity.getParentTenantId()); } String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); @@ -1086,8 +1086,8 @@ public class WxChartServiceImpl implements WxChartDataService { //查询UV PV HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("startTime", addDay(-1)); params.put("endTime", addDay(1)); @@ -1151,9 +1151,9 @@ public class WxChartServiceImpl implements WxChartDataService { */ private ResultData getSaleSceneCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); - int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), addDay(0), addDay(1)); - int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), addDay(-1), addDay(0)); - int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), addDay(-7), addDay(-6)); + int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), addDay(0), addDay(1)); + int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), addDay(-1), addDay(0)); + int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), addDay(-7), addDay(-6)); NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2);//控制保留小数点后几位,2:表示保留2位小数点 String sceneDownDay = "--"; @@ -1180,8 +1180,8 @@ public class WxChartServiceImpl implements WxChartDataService { String enddate;//查询UV PV HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); @@ -1222,8 +1222,8 @@ public class WxChartServiceImpl implements WxChartDataService { HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); @@ -1233,8 +1233,8 @@ public class WxChartServiceImpl implements WxChartDataService { //停车发券被核销数 HashMap params1 = new HashMap<>(); params1.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params1.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params1.put("parentTenantId", tenantEntity.getParentTenantId()); } params1.put("startTime", addDay(-30)); params1.put("endTime", addDay(1)); @@ -1245,8 +1245,8 @@ public class WxChartServiceImpl implements WxChartDataService { //核销发券被核销数 HashMap params2 = new HashMap<>(); params2.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params2.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params2.put("parentTenantId", tenantEntity.getParentTenantId()); } params2.put("startTime", addDay(-30)); params2.put("endTime", addDay(1)); @@ -1257,8 +1257,8 @@ public class WxChartServiceImpl implements WxChartDataService { // B端刷卡支付被核销数 HashMap params3 = new HashMap<>(); params3.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params3.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params3.put("parentTenantId", tenantEntity.getParentTenantId()); } params3.put("startTime", addDay(-30)); params3.put("endTime", addDay(1)); @@ -1269,8 +1269,8 @@ public class WxChartServiceImpl implements WxChartDataService { // 购买发券被核销数 HashMap params4 = new HashMap<>(); params4.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params4.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params4.put("parentTenantId", tenantEntity.getParentTenantId()); } params4.put("startTime", addDay(-30)); params4.put("endTime", addDay(1)); @@ -1520,7 +1520,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date eTime = c.getTime(); c.add(Calendar.DAY_OF_YEAR, -7); Date sTime = c.getTime(); - List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), sTime, eTime); + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { dataMap.put(v.getXTime(), v.getPrice()); @@ -1561,7 +1561,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.set(Calendar.SECOND, 0); Date eTime = c.getTime();//明天0点 c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 - List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), sTime, eTime); + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); List monthVos = new ArrayList<>();//周消费金额 Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { @@ -1699,7 +1699,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date eTime = c.getTime();//明天0点 c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 Date sTime = c.getTime(); - List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), sTime, eTime); + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { dataMap.put(v.getXTime(), v.getPrice()); @@ -1838,8 +1838,8 @@ public class WxChartServiceImpl implements WxChartDataService { //couponData HashMap params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("tenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("tenantId", tenantEntity.getParentTenantId()); } params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); @@ -2447,8 +2447,8 @@ public class WxChartServiceImpl implements WxChartDataService { private ResultData getSaleGroupAnalysis(Map paramsMap, TenantEntity tenantEntity, String startdate) { Map params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } //默认时间本月第一天,截止到当天 Map result = new HashMap<>(); @@ -2590,7 +2590,7 @@ public class WxChartServiceImpl implements WxChartDataService { //租金 Map params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - params.put("subTenantId", tenantEntity.getSubTenantId()); + params.put("parentTenantId", tenantEntity.getParentTenantId()); params.put("startdate", startdate + " 00:00:00"); params.put("enddate", enddate + " 23:59:59"); Map payinfo = wxBillRentMapper.queryPayInfo(params); @@ -2677,7 +2677,7 @@ public class WxChartServiceImpl implements WxChartDataService { HashMap datamap = new HashMap<>(); WxShop query = new WxShop(); String tenantId = paramMap.get("tenantId"); - String subTenantId = paramMap.get("subTenantId"); + String parentTenantId = paramMap.get("parentTenantId"); String building = paramMap.get("building"); String floor = paramMap.get("floor"); String business = paramMap.get("businessId"); @@ -2685,8 +2685,8 @@ public class WxChartServiceImpl implements WxChartDataService { if (StringUtils.isNotEmpty(tenantId)) { query.setTenantId(tenantId); } - if (StringUtils.isNotEmpty(subTenantId)) { - query.setSubTenantId(subTenantId); + if (StringUtils.isNotEmpty(parentTenantId)) { + query.setParentTenantId(parentTenantId); } if (StringUtils.isNotEmpty(building)) { query.setBuilding(Long.valueOf(building)); @@ -2767,8 +2767,8 @@ public class WxChartServiceImpl implements WxChartDataService { //租金收缴率 ysje 应收金额 ssje 实收金额 zjsjl收缴率 Map params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("startdate", DateUtils.date2String(startDate,"yyyy-MM-dd") + " 00:00:00"); params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java index c30751adb..a0fdf0214 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java @@ -72,7 +72,7 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { @Override public int getCountByChannelId(TenantEntity tenantEntity, int channelType, Long channelId) { - return wxCouponActionLogMapper.getCountByChannelId(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), channelType, channelId); + return wxCouponActionLogMapper.getCountByChannelId(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), channelType, channelId); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 7cf3fcf28..69f8ebbf5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -975,7 +975,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public List queryPriceTotalGroup(TenantEntity tenantEntity, Date startTime, Date endTime) { - return wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), tenantEntity.getSubTenantId(), startTime, endTime); + return wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), startTime, endTime); } @Override @@ -1126,8 +1126,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { Map coQ = new HashMap<>(); coQ.put("tenantId", user.getTenantId()); - if (StringUtils.isNotBlank(user.getSubTenantId())) { - coQ.put("subTenantId", user.getSubTenantId()); + if (StringUtils.isNotBlank(user.getParentTenantId())) { + coQ.put("parentTenantId", user.getParentTenantId()); } coQ.put("cUserId", cUser.getId()); coQ.put("merchantId", user.getMerchantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index c478c12fb..f37ab9ba6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -458,8 +458,8 @@ public class WxFlowServiceImpl implements WxFlowService { map.put("taskAssignee",flowModel.getFlow()); setSignAssignee(map,flowModel.getFlow()); map.put("tenantId",tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - map.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + map.put("parentTenantId", tenantEntity.getParentTenantId()); } ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(flowModel.getFlowId(), map); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 96ea10f57..1511d9a19 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -175,11 +175,11 @@ public class WxMallServiceImpl implements WxMallService { } // 不存在,从数据库中获取 WxMall q = new WxMall() {{ - if (StringUtils.isBlank(tenantEntity.getSubTenantId())) { + if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { setTenantId(tenantEntity.getTenantId()); } else { - setTenantId(tenantEntity.getSubTenantId()); - setParentTenantId(tenantEntity.getTenantId()); + setTenantId(tenantEntity.getTenantId()); + setParentTenantId(tenantEntity.getParentTenantId()); } }}; WxMall mall = null; @@ -297,8 +297,8 @@ public class WxMallServiceImpl implements WxMallService { private String getRedisKeyByTenantInfo(TenantEntity tenantEntity) { StringBuilder sb = new StringBuilder(); sb.append(Constant.TENANT_KEY_PREV).append(tenantEntity.getTenantId()); - if (StringUtils.isBlank(tenantEntity.getSubTenantId())) { - sb.append("-").append(tenantEntity.getSubTenantId()); + if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { + sb.append("-").append(tenantEntity.getParentTenantId()); } return sb.toString(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 2b58114fd..307c98f92 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -180,7 +180,7 @@ public class WxMsgServiceImpl implements WxMsgService { public ResultData add(WxMsg wxMsg){ TenantEntity tenantEntity = new TenantEntity() {{ setTenantId(wxMsg.getTenantId()); - setSubTenantId(wxMsg.getSubTenantId()); + setParentTenantId(wxMsg.getParentTenantId()); }}; //不是草稿检验疲劳度 if (!wxMsg.getStatus().equals(EnumMsgStatus.MSG_STATUS_DRAFT.getCode())) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 31de1d58c..20af3eb22 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1742,8 +1742,8 @@ public class WxOrderServiceImpl implements WxOrderService { //全部商户个数 Map params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } String thirtyTime = DateUtils.getTimeBefore(29, new Date()); params.put("startdate", thirtyTime + " 00:00:00"); @@ -1790,8 +1790,8 @@ public class WxOrderServiceImpl implements WxOrderService { //总数 Map params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } String thirtyTime = DateUtils.getTimeBefore(29, new Date()); params.put("startdate", thirtyTime + " 00:00:00"); @@ -1855,8 +1855,8 @@ public class WxOrderServiceImpl implements WxOrderService { //总数 Map params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } String thirtyTime = DateUtils.getTimeBefore(29, new Date()); params.put("startdate", thirtyTime + " 00:00:00"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index edc008568..fa29005a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -683,8 +683,8 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ //全部商户个数 Map params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } String thirtyTime = DateUtils.getTimeBefore(29, new Date()); params.put("startdate", thirtyTime + " 00:00:00"); @@ -731,8 +731,8 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ //全部分账总数 Map params = new HashMap<>(); params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } String thirtyTime = DateUtils.getTimeBefore(29, new Date()); params.put("startdate", thirtyTime + " 00:00:00"); 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 41568a610..a1d7b4abd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2500,7 +2500,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public Map selectRentContractByShopIds(Collection shopIds, String shopIdsRegexp, TenantEntity tenantEntity) { - List list = wxRentContractMapper.selectRentContractByShopIds(shopIds, shopIdsRegexp, tenantEntity.getTenantId(), tenantEntity.getSubTenantId()); + List list = wxRentContractMapper.selectRentContractByShopIds(shopIds, shopIdsRegexp, tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); List shopIdArr = Arrays.asList(StringUtils.split(shopIdsRegexp,"|")) ; Map allShopContract = new HashMap<>(); for (WxRentContract wxRentContract : list) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 0932ba01c..b976c9352 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -169,8 +169,8 @@ public class WxShopServiceImpl implements WxShopService { public ResultData getShopList(TenantEntity tenantEntity, String shopNumber) { Map params=new HashMap<>(); params.put("tenantId",tenantEntity.getTenantId()); - if (tenantEntity.getSubTenantId() != null) { - params.put("subTenantId", tenantEntity.getSubTenantId()); + if (tenantEntity.getParentTenantId() != null) { + params.put("parentTenantId", tenantEntity.getParentTenantId()); } params.put("shopNumber",shopNumber); List> list=wxShopMapper.getShopList(params); @@ -181,8 +181,8 @@ public class WxShopServiceImpl implements WxShopService { public ResultData getMerchantShopByShopId(TenantEntity tenantEntity, String shopId) { Map params=new HashMap<>(); params.put("tenantId",tenantEntity.getTenantId()); - if (tenantEntity.getSubTenantId() != null) { - params.put("subTenantId",tenantEntity.getSubTenantId()); + if (tenantEntity.getParentTenantId() != null) { + params.put("parentTenantId",tenantEntity.getParentTenantId()); } params.put("shopId",shopId); Map map=wxShopMapper.getMerchantShopByShopId(params); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java index 6971578d6..6f006c5a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java @@ -90,7 +90,7 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { @Override public List getMerchantMeter(TenantEntity tenantEntity) { - return kwMerchantMeterMapper.getMerchantMeter(tenantEntity.getTenantId(), tenantEntity.getSubTenantId()); + return kwMerchantMeterMapper.getMerchantMeter(tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); } } diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index d0bd0563e..879e2650b 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -24,7 +24,7 @@ public class Constant { // C端token public static final String LOGIN_USER_KEY = "LOGIN_USER_KEY"; public static final String TENANT_ID = "TENANT_ID"; - public static final String SUB_TENANT_ID = "SUB_TENANT_ID"; + public static final String PARENT_TENANT_ID = "PARENT_TENANT_ID"; public static final String adminPage = "https://admin.malls.iformall.com"; diff --git a/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml index c632c129a..bfc369d36 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`imei`,`iccid`,`content`,`info`,`device_time`,`create_time` + `id`,`tenant_id`,`parent_tenant_id`,`imei`,`iccid`,`content`,`info`,`device_time`,`create_time` @@ -28,8 +28,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml index 4e9e4a48b..175449423 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml @@ -4,7 +4,7 @@ - + @@ -24,7 +24,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`imei`,`iccid`,`place`,`fw_version`,`hd_version`,`register_status`,`online_status`,`register_time`, + `id`,`tenant_id`,`parent_tenant_id`,`imei`,`iccid`,`place`,`fw_version`,`hd_version`,`register_status`,`online_status`,`register_time`, `last_online_time`,`config`,`create_time`,`update_time`,`com_key`,`status`,`max_tag_num` @@ -39,8 +39,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index 5b1585b8a..59e615f9c 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`meter_id`,`merchant_id`,`status`,`create_time`,`update_time` + `id`,`tenant_id`,`parent_tenant_id`,`meter_id`,`merchant_id`,`status`,`create_time`,`update_time` @@ -28,8 +28,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -72,7 +72,7 @@ - + @@ -86,7 +86,7 @@ - `id`, `tenant_id`, `sub_tenant_id`, `merchant_id`, `status`, `name`, `link_phone` + `id`, `tenant_id`, `parent_tenant_id`, `merchant_id`, `status`, `name`, `link_phone` select - temp.tenant_id, temp.sub_tenant_id, + temp.tenant_id, temp.parent_tenant_id, mm.merchant_id as merchantId, m.name as merchantName, @@ -233,7 +233,7 @@ from kw_merchant_meter mm, (SELECT - tenant_id,sub_tenant_id,box_id,meter_id, + tenant_id,parent_tenant_id,box_id,meter_id, min(last_device_time) as recordStartTime, min(last_total_power) as lastTotalPower, max(device_time) as recordEndTime, @@ -241,7 +241,7 @@ sum(used_power) as usedPower FROM kw_meter_data - group by tenant_id,sub_tenant_id,box_id,meter_id + group by tenant_id,parent_tenant_id,box_id,meter_id ) as temp, wx_merchant m where mm.status = 0 @@ -294,7 +294,7 @@ and m.id not in ( select merchant_id from wx_merchant_power_bill_config where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} ) diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 667ef1ae2..4beb0e5cc 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`meter_id`,`box_id`,`address`,`total_power`,`device_time`,`create_time`,`used_power`,`last_device_time`,`last_total_power` + `id`,`tenant_id`,`parent_tenant_id`,`meter_id`,`box_id`,`address`,`total_power`,`device_time`,`create_time`,`used_power`,`last_device_time`,`last_total_power` @@ -94,7 +94,7 @@ - + @@ -145,7 +145,7 @@ - insert into mall_role_permission (id, tenant_id, sub_tenant_id,permission_id, role_id) values + insert into mall_role_permission (id, tenant_id, parent_tenant_id,permission_id, role_id) values (#{item.id,jdbcType=BIGINT}, #{item.tenantId,jdbcType=VARCHAR}, - #{item.subTenantId,jdbcType=VARCHAR}, + #{item.parentTenantId,jdbcType=VARCHAR}, #{item.permissionId,jdbcType=BIGINT}, #{item.roleId,jdbcType=BIGINT}) diff --git a/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml b/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml index cc8baaa5f..fc0f9ec14 100644 --- a/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`user_id`,`type`,`ip`,`action_desc`,`action_time` + `id`,`tenant_id`,`parent_tenant_id`,`user_id`,`type`,`ip`,`action_desc`,`action_time` @@ -24,8 +24,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `user_id` = #{userId} @@ -60,7 +60,7 @@ - + @@ -70,7 +70,7 @@ - mua.`id`,mua.`tenant_id`,mua.`sub_tenant_id`,mua.`user_id`,mua.`type`,mua.`ip`,mua.`action_desc`,mua.`action_time`,mui.`name` + mua.`id`,mua.`tenant_id`,mua.`parent_tenant_id`,mua.`user_id`,mua.`type`,mua.`ip`,mua.`action_desc`,mua.`action_time`,mui.`name` diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 6235909d5..86856a29b 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -4,7 +4,7 @@ - + @@ -21,11 +21,11 @@ - `id`,`tenant_id`,`sub_tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`invest_rule`,`nick_name`,`phone`,`web_open_id`,email + `id`,`tenant_id`,`parent_tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`invest_rule`,`nick_name`,`phone`,`web_open_id`,email - `id`,`tenant_id`,`sub_tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`invest_rule`,`nick_name`,`phone`, + `id`,`tenant_id`,`parent_tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`invest_rule`,`nick_name`,`phone`, `bopen_id`,`web_open_id`,email @@ -39,8 +39,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -265,7 +265,7 @@ - + @@ -287,12 +287,12 @@ - u.`id`,u.`tenant_id`,u.`sub_tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`invest_rule`,u.`nick_name`,u.`phone`, + u.`id`,u.`tenant_id`,u.`parent_tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`invest_rule`,u.`nick_name`,u.`phone`, m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h`,email - u.`id`,u.`tenant_id`,u.`sub_tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`invest_rule`,u.`nick_name`,u.`phone`, + u.`id`,u.`tenant_id`,u.`parent_tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`invest_rule`,u.`nick_name`,u.`phone`, u.`bopen_id`,u.`web_open_id`, m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h`,email diff --git a/mallinkService/src/main/resources/mapper/PosCouponOrderVerifyMapper.xml b/mallinkService/src/main/resources/mapper/PosCouponOrderVerifyMapper.xml index bdd7a6906..414365736 100644 --- a/mallinkService/src/main/resources/mapper/PosCouponOrderVerifyMapper.xml +++ b/mallinkService/src/main/resources/mapper/PosCouponOrderVerifyMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`coupon_order_id`,`pos_order_id`,`state` + `id`,`tenant_id`,`parent_tenant_id`,`coupon_order_id`,`pos_order_id`,`state` @@ -24,8 +24,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `coupon_order_id` = #{couponOrderId} diff --git a/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml b/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml index b7ea5384b..278d9e5ef 100644 --- a/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`discount`,`coupon`,`card`,`create_date`,`update_date` + `id`,`tenant_id`,`parent_tenant_id`,`discount`,`coupon`,`card`,`create_date`,`update_date` @@ -24,8 +24,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `discount` = #{discount} @@ -68,7 +68,7 @@ from pos_mall_config where 1=1 and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/PosOrderMapper.xml b/mallinkService/src/main/resources/mapper/PosOrderMapper.xml index 64d1a17af..f56467086 100644 --- a/mallinkService/src/main/resources/mapper/PosOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/PosOrderMapper.xml @@ -15,7 +15,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`pos_order_no`,`type`,`order_status`,`bu_user_id`,`create_date`,`update_date` + `id`,`tenant_id`,`parent_tenant_id`,`pos_order_no`,`type`,`order_status`,`bu_user_id`,`create_date`,`update_date` @@ -26,8 +26,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `pos_order_no` like concat('%', #{posOrderNo},'%') diff --git a/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml index bf109bba1..184b8fe91 100644 --- a/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml @@ -4,7 +4,7 @@ - + @@ -29,7 +29,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`create_time`,`update_time`,`order_id`,`bu_user_id`,`type`,`pay_from`,`pay_amount`,`pay_time_start`,`pay_time_end`,`prepay_id`,`transaction_id`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`share`,`share_amount`,`rate_amount`,`fail_reason`,`auth_code`,`open_id`,`pay_end_from` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`order_id`,`bu_user_id`,`type`,`pay_from`,`pay_amount`,`pay_time_start`,`pay_time_end`,`prepay_id`,`transaction_id`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`share`,`share_amount`,`rate_amount`,`fail_reason`,`auth_code`,`open_id`,`pay_end_from` @@ -40,8 +40,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `create_time` = #{createTime} diff --git a/mallinkService/src/main/resources/mapper/PushLimitMapper.xml b/mallinkService/src/main/resources/mapper/PushLimitMapper.xml index e2b4e74dc..30e9a1574 100644 --- a/mallinkService/src/main/resources/mapper/PushLimitMapper.xml +++ b/mallinkService/src/main/resources/mapper/PushLimitMapper.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`msg_amount`,`coupon_amount`,`coupon_day`,`time_enable`,`time_start`,`time_end`,`create_time`,`update_time`,`enable` + `id`,`tenant_id`,`parent_tenant_id`,`msg_amount`,`coupon_amount`,`coupon_day`,`time_enable`,`time_start`,`time_end`,`create_time`,`update_time`,`enable` @@ -31,8 +31,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 6a67a6fdf..deac3da2a 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -4,7 +4,7 @@ - + @@ -24,7 +24,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`user_id`,`activity_id`,`name`,`nick_name`,`birthday`,`sex`,`phone`, + `id`,`tenant_id`,`parent_tenant_id`,`user_id`,`activity_id`,`name`,`nick_name`,`birthday`,`sex`,`phone`, `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time`,`img_url`,`send_msg` @@ -37,8 +37,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `name` like concat('%', #{name},'%') diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml index 206d4de53..81d985971 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml @@ -4,7 +4,7 @@ - + @@ -31,7 +31,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`cover_img`,`title`,`sub_title`,`detail`,`html`,`person_limit`,`activity_start_time`,`activity_end_time`, + `id`,`tenant_id`,`parent_tenant_id`,`cover_img`,`title`,`sub_title`,`detail`,`html`,`person_limit`,`activity_start_time`,`activity_end_time`, `use_credit`,`credit`,`type`,`status`,`start_time`,`end_time`,`question`,`is_expired`,`create_time`,`update_time`,`use_img`, `img_detail`,`send_msg`,`selectques` @@ -47,8 +47,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml b/mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml index 9eca3e4ab..8052c08ca 100644 --- a/mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`url`,`action_date`,`type`,`count` + `id`,`tenant_id`,`parent_tenant_id`,`url`,`action_date`,`type`,`count` @@ -26,8 +26,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml index c0e71eb44..784e0cfba 100644 --- a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`bill_id`,`user_id`,`user_name`,`phone`,`action`,`details`,`createtime`,`updatetime`,`pay_date` + `id`,`tenant_id`,`parent_tenant_id`,`bill_id`,`user_id`,`user_name`,`phone`,`action`,`details`,`createtime`,`updatetime`,`pay_date` @@ -32,8 +32,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 18e9be605..7493315b4 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -6,7 +6,7 @@ - + @@ -51,7 +51,7 @@ select count(bill.id) paycount,IFNULL(sum(bill.pay),0) pay from ( - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,1 bill_type_value,'租金' + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,1 bill_type_value,'租金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_rent where is_preview = 0 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,2 bill_type_value,'租赁押金' + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,2 bill_type_value,'租赁押金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_rent_deposit union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,3 bill_type_value,'物业费' + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,3 bill_type_value,'物业费' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_property where is_preview = 0 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,4 bill_type_value,'物业押金' + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,4 bill_type_value,'物业押金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_property_deposit union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,5 bill_type_value,'水费' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,5 bill_type_value,'水费' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_daily where type=1 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,6 bill_type_value,'电费' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,6 bill_type_value,'电费' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_daily where type=2 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,9 bill_type_value,'空调费' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,9 bill_type_value,'空调费' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_daily where type=3 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,7 bill_type_value,'其他费用' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,7 bill_type_value,'其他费用' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_other union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,8 bill_type_value,'其他押金' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,8 bill_type_value,'其他押金' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_other_deposit ) bill - where bill.tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + where (bill.tenant_id=#{tenantId} or bill.parent_tenant_id=#{tenantId}) + and bill.status=#{status} and bill.receive_date between #{starttime} and #{endtime} @@ -271,168 +271,168 @@ - select bill.tenant_id tenantId,bill.sub_tenant_id subTenantId,bill.merchant_id merchantId,m.name merchantName,bill.receive_date receiveDate, + select bill.tenant_id tenantId,bill.parent_tenant_id parentTenantId,bill.merchant_id merchantId,m.name merchantName,bill.receive_date receiveDate, bill.need_pay needPay,m.link_phone linkPhone,app.appname,m.email,bill.bill_type billType from ( - select bill.bill_type,bill.tenant_id,sub_tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0) need_pay from ( - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,'租金' name,1 bill_type_value,'租金' + select bill.bill_type,bill.tenant_id,parent_tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0) need_pay from ( + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,'租金' name,1 bill_type_value,'租金' bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_rent where is_preview = 0 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_rent_deposit union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,'物业费' name,3 bill_type_value,'物业费' + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,'物业费' name,3 bill_type_value,'物业费' bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_property where is_preview = 0 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,'物业押金' name,4 bill_type_value,'物业押金' + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,'物业押金' name,4 bill_type_value,'物业押金' bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_property_deposit union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,'水费' name,5 bill_type_value,'水费' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,'水费' name,5 bill_type_value,'水费' bill_type,0 as need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_daily where type=1 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,'电费' name,6 bill_type_value,'电费' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,'电费' name,6 bill_type_value,'电费' bill_type,0 as need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_daily where type=2 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,'空调费' name,9 bill_type_value,'空调费' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,'空调费' name,9 bill_type_value,'空调费' bill_type,0 as need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_daily where type=3 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,name,7 bill_type_value,'其他费用' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,name,7 bill_type_value,'其他费用' bill_type,0 as need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_other union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,name,8 bill_type_value,'其他押金' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,name,8 bill_type_value,'其他押金' bill_type,0 as need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_other_deposit ) bill where bill.status not in(3,5,6) - group by bill.tenant_id,bill.sub_tenant_id,bill.merchant_id,bill.receive_date) bill + group by bill.tenant_id,bill.parent_tenant_id,bill.merchant_id,bill.receive_date) bill left join wx_merchant m on bill.merchant_id=m.id - left join (select tenant_id,sub_tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id + left join (select tenant_id,parent_tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id where m.status=1 and DATEDIFF(bill.receive_date,now())=m.bill_setting @@ -702,7 +702,7 @@ select tt.* from ( - select m.tenant_id,m.sub_tenant_id,m.id,m.name,ws.shop_number shopNumber,ws.type,m.link_person linkPerson,m.link_phone linkPhone, + select m.tenant_id,m.parent_tenant_id,m.id,m.name,ws.shop_number shopNumber,ws.type,m.link_person linkPerson,m.link_phone linkPhone, xb.title business,rc.rental_start_date rentalStartDate,rc.rental_end_date rentalEndDate,rc.rent_shop_type, ifnull(round( (select sum(bill.receive_pay)+sum(bill.late_pay_price)+sum(bill.receivePay) from ( @@ -951,7 +951,7 @@ ) tt where 1=1 and tt.tenant_id = #{tenantId} - and tt.`sub_tenant_id` = #{subTenantId} + and tt.`parent_tenant_id` = #{parentTenantId} and tt.id = #{merchantId} and tt.name like concat('%', #{merchantName},'%') and tt.rent_shop_type = #{rentShopType} @@ -967,26 +967,26 @@ @@ -127,17 +127,17 @@ ( select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_rent_deposit where status = 1 and tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and receive_date between #{startdate} and #{enddate} union all select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_property_deposit where status = 1 and tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and receive_date between #{startdate} and #{enddate} union all select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_other_deposit where status = 1 and tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and receive_date between #{startdate} and #{enddate} ) res @@ -145,7 +145,7 @@ update wx_bill_rent_deposit set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and status!=#{paid} and status!=5 and DATEDIFF(now(),receive_date)>0 @@ -154,7 +154,7 @@ select a.id from (select br.id,rc.receive_period,br.rent_contract_id,br.receive_date from wx_bill_rent_deposit br left join wx_rent_contract rc on br.rent_contract_id=rc.id where br.tenant_id=#{tenantId} - and br.`sub_tenant_id` = #{subTenantId} + and br.`parent_tenant_id` = #{parentTenantId} and br.status!=#{paid} and br.status!=5 and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 6b3bd5c3a..1d27f788e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, + `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, `owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`name`,`comments`, `rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze,service_charge_pay @@ -42,7 +42,7 @@ where 1 = 1 and `id` = #{id} and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and `receive_pay` = #{receivePay} and `pay` = #{pay} and `receive_date` = #{receiveDate} @@ -104,14 +104,14 @@ update wx_bill_other_deposit set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and status!=#{paid} and status!=5 and DATEDIFF(now(),receive_date)>0 update wx_bill_other_deposit set status=#{waitPay} where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and status!=5 and status!=#{paid} and DATEDIFF(now(),receive_date) <=0 diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index a16a7b595..0b9be3f3d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -4,7 +4,7 @@ - + @@ -32,7 +32,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, + `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, `owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`name`,`comments`, `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay @@ -41,7 +41,7 @@ where 1 = 1 and `id` = #{id} and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and `receive_pay` = #{receivePay} and `pay` = #{pay} and `receive_date` = #{receiveDate} @@ -103,13 +103,13 @@ update wx_bill_other set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and status!=#{paid} and DATEDIFF(now(),receive_date)>0 update wx_bill_other set status=#{waitPay} where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and status!=#{paid} and DATEDIFF(now(),receive_date) <=0 @@ -119,12 +119,12 @@ ( select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_other where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and receive_date between #{startdate} and #{enddate} union select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_daily where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and receive_date between #{startdate} and #{enddate} ) t @@ -135,12 +135,12 @@ ( select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_daily where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and receive_date between #{startdate} and #{enddate} and status = 1 union all select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_daily where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and receive_date between #{startdate} and #{enddate} and status = 1 ) res diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index cf8016664..58a3fb2f0 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -4,7 +4,7 @@ - + @@ -31,7 +31,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`, + `id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`, `pay_date`,`createtime`,`expired_day`,`owe`,`status`,`is_del`,`need_pay`, `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay @@ -40,7 +40,7 @@ where 1 = 1 and `id` = #{id} and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and `property_contract_id` = #{propertyContractId} and `receive_pay` = #{receivePay} and `pay` = #{pay} @@ -85,7 +85,7 @@ and br.`id` = #{id} and br.`tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and br.`merchant_id` = #{merchantId} and m.`name` like concat('%',#{merchantName},'%') and br.`status` = #{status} @@ -101,7 +101,7 @@ @@ -109,7 +109,7 @@ update wx_bill_property_deposit set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and status!=#{paid} and status!=5 and DATEDIFF(now(),receive_date)>0 @@ -118,7 +118,7 @@ select a.id from (select br.id,rc.receive_period,br.property_contract_id,br.receive_date from wx_bill_property_deposit br left join wx_property_contract rc on br.property_contract_id=rc.id where br.tenant_id=#{tenantId} - and br.`sub_tenant_id` = #{subTenantId} + and br.`parent_tenant_id` = #{parentTenantId} and br.status!=#{paid} and br.status!=5 and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index aff647824..4c4500473 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -4,7 +4,7 @@ - + @@ -46,7 +46,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, + `id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, @@ -57,7 +57,7 @@ where 1=1 and `id` = #{id} and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and `property_contract_id` = #{propertyContractId} and `receive_pay` = #{receivePay} and `pay` = #{pay} @@ -129,17 +129,17 @@ @@ -148,7 +148,7 @@ @@ -157,7 +157,7 @@ update wx_bill_property b set b.status=#{notPaid},b.expired_day= DATEDIFF(now(), b.receive_date) where b.tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and b.status!=#{paid} and b.status!=6 and DATEDIFF(now(), b.receive_date) >0 @@ -169,7 +169,7 @@ from wx_bill_property br left join wx_property_contract rc on br.property_contract_id=rc.id where br.tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and br.status!=#{paid} and br.status != 6 and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) @@ -214,7 +214,7 @@ INSERT INTO wx_bill_property (id,property_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, - tenant_id, sub_tenant_id, owe, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, + tenant_id, parent_tenant_id, owe, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, pay_way, late_pay_status, comments,service_charge_pay) @@ -222,7 +222,7 @@ ( #{item.id},#{item.propertyContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, - #{item.expiredDay},#{item.tenantId},#{item.subTenantId}, + #{item.expiredDay},#{item.tenantId},#{item.parentTenantId}, #{item.owe},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, @@ -295,7 +295,7 @@ update wx_bill_property set service_charge_pay=round(receive_pay*#{serviceChargeRate}/10000),owe=receive_pay + service_charge_pay + ifnull(late_pay_price,0) - pay where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and service_charge_pay=0 and status in(1,2,4) diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 9f1381d45..5d2766ca8 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -4,7 +4,7 @@ - + @@ -52,7 +52,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, + `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, `createtime`,`expired_day`,`owe`,`status`,`is_del`,`need_pay`, `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, @@ -63,7 +63,7 @@ where 1=1 and `id` = #{id} and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and `rent_contract_id` = #{rentContractId} and `receive_pay` = #{receivePay} and `pay` = #{pay} @@ -139,8 +139,8 @@ select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_rent where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and receive_date between #{startdate} and #{enddate} and is_preview = 0 and status!=6 @@ -158,7 +158,7 @@ @@ -166,7 +166,7 @@ update wx_bill_rent b set b.status=#{notPaid},b.expired_day= DATEDIFF(now(), b.receive_date) where b.tenant_id=#{tenantId} - and b.`sub_tenant_id` = #{subTenantId} + and b.`parent_tenant_id` = #{parentTenantId} and b.status!=#{paid} and b.status!=6 and DATEDIFF(now(), b.receive_date) >0 @@ -176,7 +176,7 @@ select a.id from (select br.id,rc.receive_period,br.rent_contract_id,br.receive_date from wx_bill_rent br left join wx_rent_contract rc on br.rent_contract_id=rc.id where br.tenant_id=#{tenantId} - and br.`sub_tenant_id` = #{subTenantId} + and br.`parent_tenant_id` = #{parentTenantId} and br.status!=#{paid} and br.status!=6 and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) @@ -213,7 +213,7 @@ - INSERT INTO wx_bill_rent (id,tenant_id,sub_tenant_id, + INSERT INTO wx_bill_rent (id,tenant_id,parent_tenant_id, rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, owe, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, @@ -221,7 +221,7 @@ VALUES ( - #{item.id},#{item.tenantId},#{item.subTenantId}, + #{item.id},#{item.tenantId},#{item.parentTenantId}, #{item.rentContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, #{item.expiredDay},#{item.owe},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml index 4ba6686e3..1328a5597 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`settle_id`,`type`,`bill_id`,`bill_type` + `id`,`tenant_id`,`parent_tenant_id`,`settle_id`,`type`,`bill_id`,`bill_type` ,`createtime`,`updatetime` @@ -43,10 +43,10 @@ select bl.`type`,IFNULL(bill.starttime,NULL),IFNULL(bill.endtime,NULL),bl.bill_id,bl.bill_type,bill.bill_type billName,IFNULL(bill.owe,0) receivePay from wx_bill_settle_bill bl left join - (select id,merchant_id,shop_id,tenant_id,sub_tenant_id,1 bill_type_value,'租金-租金' + (select id,merchant_id,shop_id,tenant_id,parent_tenant_id,1 bill_type_value,'租金-租金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_rent where is_preview = 0 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,2 bill_type_value,'租赁押金-租赁押金' + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,2 bill_type_value,'租赁押金-租赁押金' bill_type,need_pay,receive_pay,pay, @@ -59,11 +59,11 @@ ,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_rent_deposit union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,3 bill_type_value,'物业费-物业费' + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,3 bill_type_value,'物业费-物业费' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_property where is_preview = 0 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,4 bill_type_value,'物业押金-物业押金' + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,4 bill_type_value,'物业押金-物业押金' bill_type,need_pay,receive_pay,pay, @@ -76,22 +76,22 @@ ,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_property_deposit union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,5 bill_type_value,'水费-水费' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,5 bill_type_value,'水费-水费' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_daily where type=1 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,6 bill_type_value,'电费-电费' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,6 bill_type_value,'电费-电费' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_daily where type=2 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,9 bill_type_value,'空调费-空调费' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,9 bill_type_value,'空调费-空调费' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_daily where type=3 union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,7 bill_type_value,concat('其他费用-',name) as bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,7 bill_type_value,concat('其他费用-',name) as bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_other union all - select id,merchant_id,shop_id,tenant_id,sub_tenant_id,8 bill_type_value,concat('其他押金-',comments) as bill_type,0 as + select id,merchant_id,shop_id,tenant_id,parent_tenant_id,8 bill_type_value,concat('其他押金-',comments) as bill_type,0 as need_pay,receive_pay,pay, @@ -104,14 +104,14 @@ ,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_other_deposit union all - select id, id merchant_id,'' shop_id,tenant_id,sub_tenant_id,10 bill_type_value,'补贴-补贴' bill_type,0 as + select id, id merchant_id,'' shop_id,tenant_id,parent_tenant_id,10 bill_type_value,'补贴-补贴' bill_type,0 as need_pay,subsidy receive_pay,0 pay,subsidy owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type,'' starttime,'' endtime from wx_merchant_subsidy ) bill on(bl.bill_id = bill.id) where 1=1 and bill.`id` = #{billId} and bl.`tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and bl.`settle_id` = #{settleId} and bl.`type` = #{type} @@ -119,10 +119,10 @@ @@ -53,7 +53,7 @@ and `name` = #{name} and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and id != #{id} diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index 5f7b741e2..61c11f24c 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -66,7 +66,7 @@ (select count(*) from wx_merchant m where m.tenant_id = #{tenantId} - and m.`sub_tenant_id` = #{subTenantId} + and m.`parent_tenant_id` = #{parentTenantId} and b.id = m.business_id and m.status = 1 and m.is_public = 1) > 0 @@ -81,7 +81,7 @@ (select count(*) from wx_coupon_channel cc where cc.tenant_id = #{tenantId} - and cc.`sub_tenant_id` = #{subTenantId} + and cc.`parent_tenant_id` = #{parentTenantId} and b.id = cc.business and cc.status = 0 and cc.target_ad = 1) > 0 diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 413e0693a..7fe31a1f7 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -4,7 +4,7 @@ - + @@ -49,7 +49,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`open_id`,`union_id`,`nick_name`,`gender`,`avatar_url`,`phone`,`pure_phone`, + `id`,`tenant_id`,`parent_tenant_id`,`open_id`,`union_id`,`nick_name`,`gender`,`avatar_url`,`phone`,`pure_phone`, `city`,`province`,`language`,`country_code`,`register_ip`,`verify_code_phone`, `qrcode_source`,`scene`,`scene_address`,`session_key`,`score`, `update_date`,`create_date`,`app_id`,`token`,`expire_time`,`latitude`, `longitude`, diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index 233b390d6..8deb0cf05 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -4,7 +4,7 @@ - + @@ -31,17 +31,17 @@ - `id`,`tenant_id`,`sub_tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, + `id`,`tenant_id`,`parent_tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html`, `produce_type`,`produce_id`,`page_path`,`page_scene` - `id`,`tenant_id`,`sub_tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`type`,`sort_num`,`page_path` + `id`,`tenant_id`,`parent_tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`type`,`sort_num`,`page_path` - `id`,`tenant_id`,`sub_tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, + `id`,`tenant_id`,`parent_tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`page_path` @@ -56,8 +56,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index 2de1ffe0f..6abc8b1ee 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`vendor_type`,`cmd_type`,`create_date`,`update_date`,`cmd_json` + `id`,`tenant_id`,`parent_tenant_id`,`vendor_type`,`cmd_type`,`create_date`,`update_date`,`cmd_json` @@ -27,8 +27,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -69,8 +69,8 @@ select count(id) from wx_car_cmd_log where tenant_id = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and cmd_type=#{cmdType} and create_date BETWEEN #{startdate} and #{enddate} @@ -99,7 +99,7 @@ select sum(fee) fee,c.create_time from ( select id,DATE_FORMAT(create_date,'%m/%d') create_time,CONVERT(JSON_EXTRACT(cmd_json,'$.fee'), Decimal(16,2)) fee from wx_car_cmd_log where tenant_id = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and cmd_type=#{cmdType} and REPLACE (JSON_EXTRACT(cmd_json,'$.time'),'"','') BETWEEN #{startdate} and #{enddate} ) c group by c.create_time order by c.create_time @@ -109,9 +109,9 @@ select DATE_FORMAT(ccl.create_date,'%Y-%m-%d') xTime, count(ccl.id) triggerCount from wx_c_user_car cuc, wx_car_cmd_log ccl where cuc.tenant_id = #{tenantId} - and cuc`sub_tenant_id` = #{subTenantId} + and cuc`parent_tenant_id` = #{parentTenantId} and ccl.tenant_id = #{tenantId} - and ccl`sub_tenant_id` = #{subTenantId} + and ccl`parent_tenant_id` = #{parentTenantId} and ccl.plateNumber = cuc.car_number and cmd_type=#{cmdType} @@ -131,7 +131,7 @@ @@ -137,7 +137,7 @@ from wx_coupon_action_log left join wx_coupon_order on wx_coupon_action_log.coupon_order_id=wx_coupon_order.id where wx_coupon_action_log.tenant_id=#{tenantId} - and wx_coupon_action_log.`sub_tenant_id` = #{subTenantId} + and wx_coupon_action_log.`parent_tenant_id` = #{parentTenantId} ----- and wx_coupon_order.coupon_order_status = 1 ---- and wx_coupon_action_log.create_time >= #{startTime} and wx_coupon_action_log.create_time <= #{endTime} @@ -151,7 +151,7 @@ Count(*) as sendCount from wx_coupon_action_log where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and channel_type=#{channelType} and create_time >= #{startTime} @@ -171,7 +171,7 @@ from wx_coupon_action_log cal left join wx_coupon_order co on cal.coupon_order_id=co.id where cal.tenant_id=#{tenantId} - and cal.`sub_tenant_id` = #{subTenantId} + and cal.`parent_tenant_id` = #{parentTenantId} and co.coupon_order_status = 1 and cal.create_time >= #{startTime} @@ -188,7 +188,7 @@ select COUNT(*) FROM wx_coupon_action_log where tenant_id = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and channel_type = #{channelType} and channel_id = #{channelId} @@ -208,7 +208,7 @@ FROM wx_coupon_action_log a, wx_coupon_order o WHERE a.coupon_order_id = o.id AND a.tenant_id = #{tenantId} - and a.`sub_tenant_id` = #{subTenantId} + and a.`parent_tenant_id` = #{parentTenantId} AND o.c_user_id = #{cUserId} AND date(a.create_time) = curdate() @@ -218,7 +218,7 @@ FROM wx_coupon_action_log a, wx_coupon_order o WHERE a.coupon_order_id = o.id AND a.tenant_id = #{tenantId} - and a.`sub_tenant_id` = #{subTenantId} + and a.`parent_tenant_id` = #{parentTenantId} AND o.c_user_id = #{cUserId} AND a.coupon_id = #{couponId} AND date(a.create_time) between date_sub(curdate(),interval #{dayNum} day) and curdate() @@ -229,7 +229,7 @@ FROM wx_coupon_action_log a, wx_coupon_order o WHERE a.coupon_order_id = o.id AND a.tenant_id = #{tenantId} - and a.`sub_tenant_id` = #{subTenantId} + and a.`parent_tenant_id` = #{parentTenantId} AND o.c_user_id = #{cUserId} AND a.coupon_id = #{couponId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml index 4051115b8..c48ba2674 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`park_id`,`vendor_type`,`vendor_params`,`create_date`,`update_date` + `id`,`tenant_id`,`parent_tenant_id`,`park_id`,`vendor_type`,`vendor_params`,`create_date`,`update_date` @@ -28,8 +28,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -102,7 +102,7 @@ - + @@ -134,7 +134,7 @@ - c.id,c.tenant_id,c.sub_tenant_id,c.type,c.cover_img,c.cover_picture,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, + c.id,c.tenant_id,c.parent_tenant_id,c.type,c.cover_img,c.cover_picture,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, car.vendor_type, car.vendor_params,c.credit_price, c.`auto_refund`, c.content_type select ct.id as id,wc.id as couponId, - wc.tenant_id,wc.sub_tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`, + wc.tenant_id,wc.parent_tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`, wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.`unit`,wc.`remain_inventory`,wc.`inventory`, wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`, wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`,wc.`conditions`, @@ -918,6 +918,6 @@ max(case type when 12 then model_id else 0 end) pressModelId from wx_flow_config where type in(9,10,11,12) and tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index 3986fb533..ca1b61ff0 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -4,7 +4,7 @@ - + @@ -28,8 +28,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `product_id` = #{productId} @@ -80,7 +80,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 05cf94f3d..178065ce9 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, `verify_type` + `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, `verify_type` @@ -34,8 +34,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -107,7 +107,7 @@ `update_date` = #{updateDate}, `verify_type` = #{verifyType} where `tenant_id`=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and id=#{id} and `b_user_id` is null @@ -119,7 +119,7 @@ `verify_type` = #{verifyType} where 1=1 and `tenant_id`=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and id=#{id} and `b_user_id` is null @@ -147,7 +147,7 @@ `update_date` = #{updateDate}, `verify_type` = null where `tenant_id`=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and id=#{id} @@ -160,7 +160,7 @@ where coupon_order_status=1 AND DATE_FORMAT(create_date,'%m/%d')=createTime AND tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} AND c.update_date >= #{startTime} AND c.update_date <= #{endTime}) as verifyCount, (select Count(DISTINCT c_user_id) @@ -168,12 +168,12 @@ where coupon_order_status=1 AND DATE_FORMAT(create_date,'%m/%d')=createTime AND tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} AND d.update_date >= #{startTime} AND d.update_date <= #{endTime}) as verifyUserCount from wx_coupon_order where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} AND create_date >= #{startTime} AND create_date <= #{endTime} GROUP BY createTime @@ -218,7 +218,7 @@ select DATE_FORMAT(update_date,'%Y-%m-%d') xTime, count(c.id) triggerCount from wx_coupon_order c where c.tenant_id = #{tenantId} - and c.`sub_tenant_id` = #{subTenantId} + and c.`parent_tenant_id` = #{parentTenantId} and c.coupon_order_status = 1 and c.update_date BETWEEN #{startTime} and #{endTime} @@ -230,7 +230,7 @@ select DATE_FORMAT(update_date,'%Y-%m-%d') xTime, count(c.id) triggerCount from wx_coupon_order c where c.tenant_id = #{tenantId} - and c.`sub_tenant_id` = #{subTenantId} + and c.`parent_tenant_id` = #{parentTenantId} and c.create_date BETWEEN #{startTime} and #{endTime} @@ -242,8 +242,8 @@ from wx_coupon_order c left join wx_coupon_action_log cal on cal.tenant_id = c.tenant_id where cal.coupon_order_id=c.id and c.tenant_id=#{tenantId} - - and c.`sub_tenant_id` = #{subTenantId} + + and c.`parent_tenant_id` = #{parentTenantId} and cal.channel_type=#{channelType} @@ -258,7 +258,7 @@ SELECT IFNULL(SUM(coupon_price),0) from wx_coupon_order where 1=1 and tenant_id = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and coupon_order_status = #{couponOrderStatus} @@ -291,11 +291,11 @@ where 1=1 - and co.tenant_id = #{tenantId} - - - and co.`sub_tenant_id` = #{subTenantId} + and (co.tenant_id = #{tenantId} or co.parent_tenant_id = #{tenantId}) + and co.coupon_order_status = #{couponOrderStatus} @@ -384,8 +384,8 @@ and co.tenant_id = #{tenantId} - - and co.`sub_tenant_id` = #{subTenantId} + + and co.`parent_tenant_id` = #{parentTenantId} and co.coupon_order_status = #{couponOrderStatus} @@ -478,8 +478,8 @@ and co.tenant_id = #{tenantId} - - and co.`sub_tenant_id` = #{subTenantId} + + and co.`parent_tenant_id` = #{parentTenantId} and co.coupon_order_status = #{couponOrderStatus} @@ -565,7 +565,7 @@ @@ -584,7 +584,7 @@ - + @@ -626,7 +626,7 @@ - + @@ -661,7 +661,7 @@ - co.id,co.tenant_id,co.sub_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status, + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status, co.create_date,co.update_date,co.coupon_price, c.title,c.sale_price,c.use_price,c.price, c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, (CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, @@ -686,7 +686,7 @@ - co.id,co.tenant_id,co.sub_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, bu.name, bu.phone as bphone, cu.phone, @@ -708,7 +708,7 @@ select bu.id as bu_id,m.name as verify_merchant_name from wx_merchant_b_user bu inner join wx_merchant m on bu.merchant_id=m.id where bu.tenant_id = #{tenantId} - and bu.`sub_tenant_id` = #{subTenantId} + and bu.`parent_tenant_id` = #{parentTenantId} ) bu on bu.bu_id = co.b_user_id left join wx_merchant_subsidy ms on co.id = ms.coupon_order_id and ms.type = 1 left join wx_coupon_action_log cal on co.id = cal.coupon_order_id and co.coupon_id = cal.coupon_id @@ -729,7 +729,7 @@ FROM wx_coupon_merchant wcm WHERE STATUS = 0 AND wcm.tenant_id = #{tenantId} GROUP BY product_id) couc RIGHT JOIN ( - SELECT co.id,co.tenant_id,co.sub_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.coupon_type, + SELECT co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.coupon_type, co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price FROM wx_coupon_order co WHERE co.tenant_id = #{tenantId}) co @@ -752,8 +752,8 @@ and co.tenant_id = #{tenantId} - - and co.sub_tenant_id = #{subTenantId} + + and co.parent_tenant_id = #{parentTenantId} @@ -834,14 +834,14 @@ - co.id,co.tenant_id,co.sub_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, c.type,c.title,c.sale_price,c.use_price,c.price,c.unit, bu.name, cu.phone - co.id,co.tenant_id,co.sub_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, c.type,c.title,c.sale_price,c.use_price,c.price,c.unit, cu.phone @@ -890,7 +890,7 @@ - co.id,co.tenant_id,co.sub_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price select c.* from ( - select id,tenant_id,sub_tenant_id,0 coupon_id,0 coupon_type,expired_time,`status`as + select id,tenant_id,parent_tenant_id,0 coupon_id,0 coupon_type,expired_time,`status`as coupon_order_status,create_date,update_date,'' cover_img,title,'' sub_title,'' detail,0 unit, '' remark,amount,remain_amount as remaining_amount,0 support_transfer from wx_card_transfer_info where 1=1 and tenant_id = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and from_user = #{ownerId} @@ -1282,8 +1282,8 @@ and co.tenant_id = #{tenantId} - - and co.sub_tenant_id = #{subTenantId} + + and co.parent_tenant_id = #{parentTenantId} and co.c_user_id = #{cUserId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index 9b061902c..23467c99d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`,`present_id` + `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`,`present_id` @@ -30,8 +30,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `coupon_id` = #{couponId} @@ -92,8 +92,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `coupon_id` = #{couponId} @@ -131,7 +131,7 @@ select `coupon_id`,`coupon_short` from wx_coupon_password where `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} group by `coupon_id`,`coupon_short` @@ -150,7 +150,7 @@ where tenant_id=#{tenantId} and status=0 group by coupon_id) cp inner join wx_coupon c on cp.coupon_id = c.id where c.tenant_id=#{tenantId} - and c.`sub_tenant_id` = #{subTenantId} + and c.`parent_tenant_id` = #{parentTenantId} and c.status=0 and c.put_apply_status in(0,2) and cp.`coupon_id` = #{couponId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponPresentMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPresentMapper.xml index 7d7d45ee0..1e14e2cef 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPresentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPresentMapper.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`coupon_id`,`coupon_name`,`user_id`,`create_time`,`update_time`,`send_amount` + `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_name`,`user_id`,`create_time`,`update_time`,`send_amount` @@ -25,8 +25,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `coupon_id` = #{couponId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml index 58daac7e2..b52826c44 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`send_type`,`value`,`remark`,`create_time`,`update_time` + `id`,`tenant_id`,`parent_tenant_id`,`send_type`,`value`,`remark`,`create_time`,`update_time` @@ -28,8 +28,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 3ba201569..a2ff42ae4 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -4,7 +4,7 @@ - + @@ -25,7 +25,7 @@ - cs.id,cs.tenant_id,cs.sub_tenant_id,cs.coupon_id,cs.title,cs.send_type,cs.conditions,cs.status,cs.create_date,cs.update_date, + cs.id,cs.tenant_id,cs.parent_tenant_id,cs.coupon_id,cs.title,cs.send_type,cs.conditions,cs.status,cs.create_date,cs.update_date, cs.conditions -> '$.merchantSend' as merchantSend, cs.conditions -> '$.merchantLnventory' as merchantLnventory, cs.conditions -> '$.merchantRemain' as merchantRemain, @@ -50,8 +50,8 @@ and cs.tenant_id = #{tenantId} - - and cs.sub_tenant_id = #{subTenantId} + + and cs.parent_tenant_id = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 5558b34c0..ca69cac1a 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number`,`buser_id` + `id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number`,`buser_id` @@ -34,8 +34,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `c_user_id` = #{cUserId} @@ -107,8 +107,8 @@ and credit.tenant_id = #{tenantId} - - and credit.sub_tenant_id = #{subTenantId} + + and credit.parent_tenant_id = #{parentTenantId} and credit.operator_type = #{operatorType} @@ -150,7 +150,7 @@ basic.phone phone, basic.sex sex, credit.tenant_id tenantId, - credit.sub_tenant_id subTenantId, + credit.parent_tenant_id parentTenantId, credit.c_user_id cUserId, credit.credit_amount creditAmount, credit.credit_num creditNum, @@ -182,8 +182,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `c_user_id` = #{cUserId} @@ -221,8 +221,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `c_user_id` = #{cUserId} @@ -236,7 +236,7 @@ update wx_credit_history set c_user_id=#{newUserId} where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and c_user_id = #{cUserId} diff --git a/mallinkService/src/main/resources/mapper/WxDataRuleTargetMapper.xml b/mallinkService/src/main/resources/mapper/WxDataRuleTargetMapper.xml index 3f160dbb3..198e45288 100644 --- a/mallinkService/src/main/resources/mapper/WxDataRuleTargetMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxDataRuleTargetMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`parent`,`name`,`tag`,`create_time`,`update_time` + `id`,`tenant_id`,`parent_tenant_id`,`parent`,`name`,`tag`,`create_time`,`update_time` @@ -31,8 +31,8 @@ and `parent` = #{parent} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml index 197cd3e5f..a4b56274c 100644 --- a/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`date`,`day_of_week`,`week_of_year`,`pay_price`,`month`,`merchant_id`,`create_date`,`update_date`,`type` + `id`,`tenant_id`,`parent_tenant_id`,`date`,`day_of_week`,`week_of_year`,`pay_price`,`month`,`merchant_id`,`create_date`,`update_date`,`type` @@ -31,8 +31,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `date` = #{date} @@ -97,7 +97,7 @@ update wx_date_amount_record set pay_price=pay_price+#{payPrice} where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and merchant_id=#{merchantId} and type=#{type} and date = #{date} diff --git a/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml b/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml index 72373bcfa..d0f366db8 100644 --- a/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - `id`, `tenant_id`, `sub_tenant_id`,`device_id`, `type`, `status`, `location`, `name`, `version`, `create_date`, `update_date`, `online_status`, `first_hb_time`, `last_hb_time`, `hb_cmd`, `config` + `id`, `tenant_id`, `parent_tenant_id`,`device_id`, `type`, `status`, `location`, `name`, `version`, `create_date`, `update_date`, `online_status`, `first_hb_time`, `last_hb_time`, `hb_cmd`, `config` @@ -35,8 +35,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml index 21c27aed6..a4ef26636 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -5,7 +5,7 @@ - + @@ -22,7 +22,7 @@ where 1=1 and `parent_id` = #{parentId} and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and `id` = #{id} and `model_id` = #{modelId} and `name` like concat('%', #{name},'%') diff --git a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml index a6abeb4dd..96e446b96 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml @@ -5,7 +5,7 @@ - + @@ -20,8 +20,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `id` = #{id} and `name` like concat('%', #{name},'%') @@ -42,9 +42,9 @@ and w.tenant_id = #{tenantId} and m.tenant_id = #{tenantId} - - and w.`sub_tenant_id` = #{subTenantId} - and m.`sub_tenant_id` = #{subTenantId} + + and w.`parent_tenant_id` = #{parentTenantId} + and m.`parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml index 42f58dac7..e86882cbc 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml @@ -5,7 +5,7 @@ - + @@ -29,7 +29,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`business_id`,`business_type`,`user_id`,`remark`,`status`,`task_id`,`process_instance_id`,`create_date`,`update_date`,`tenant_id`,`user_name`,task_key,task_name,curr_status,variables, + `id`,`tenant_id`,`parent_tenant_id`,`business_id`,`business_type`,`user_id`,`remark`,`status`,`task_id`,`process_instance_id`,`create_date`,`update_date`,`tenant_id`,`user_name`,task_key,task_name,curr_status,variables, REPLACE (JSON_EXTRACT(variables,'$.contractType'),'"','') contractType, REPLACE (JSON_EXTRACT(variables,'$.endProperty'),'"','') endProperty, REPLACE (JSON_EXTRACT(variables,'$.contractNumber'),'"','') contractNumber, @@ -44,8 +44,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `business_id` = #{businessId} diff --git a/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml index 752137660..2eadf819c 100644 --- a/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`coupon_id`,`coupon_order_id`,`channel_type`,`channel_id`,`create_time` + `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_order_id`,`channel_type`,`channel_id`,`create_time` @@ -26,8 +26,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxGameMapper.xml b/mallinkService/src/main/resources/mapper/WxGameMapper.xml index 01728a57b..88203895d 100644 --- a/mallinkService/src/main/resources/mapper/WxGameMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxGameMapper.xml @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`game_id`,`status`,`coupon_ids`,`valid_start_date`,`valid_end_date`,`triggle_action`,`play_limit`,`award_limit` + `id`,`tenant_id`,`parent_tenant_id`,`game_id`,`status`,`coupon_ids`,`valid_start_date`,`valid_end_date`,`triggle_action`,`play_limit`,`award_limit` @@ -29,8 +29,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml index a3b3fea9d..589c0ecc2 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`merchant_id`,`level_id`,`create_date`,`discount` + `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`level_id`,`create_date`,`discount` @@ -26,8 +26,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -96,8 +96,8 @@ and lm.tenant_id = #{tenantId} - - and lm.`sub_tenant_id` = #{subTenantId} + + and lm.`parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml index 0e2c7dd28..54f127ec7 100644 --- a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`mall_id`,`building_name`,`floor_number`,`create_date`,`update_date` + `id`,`tenant_id`,`parent_tenant_id`,`mall_id`,`building_name`,`floor_number`,`create_date`,`update_date` @@ -28,8 +28,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml index f689814e1..c4c1f2ff2 100644 --- a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`mall_id`,`building_id`,`floor_name`,`background_img`,`create_date`,`update_date`,`total_area`,`operating_area` + `id`,`tenant_id`,`parent_tenant_id`,`mall_id`,`building_id`,`floor_name`,`background_img`,`create_date`,`update_date`,`total_area`,`operating_area` @@ -29,8 +29,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index 3e0b19582..996c46662 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -4,7 +4,7 @@ - + @@ -18,7 +18,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`phone`,`user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status` + `id`,`tenant_id`,`parent_tenant_id`,`phone`,`user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status` @@ -32,8 +32,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -92,10 +92,10 @@ - INSERT INTO wx_msg_record( id,tenant_id,sub_tenant_id,`uuid`, `msg_type`, + INSERT INTO wx_msg_record( id,tenant_id,parent_tenant_id,`uuid`, `msg_type`, `domain`, `msg`, `send_time`, `model_id`, `model_type`, `signature`, `sender`, `sender_user_id`, `sender_user_name`, `receiver`, `receiver_user_id`, `receiver_user_name`, `msg_status`, `status_message`, `msg_json`) - VALUES(#{id},#{tenantId},#{subTenantId},#{uuid},#{msgType}, + VALUES(#{id},#{tenantId},#{parentTenantId},#{uuid},#{msgType}, #{domain},#{msg},#{sendTime},#{modelId},#{modelType},#{signature},#{sender}, #{senderUserId},#{senderUserName},#{receiver},#{receiverUserId},#{receiverUserName}, #{msgStatus},#{statusMessage},#{msgJson}); diff --git a/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml index e1eda0966..d04ead813 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml @@ -4,13 +4,13 @@ - + - `id`,`tenant_id`,`sub_tenant_id`,`name`,`createtime` + `id`,`tenant_id`,`parent_tenant_id`,`name`,`createtime` @@ -25,8 +25,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml index 13fdee390..a90bf73d7 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml @@ -4,7 +4,7 @@ - + @@ -16,14 +16,14 @@ - `id`,`tenant_id`,`sub_tenant_id`,`phone`,`expiretime`,`createtime`,`type`,`msg`,`signature`,`code`,`appid` + `id`,`tenant_id`,`parent_tenant_id`,`phone`,`expiretime`,`createtime`,`type`,`msg`,`signature`,`code`,`appid` where 1 = 1 and `id` = #{id} and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and `phone` = #{phone} and `expiretime` = #{expiretime} and `createtime` = #{createtime} diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml index c26d52df1..d3851cc83 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml @@ -12,7 +12,7 @@ - + @@ -21,7 +21,7 @@ - `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id`,`sub_tenant_id`,email_bg_img,`open`,msg_type,role_type + `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id`,`parent_tenant_id`,email_bg_img,`open`,msg_type,role_type @@ -36,7 +36,7 @@ and `model_id` = #{modelId} and `type` = #{type} and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and `open` = #{open} and `msg_type` = #{msgType} and `role_type` = #{roleType} diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 4d916c7fe..1905dc1a8 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`order_id`,`coupon_id`,`remain_people`,`create_date`,`update_date`,`expired_date`,`status`,`user_id` + `id`,`tenant_id`,`parent_tenant_id`,`order_id`,`coupon_id`,`remain_people`,`create_date`,`update_date`,`expired_date`,`status`,`user_id` @@ -28,8 +28,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `order_id` = #{orderId} @@ -59,7 +59,7 @@ from wx_order o left join wx_c_user c on o.c_user_id=c.id where o.tenant_id=#{tenantId} - and o.`sub_tenant_id` = #{subTenantId} + and o.`parent_tenant_id` = #{parentTenantId} and o.id=#{orderId} @@ -68,7 +68,7 @@ select o.id orderId,o.order_status orderStatus,o.order_group_id orderGroupId,c.title,c.sub_title subTitle, c.sale_price salePrice,c.cover_img coverImg,g.remain_people remainPeople,c.id couponId,g.expired_date - expiredDate,g.status,g.user_id firstUser,u.nick_name nickName,u.avatar_url avatarUrl,o.tenant_id tenantId,o.sub_tenant_id subTenantId, + expiredDate,g.status,g.user_id firstUser,u.nick_name nickName,u.avatar_url avatarUrl,o.tenant_id tenantId,o.parent_tenant_id parentTenantId, o.coupon_channel_id couponChannelId,c.press_limit_num pressLimitNum, (select status from wx_coupon_channel where id=o.coupon_channel_id) couponStatus from wx_order o @@ -76,7 +76,7 @@ left join wx_order_group g on o.order_group_id=g.id left join wx_c_user u on o.c_user_id=u.id where o.tenant_id=#{tenantId} - and o.`sub_tenant_id` = #{subTenantId} + and o.`parent_tenant_id` = #{parentTenantId} and c.type=9 and o.c_user_id=#{cUserId} @@ -99,7 +99,7 @@ select o.*,case o.order_status when 0 then 0 when 2 then 0 else o.payment end pay from ( - select o.id,o.order_number,o.tenant_id,o.sub_tenant_id,o.product_id,o.payment,o.order_status, + select o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.product_id,o.payment,o.order_status, c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,1 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id where o.tenant_id=#{tenantId} - and o.`sub_tenant_id` = #{subTenantId} + and o.`parent_tenant_id` = #{parentTenantId} and c.type=100 union all - select o.id,o.order_number,o.tenant_id,o.sub_tenant_id,o.product_id,o.payment,o.order_status, + select o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.product_id,o.payment,o.order_status, c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,2 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id where o.tenant_id=#{tenantId} - and o.`sub_tenant_id` = #{subTenantId} + and o.`parent_tenant_id` = #{parentTenantId} and c.type!=100 and o.order_status in(0,1,2,3,4,5) and ifnull(press_current_num,0)=0 and ifnull(order_group_id,0)=0 union all - select o.id,o.order_number,o.tenant_id,o.sub_tenant_id,o.product_id,o.payment, + select o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.product_id,o.payment, case o.order_status when 6 then 0 when 7 then 0 when 8 then 2 when 9 then 2 else o.order_status end order_status, c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,3 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id where o.tenant_id=#{tenantId} - and o.`sub_tenant_id` = #{subTenantId} + and o.`parent_tenant_id` = #{parentTenantId} and c.type=8 and o.press_current_num>0 union all - select o.id,o.order_number,o.tenant_id,o.sub_tenant_id,o.product_id,o.payment, + select o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.product_id,o.payment, case o.order_status when 10 then 1 when 11 then 1 when 12 then 4 when 13 then 4 when 14 then 4 when 15 then 0 when 16 then 2 else o.order_status end order_status, @@ -683,15 +683,15 @@ left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id where o.tenant_id=#{tenantId} - and o.`sub_tenant_id` = #{subTenantId} + and o.`parent_tenant_id` = #{parentTenantId} and c.type=9 and o.order_group_id>0 ) o and o.tenant_id =#{tenantId} - - and o.`sub_tenant_id` = #{subTenantId} + + and o.`parent_tenant_id` = #{parentTenantId} and o.`title` like concat('%',#{title},'%') @@ -742,8 +742,8 @@ and o.tenant_id =#{tenantId} - - and o.`sub_tenant_id` = #{subTenantId} + + and o.`parent_tenant_id` = #{parentTenantId} and o.create_date between #{startdate} and #{enddate} @@ -761,8 +761,8 @@ and o.tenant_id =#{tenantId} - - and o.`sub_tenant_id` = #{subTenantId} + + and o.`parent_tenant_id` = #{parentTenantId} and o.create_date between #{startdate} and #{enddate} @@ -779,8 +779,8 @@ and o.tenant_id =#{tenantId} - - and o.`sub_tenant_id` = #{subTenantId} + + and o.`parent_tenant_id` = #{parentTenantId} and o.create_date between #{startdate} and #{enddate} @@ -793,7 +793,7 @@ - + @@ -829,7 +829,7 @@ - + @@ -867,13 +867,13 @@ - o.id,o.order_number,o.tenant_id,o.sub_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status, + o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status, o.create_date,o.update_date,o.press_end_date,o.press_current_num,o.press_current_value, c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.press_limit_num - o.id,o.order_number,o.tenant_id,o.sub_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status, + o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status, o.create_date,o.update_date,o.press_end_date,o.press_current_num,o.press_current_value, c.type as coupon_type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.press_limit_num, co.id as coupon_order_id,co.coupon_order_status @@ -891,8 +891,8 @@ and o.tenant_id = #{tenantId} - - and o.`sub_tenant_id` = #{subTenantId} + + and o.`parent_tenant_id` = #{parentTenantId} AND o.order_status = #{orderStatus} @@ -913,8 +913,8 @@ and o.tenant_id = #{tenantId} - - and o.`sub_tenant_id` = #{subTenantId} + + and o.`parent_tenant_id` = #{parentTenantId} and o.id = #{id} @@ -925,7 +925,7 @@ update wx_order set order_status=#{orderStatus} where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and order_group_id=#{orderGroupId} and order_status=10 diff --git a/mallinkService/src/main/resources/mapper/WxParkMapper.xml b/mallinkService/src/main/resources/mapper/WxParkMapper.xml index f113604f9..062bf6608 100644 --- a/mallinkService/src/main/resources/mapper/WxParkMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxParkMapper.xml @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`img_url`,`addr`,`number`,`entry_exit`,`stop_fee`,`create_date`,`update_date`,`park_id`,`parking_id`,`vendor_type`,`vendor_params` + `id`,`tenant_id`,`parent_tenant_id`,`img_url`,`addr`,`number`,`entry_exit`,`stop_fee`,`create_date`,`update_date`,`park_id`,`parking_id`,`vendor_type`,`vendor_params` @@ -33,8 +33,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml b/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml index 5515abcfe..b2297fc83 100644 --- a/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml @@ -4,7 +4,7 @@ - + @@ -20,7 +20,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`,`type`,`share`,`rate`,`real_rate` + `id`,`tenant_id`,`parent_tenant_id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`,`type`,`share`,`rate`,`real_rate` @@ -34,8 +34,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxPayBillMapper.xml b/mallinkService/src/main/resources/mapper/WxPayBillMapper.xml index a30aa1e28..f5521d1de 100644 --- a/mallinkService/src/main/resources/mapper/WxPayBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayBillMapper.xml @@ -4,7 +4,7 @@ - + @@ -25,7 +25,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`create_time`,`update_time`,`bill_id`,`b_user_id`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`,`prepay_id`,`transaction_id`,`pay_vendor`,`pay_bill_no`,`pay_bill_status`,`share`,`share_amount`,`fail_reason`,`open_id` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`bill_id`,`b_user_id`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`,`prepay_id`,`transaction_id`,`pay_vendor`,`pay_bill_no`,`pay_bill_status`,`share`,`share_amount`,`fail_reason`,`open_id` @@ -38,8 +38,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index 034dc0061..25246172c 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -4,7 +4,7 @@ - + @@ -32,7 +32,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`b_user_id`, + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`b_user_id`, `auth_code`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`, `prepay_id`,`transaction_id`,`pay_vendor`,`pay_order_no`, `pay_order_status`,`share`,`share_amount`,`rate_amount`,`fail_reason`, @@ -49,8 +49,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -155,7 +155,7 @@ from wx_pay_order where 1=1 and `tenant_id` = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and id not in ( select order_id from wx_profit_sharing_order where create_time>'2019-10-15' ) @@ -178,7 +178,7 @@ - + @@ -205,7 +205,7 @@ - p.`id`,p.`tenant_id`,p.`sub_tenant_id`,p.`create_time`,p.`update_time`,p.`order_id`,p.`c_user_id`,p.`b_user_id`, + p.`id`,p.`tenant_id`,p.`parent_tenant_id`,p.`create_time`,p.`update_time`,p.`order_id`,p.`c_user_id`,p.`b_user_id`, p.`auth_code`,p.`ip`,p.`pay_amount`,p.`pay_time_start`,p.`pay_time_end`, p.`prepay_id`,p.`transaction_id`,p.`pay_vendor`,p.`pay_order_no`, p.`pay_order_status`,p.`share`,p.`share_amount`,p.`rate_amount`,p.`fail_reason`, diff --git a/mallinkService/src/main/resources/mapper/WxPowerBillAutoConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxPowerBillAutoConfigMapper.xml index d4d8cb9c8..4af5be105 100644 --- a/mallinkService/src/main/resources/mapper/WxPowerBillAutoConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPowerBillAutoConfigMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`unit_price`,`build_day`,`receive_day`,`create_date`,`update_date` + `id`,`tenant_id`,`parent_tenant_id`,`unit_price`,`build_day`,`receive_day`,`create_date`,`update_date` @@ -27,8 +27,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxPrepaymentHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxPrepaymentHistoryMapper.xml index fbff4a13f..e63badce0 100644 --- a/mallinkService/src/main/resources/mapper/WxPrepaymentHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPrepaymentHistoryMapper.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - p.`id`,p.`tenant_id`,p.`sub_tenant_id`,p.`merchant_id`,p.`pay_way`,p.`pay_type`,p.`amount_detail`,p.`remain_amount`,p.`operation_type`,p.`operator`,p.`create_time`,m.`name` merchant_name + p.`id`,p.`tenant_id`,p.`parent_tenant_id`,p.`merchant_id`,p.`pay_way`,p.`pay_type`,p.`amount_detail`,p.`remain_amount`,p.`operation_type`,p.`operator`,p.`create_time`,m.`name` merchant_name @@ -26,8 +26,8 @@ and p.`tenant_id` = #{tenantId} - - and p.`sub_tenant_id` = #{subTenantId} + + and p.`parent_tenant_id` = #{parentTenantId} and p.`id` = #{id} diff --git a/mallinkService/src/main/resources/mapper/WxPrepaymentMapper.xml b/mallinkService/src/main/resources/mapper/WxPrepaymentMapper.xml index b7ec24578..c780ceb06 100644 --- a/mallinkService/src/main/resources/mapper/WxPrepaymentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPrepaymentMapper.xml @@ -4,7 +4,7 @@ - + @@ -20,7 +20,7 @@ - p.`id`,p.`tenant_id`,p.`sub_tenant_id`,p.`merchant_id`,p.`last_pay_way`,p.`last_pay_type`,p.`last_pay_amount`,p.`remain_amount`,p.`total_amount` ,p.`remarks`,p.`operation_type`,p.`operator`, + p.`id`,p.`tenant_id`,p.`parent_tenant_id`,p.`merchant_id`,p.`last_pay_way`,p.`last_pay_type`,p.`last_pay_amount`,p.`remain_amount`,p.`total_amount` ,p.`remarks`,p.`operation_type`,p.`operator`, p.`create_time`,p.`update_time`,m.`name` merchant_name @@ -29,8 +29,8 @@ and p.`tenant_id` = #{tenantId} - - and p.`sub_tenant_id` = #{subTenantId} + + and p.`parent_tenant_id` = #{parentTenantId} and p.`id` = #{id} diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index 27c812561..ba8ba037f 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`merchant_id`,`order_id`,`pay_amount`,`pay_time_end`,`pay_time_start`,`transaction_id`,`sharing_order_no`,`type`,`receivers`,`error_msg`,`sharing_status`,`update_time`,`create_time` + `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`order_id`,`pay_amount`,`pay_time_end`,`pay_time_start`,`transaction_id`,`sharing_order_no`,`type`,`receivers`,`error_msg`,`sharing_status`,`update_time`,`create_time` @@ -36,8 +36,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -121,7 +121,7 @@ - + @@ -145,8 +145,8 @@ and pso.tenant_id =#{tenantId} - - and pso.sub_tenant_id =#{subTenantId} + + and pso.parent_tenant_id =#{parentTenantId} and pso.id =#{id} @@ -177,8 +177,8 @@ and tenant_id =#{tenantId} - - and sub_tenant_id =#{subTenantId} + + and parent_tenant_id =#{parentTenantId} and create_time between #{startdate} and #{enddate} @@ -193,8 +193,8 @@ and tenant_id =#{tenantId} - - and sub_tenant_id =#{subTenantId} + + and parent_tenant_id =#{parentTenantId} and create_time between #{startdate} and #{enddate} @@ -205,7 +205,7 @@ - + @@ -221,7 +221,7 @@ @@ -318,7 +318,7 @@ update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and id in(select r.id from ( select id from wx_rent_contract where json_contains(json_extract(rent_info,'$[*].shopId'),concat('"',${shopId},'"')) and rent_shop_type=1 and status in(0,1) and status!=7)r) @@ -449,7 +449,7 @@ SELECT rc.id,rc.rental_start_date,rc.rental_end_date,rc.`shop_id`,rc.`rent_shop_type`,rc.`rent_info` FROM `wx_rent_contract` rc WHERE tenant_id = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} AND rc.`status` IN (2,3,4) AND status!=7 AND ( (rc.`rent_shop_type`=2 AND rc.`shop_id` IN @@ -464,7 +464,7 @@ SELECT count(*) FROM wx_rent_contract WHERE tenant_id = #{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} AND `status` = #{status} AND status!=7 AND ( `rent_shop_type` = 1 AND diff --git a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml index 424968973..bfc051893 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`c_user_id`,`create_date`,`score_type`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`,`reason` + `id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`create_date`,`score_type`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`,`reason` @@ -31,8 +31,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -95,8 +95,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `c_user_id` = #{cUserId} @@ -114,8 +114,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} and `c_user_id` = #{cUserId} @@ -129,7 +129,7 @@ update wx_score_history set c_user_id=#{newUserId} where tenant_id=#{tenantId} - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId} and c_user_id = #{cUserId} diff --git a/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml b/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml index cc273d5b2..eb6a2b7e4 100644 --- a/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - `id`, `tenant_id`, `sub_tenant_id`,`title`, `type`, `sub_type`, `status`, `create_date`, `update_date`, `cover_img`, `target_id`, `ext_info` + `id`, `tenant_id`, `parent_tenant_id`,`title`, `type`, `sub_type`, `status`, `create_date`, `update_date`, `cover_img`, `target_id`, `ext_info` @@ -31,8 +31,8 @@ and `tenant_id` = #{tenantId} - - and `sub_tenant_id` = #{subTenantId} + + and `parent_tenant_id` = #{parentTenantId} @@ -91,8 +91,8 @@ and sa.tenant_id = #{tenantId} - - and sa.`sub_tenant_id` = #{subTenantId} + + and sa.`parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 83a1bc50d..6beeca896 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - `id`,`tenant_id`,`sub_tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`addr`, + `id`,`tenant_id`,`parent_tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`addr`, `baidu_poi`,`longitude`,`latitude`,`create_date`,`update_date`,`img_url`,`manager`,`manager_phone`, `type`,`point_type`,`comments`,`is_del`,DATEDIFF(now(),create_date) freeDay,rent,rent_unit,business_id @@ -47,12 +47,13 @@ - and `tenant_id` = #{tenantId} - - - and `sub_tenant_id` = #{subTenantId} + and (`tenant_id` = #{tenantId} or `parent_tenant_id` = #{tenantId}) + + and `shop_number` like concat('%', #{shopNumber},'%') @@ -140,7 +141,7 @@ select id,shop_number shopNumber from wx_shop where tenant_id=#{tenantId} and shop_number = #{shopNumber} and is_del=0 - and `sub_tenant_id` = #{subTenantId} + and `parent_tenant_id` = #{parentTenantId}