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 6387b36bf..032d699dd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -73,10 +73,6 @@ public class BaseController { return tenantEntity; } - public void setTenantInfo(TenantEntity dest, TenantEntity source) { - dest.updateTenantInfo(source); - } - public String getIpAddr() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String ipaddress = IPUtil.getIpAddr(request); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index c4927eb1c..97f813619 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -105,10 +105,6 @@ public class BaseController { return tenantEntity; } - public void setTenantInfo(TenantEntity dest, TenantEntity source) { - dest.setTenantId(source.getTenantId()); - } - public WxAppinfo getAppInfo(String appId) { return wxAppinfoService.getByAppId(appId); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 2a1153cf7..ed22d3529 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -85,10 +85,6 @@ public class BaseController { return tenantEntity; } - public void setTenantInfo(TenantEntity dest, TenantEntity source) { - dest.setTenantId(source.getTenantId()); - } - public Long getUserId() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); Long cUserId = (Long) request.getAttribute(Constant.LOGIN_USER_KEY); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index 10c763881..8ac1044be 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -3,6 +3,7 @@ package com.iformall.schedule; import com.alibaba.fastjson.JSONObject; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.domain.vo.WxCouponSendVo; import com.iformall.enums.*; 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 503aa4060..e460b45bd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -2,7 +2,9 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -100,4 +102,15 @@ public class WxMall extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "图片", name = "img") private String img; + @TableField(exist = false) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @io.swagger.annotations.ApiModelProperty(value = "租户信息", name = "tenantInfo") + private String tenantInfo; + + public TenantEntity getTenantInfo() { + TenantEntity mul = new TenantEntity(); + mul.setTenantId(getTenantId()); + return mul; + } + } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 573a11c54..8e1168e78 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -73,10 +73,6 @@ public class BaseController { return tenantEntity; } - public void setTenantInfo(TenantEntity dest, TenantEntity source) { - dest.setTenantId(source.getTenantId()); - } - public String getIpAddr() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String ipaddress = IPUtil.getIpAddr(request);