From cc808a4655c70b6750c2d80e4eba24437c602ae4 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 22 Oct 2020 16:18:34 +0800 Subject: [PATCH] fix bug --- .../iformall/controller/WxCouponSendController.java | 1 + .../iformall/controller/WxMerchantBUserController.java | 1 + .../java/com/iformall/domain/po/base/TenantEntity.java | 10 ++++++++++ .../plugin/shard/plugin/ShardingSpherePlugin.java | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index b9a099f46..95d4466a3 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -142,6 +142,7 @@ public class WxCouponSendController extends BaseController { if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { params.put("parentTenantId", tenantEntity.getParentTenantId()); } + params.put("finalTenantId", tenantEntity.getFinalTenantId()); params.put("channelType", channelType); params.put("merchantId", getLoginBUser().getMerchantId()); PageInfo data = wxCouponActionLogService.getActionLog(params, pageNum, pageSize); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index da38ac688..761803411 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -58,6 +58,7 @@ public class WxMerchantBUserController extends BaseController { @Autowired private WxScoreRulesService wxScoreRulesService; + @RedisCache @ApiOperation("查寻当bUser详情接口") 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 04fa8c3bc..b83b204af 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 @@ -20,12 +20,17 @@ public class TenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") protected String parentTenantId; + + @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") + @TableField(exist = false) + protected String finalTenantId; public void updateTenantInfo(TenantEntity info) { setTenantId(info.getTenantId()); if (StringUtils.isNotBlank(info.getParentTenantId())) { setParentTenantId(info.getParentTenantId()); } + setFinalTenantId(getFinalTenantId()); } public void updateTenantInfo(BaseTenantEntity info) { @@ -33,6 +38,7 @@ public class TenantEntity extends BaseEntity { if (StringUtils.isNotBlank(info.getParentTenantId())) { setParentTenantId(info.getParentTenantId()); } + setFinalTenantId(getFinalTenantId()); } public String getFinalTenantId() { @@ -58,4 +64,8 @@ public class TenantEntity extends BaseEntity { public void setParentTenantId(String parentTenantId) { this.parentTenantId = parentTenantId; } + + public void setFinalTenantId(String finalTenantId) { + this.finalTenantId = finalTenantId; + } } diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java index 8a46904c2..1becdc1f2 100644 --- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java +++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java @@ -239,7 +239,7 @@ public class ShardingSpherePlugin implements MyBatisPlus { return o; }catch(Exception e) { e.printStackTrace(); - return null; + throw new RuntimeException(e); } }