| @@ -73,10 +73,6 @@ public class BaseController { | |||||
| return tenantEntity; | return tenantEntity; | ||||
| } | } | ||||
| public void setTenantInfo(TenantEntity dest, TenantEntity source) { | |||||
| dest.updateTenantInfo(source); | |||||
| } | |||||
| public String getIpAddr() { | public String getIpAddr() { | ||||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||||
| String ipaddress = IPUtil.getIpAddr(request); | String ipaddress = IPUtil.getIpAddr(request); | ||||
| @@ -105,10 +105,6 @@ public class BaseController { | |||||
| return tenantEntity; | return tenantEntity; | ||||
| } | } | ||||
| public void setTenantInfo(TenantEntity dest, TenantEntity source) { | |||||
| dest.setTenantId(source.getTenantId()); | |||||
| } | |||||
| public WxAppinfo getAppInfo(String appId) { | public WxAppinfo getAppInfo(String appId) { | ||||
| return wxAppinfoService.getByAppId(appId); | return wxAppinfoService.getByAppId(appId); | ||||
| } | } | ||||
| @@ -85,10 +85,6 @@ public class BaseController { | |||||
| return tenantEntity; | return tenantEntity; | ||||
| } | } | ||||
| public void setTenantInfo(TenantEntity dest, TenantEntity source) { | |||||
| dest.setTenantId(source.getTenantId()); | |||||
| } | |||||
| public Long getUserId() { | public Long getUserId() { | ||||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||||
| Long cUserId = (Long) request.getAttribute(Constant.LOGIN_USER_KEY); | Long cUserId = (Long) request.getAttribute(Constant.LOGIN_USER_KEY); | ||||
| @@ -3,6 +3,7 @@ package com.iformall.schedule; | |||||
| import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
| import com.iformall.domain.dto.WxCUserBasicInfoDto; | import com.iformall.domain.dto.WxCUserBasicInfoDto; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.po.msg.WxMsgRecord; | import com.iformall.domain.po.msg.WxMsgRecord; | ||||
| import com.iformall.domain.vo.WxCouponSendVo; | import com.iformall.domain.vo.WxCouponSendVo; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| @@ -2,7 +2,9 @@ package com.iformall.domain.po; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | 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.BaseEntity; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -100,4 +102,15 @@ public class WxMall extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "图片", name = "img") | @io.swagger.annotations.ApiModelProperty(value = "图片", name = "img") | ||||
| private String 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; | |||||
| } | |||||
| } | } | ||||
| @@ -73,10 +73,6 @@ public class BaseController { | |||||
| return tenantEntity; | return tenantEntity; | ||||
| } | } | ||||
| public void setTenantInfo(TenantEntity dest, TenantEntity source) { | |||||
| dest.setTenantId(source.getTenantId()); | |||||
| } | |||||
| public String getIpAddr() { | public String getIpAddr() { | ||||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||||
| String ipaddress = IPUtil.getIpAddr(request); | String ipaddress = IPUtil.getIpAddr(request); | ||||