diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007131031__GROUP__ADD_001.sql b/mallinkAdmin/src/main/resources/db/migration/V202007131031__GROUP__ADD_001.sql index 7626a22f0..99da1da0b 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007131031__GROUP__ADD_001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007131031__GROUP__ADD_001.sql @@ -7,3 +7,7 @@ ADD COLUMN `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_u ALTER TABLE `wx_mall` ADD COLUMN `live_support` SMALLINT(1) DEFAULT '0' COMMENT '是否支持直播(0-不支持,1-支持)'; +ALTER TABLE `wx_user_visit` +ADD COLUMN `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + +CREATE OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `mallink`.`view_touch_user` AS select date_format(`u`.`day_date`,'%Y-%m-%d') AS `xTime`,`u`.`tenant_id` AS `tenant_id`,`u`.`parent_tenant_id` AS `parent_tenant_id`,`u`.`visit_pv` AS `pv`,`u`.`visit_uv` AS `uv`,ifnull(`o`.`couponCount`,0) AS `couponCount`,ifnull(`o`.`userCount`,0) AS `userCount`,ifnull(`v`.`verifyCount`,0) AS `verifyCount`,ifnull(`v`.`verifyUserCount`,0) AS `verifyUserCount` from ((`mallink`.`wx_user_visit` `u` left join (select `mallink`.`wx_coupon_order`.`tenant_id` AS `tenant_id`,date_format(`mallink`.`wx_coupon_order`.`create_date`,'%Y-%m-%d') AS `xTime`,count(distinct `mallink`.`wx_coupon_order`.`c_user_id`) AS `userCount`,count(0) AS `couponCount` from `mallink`.`wx_coupon_order` group by `xTime`,`mallink`.`wx_coupon_order`.`tenant_id`) `o` on(((date_format(`u`.`day_date`,'%Y-%m-%d') = `o`.`xTime`) and (`o`.`tenant_id` = `u`.`tenant_id`)))) left join (select `mallink`.`wx_coupon_order`.`tenant_id` AS `tenant_id`,date_format(`mallink`.`wx_coupon_order`.`update_date`,'%Y-%m-%d') AS `xTime`,count(0) AS `verifyCount`,count(distinct `mallink`.`wx_coupon_order`.`c_user_id`) AS `verifyUserCount` from `mallink`.`wx_coupon_order` where (`mallink`.`wx_coupon_order`.`coupon_order_status` = 1) group by `xTime`,`mallink`.`wx_coupon_order`.`tenant_id`) `v` on(((date_format(`u`.`day_date`,'%Y-%m-%d') = `v`.`xTime`) and (`v`.`tenant_id` = `u`.`tenant_id`)))); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java index 369bd83ee..a39195b82 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import java.util.*; @TableName(value = "wx_user_visit") @Data @EqualsAndHashCode(callSuper = true) -public class WxUserVisit extends BaseTenantEntity { +public class WxUserVisit extends TenantEntity { protected Long id; diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index 0eb19710c..02b0eabf9 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -175,9 +175,12 @@ where 1 = 1 - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + and `box_id` = #{boxId} diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 4beb0e5cc..eaded14e1 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -27,9 +27,12 @@ and `id` = #{id} - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + and `box_id` = #{boxId} @@ -106,9 +109,12 @@ where 1 = 1 - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + and `box_id` = #{boxId} @@ -232,9 +238,12 @@ tenant_id FROM kw_meter_data where 1 = 1 - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + and `meter_id` = #{meterId} diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index e23c88ac3..74637f838 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -152,8 +152,11 @@ from mall_user_info where 1=1 - - and `tenant_id`=#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} and `bopen_id`=#{bopenId} @@ -174,8 +177,11 @@ update mall_user_info set `web_open_id` = null where 1=1 - - and `tenant_id`=#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} and username=#{username} @@ -189,8 +195,11 @@ update mall_user_info set `web_open_id` = null, `bopen_id` = null where 1=1 - - and `tenant_id`=#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} and username=#{username} @@ -205,8 +214,11 @@ from mall_user_info where 1=1 - - and `tenant_id`=#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} and `phone`=#{phone} diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 352aaa387..b22de08d0 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -83,9 +83,12 @@ select a.id,a.cover_img,a.title,a.activity_start_time,a.activity_end_time,aj.`status` from wx_activity_join aj left join wx_activity a on aj.activity_id=a.id where aj.user_id=#{userId} - + and aj.`tenant_id` = #{tenantId} + + and aj.`parent_tenant_id` = #{parentTenantId} + and aj.`status` in (${statusStr}) and a.`status`=2 diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml index 6c4740fcd..7e9c206bc 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml @@ -28,7 +28,12 @@ where 1=1 and `id` = #{id} - and `tenant_id` = #{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxBuserMapper.xml b/mallinkService/src/main/resources/mapper/WxBuserMapper.xml index b7d62466c..d59eef32a 100644 --- a/mallinkService/src/main/resources/mapper/WxBuserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBuserMapper.xml @@ -66,13 +66,12 @@ and `id` = #{id} - - - and `tenant_id`= #{tenantId} + + + and `tenant_id` = #{tenantId} - - - and `parent_tenant_id`= #{parentTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml index 68cfad34b..e4d28d9ef 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml @@ -4,6 +4,7 @@ + @@ -16,13 +17,18 @@ - `id`,`tenant_id`,`merchant_id`,`b_user_id`,`c_user_id`,`info`,`create_time`,`update_time`,`openid`,`app_id` + `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`b_user_id`,`c_user_id`,`info`,`create_time`,`update_time`,`openid`,`app_id` where 1 = 1 - and `id` = #{id} - and `tenant_id` = #{tenantId} + and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and `merchant_id` = #{merchantId} and `b_user_id` = #{bUserId} and `c_user_id` = #{cUserId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 5a9b9a9e0..0e7651abe 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -124,18 +124,24 @@ update wx_coupon_channel set status=#{status}, update_date=#{updateDate} where coupon_id=#{couponId} - - and tenant_id = #{tenantId} - + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + update wx_coupon_channel set end_time = #{endTime} where coupon_id=#{couponId} - - and tenant_id = #{tenantId} - + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + @@ -214,8 +220,11 @@ and cc.status=#{status} - - and cc.tenant_id = #{tenantId} + + and cc.`tenant_id` = #{tenantId} + + + and cc.`parent_tenant_id` = #{parentTenantId} order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index aa9dd403c..0cc29dc47 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -226,12 +226,18 @@ - update wx_msg_limit set limit_num = limit_num - 1 where `id` = #{id} and `tenant_id` = #{tenantId} and limit_num > 0 + update wx_msg_limit set limit_num = limit_num - 1 where `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and limit_num > 0 diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml index 174497cab..399ed931b 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml @@ -82,8 +82,11 @@ and `model_id` = #{modelId} - - and `tenant_id`=#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} limit 1 diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 4768829c8..8c72b2cc6 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -237,9 +237,12 @@ update wx_order set order_status=#{orderStatus} where product_id=#{productId} and press_end_date is not null and order_status in (6,7) - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + @@ -502,9 +505,12 @@ LEFT JOIN wx_c_user cu on cu.id = o.c_user_id LEFT JOIN wx_c_user_basic_info cubi on cubi.id = o.c_user_id where o.order_status = '0' and o.`type` = 1 - + and o.`tenant_id` = #{tenantId} + + and o.`parent_tenant_id` = #{parentTenantId} + and bu.`merchant_id` = #{merchantId} diff --git a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml index d47ced398..f2569b63f 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml @@ -20,9 +20,12 @@ and `id` = #{id} - - and `tenant_id` = #{tenantId} - + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and `order_id` = #{orderId} diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index a0879bc64..286c55975 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -173,7 +173,12 @@ from wx_pay_order where 1=1 - and `tenant_id` = #{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and order_id in ( select id from wx_order where `tenant_id` = #{tenantId} and type = 1 and order_status = 0 ); diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index ed624e9b9..33feeaaed 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -130,7 +130,13 @@ left join wx_mall_building b on s.building=b.id left join wx_brand br on rc.brand=br.id - rc.tenant_id=#{tenantId} + + + and rc.`tenant_id` = #{tenantId} + + + and rc.`parent_tenant_id` = #{parentTenantId} + and rc.`merchant_name` like concat('%',#{merchantName},'%') diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index c19970a6c..a7a651672 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -565,6 +565,12 @@ SELECT DATE_FORMAT(day_date,'%m/%d') as xTime,visit_pv as pv,visit_uv as uv from wx_user_visit - where tenant_id=#{tenantId} + where 1=1 + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and day_date >= #{startTime} @@ -133,7 +148,13 @@