| @@ -38,15 +38,15 @@ public class WxCUserFrom extends TenantEntity { | |||||
| } | } | ||||
| @io.swagger.annotations.ApiModelProperty(value="cUserId",name="cUserId") | @io.swagger.annotations.ApiModelProperty(value="cUserId",name="cUserId") | ||||
| protected Long cUserId; | |||||
| private Long cUserId; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @Excel(name = "用户昵称", width = 20, orderNum = "2") | @Excel(name = "用户昵称", width = 20, orderNum = "2") | ||||
| @io.swagger.annotations.ApiModelProperty(value="cUserNickName",name="cUserNickName") | |||||
| protected String cUserNickName; | |||||
| @io.swagger.annotations.ApiModelProperty(value="userNickName",name="userNickName") | |||||
| private String userNickName; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @Excel(name = "用户电话", width = 20, orderNum = "3") | @Excel(name = "用户电话", width = 20, orderNum = "3") | ||||
| @io.swagger.annotations.ApiModelProperty(value="cUserPhone",name="cUserPhone") | |||||
| protected String cUserPhone; | |||||
| @io.swagger.annotations.ApiModelProperty(value="userPhone",name="userPhone") | |||||
| private String userPhone; | |||||
| @io.swagger.annotations.ApiModelProperty(value="二维码来源,小程序",name="scene") | @io.swagger.annotations.ApiModelProperty(value="二维码来源,小程序",name="scene") | ||||
| private String scene; | private String scene; | ||||
| @@ -59,13 +59,13 @@ public class WxCUserFrom extends TenantEntity { | |||||
| private String sceneAddressDesc; | private String sceneAddressDesc; | ||||
| @io.swagger.annotations.ApiModelProperty(value="来源ID",name="fromId") | @io.swagger.annotations.ApiModelProperty(value="来源ID",name="fromId") | ||||
| protected Long fromId; | |||||
| private Long fromId; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value="来源Name",name="fromName") | @io.swagger.annotations.ApiModelProperty(value="来源Name",name="fromName") | ||||
| protected String fromName; | |||||
| private String fromName; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value="来源phone",name="fromPhone") | @io.swagger.annotations.ApiModelProperty(value="来源phone",name="fromPhone") | ||||
| protected String fromPhone; | |||||
| private String fromPhone; | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否新用户(0:否1:是)EnumYesOrNo",name="isNewUser") | @io.swagger.annotations.ApiModelProperty(value="是否新用户(0:否1:是)EnumYesOrNo",name="isNewUser") | ||||
| private Integer isNewUser; | private Integer isNewUser; | ||||
| @@ -99,10 +99,10 @@ public class WxCUserFrom extends TenantEntity { | |||||
| } | } | ||||
| @io.swagger.annotations.ApiModelProperty(value="分享者",name="shareUser") | @io.swagger.annotations.ApiModelProperty(value="分享者",name="shareUser") | ||||
| protected Long shareUser; | |||||
| private Long shareUser; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value="分享者",name="shareUserName") | @io.swagger.annotations.ApiModelProperty(value="分享者",name="shareUserName") | ||||
| protected String shareUserName; | |||||
| private String shareUserName; | |||||
| @Excel(name = "进入时间", width = 20, format="yyyy-MM-dd HH:mm:ss", orderNum = "6") | @Excel(name = "进入时间", width = 20, format="yyyy-MM-dd HH:mm:ss", orderNum = "6") | ||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| @@ -110,10 +110,10 @@ public class WxCUserFrom extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| protected Date startDate; | |||||
| private Date startDate; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| protected Date endDate; | |||||
| private Date endDate; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer begin; | private Integer begin; | ||||
| @@ -33,15 +33,15 @@ public class WxCUserFromVo extends TenantEntity { | |||||
| } | } | ||||
| @io.swagger.annotations.ApiModelProperty(value="来源ID",name="fromId") | @io.swagger.annotations.ApiModelProperty(value="来源ID",name="fromId") | ||||
| protected Long fromId; | |||||
| private Long fromId; | |||||
| @Excel(name = "用户昵称/店铺名称", width = 20, orderNum = "2") | @Excel(name = "用户昵称/店铺名称", width = 20, orderNum = "2") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value="来源Name",name="fromName") | @io.swagger.annotations.ApiModelProperty(value="来源Name",name="fromName") | ||||
| protected String fromName; | |||||
| private String fromName; | |||||
| @Excel(name = "(用户/店铺)联系方式", width = 20, orderNum = "3") | @Excel(name = "(用户/店铺)联系方式", width = 20, orderNum = "3") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value="来源phone",name="fromPhone") | @io.swagger.annotations.ApiModelProperty(value="来源phone",name="fromPhone") | ||||
| protected String fromPhone; | |||||
| private String fromPhone; | |||||
| @Excel(name = "推广人次", width = 20, orderNum = "4") | @Excel(name = "推广人次", width = 20, orderNum = "4") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value="推广人次",name="visits") | @io.swagger.annotations.ApiModelProperty(value="推广人次",name="visits") | ||||
| @@ -67,10 +67,10 @@ public class WxCUserFromVo extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| protected Date startDate; | |||||
| private Date startDate; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| protected Date endDate; | |||||
| private Date endDate; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer begin; | private Integer begin; | ||||
| @@ -7,8 +7,8 @@ | |||||
| <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId"/> | <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId"/> | ||||
| <result column="c_user_id" jdbcType="BIGINT" property="cUserId" /> | <result column="c_user_id" jdbcType="BIGINT" property="cUserId" /> | ||||
| <result column="c_user_nick_name" jdbcType="VARCHAR" property="cUserNickName" /> | |||||
| <result column="c_user_phone" jdbcType="VARCHAR" property="cUserPhone" /> | |||||
| <result column="user_nick_name" jdbcType="VARCHAR" property="userNickName" /> | |||||
| <result column="user_phone" jdbcType="VARCHAR" property="userPhone" /> | |||||
| <result column="scene" jdbcType="VARCHAR" property="scene"/> | <result column="scene" jdbcType="VARCHAR" property="scene"/> | ||||
| <result column="scene_address" jdbcType="VARCHAR" property="sceneAddress"/> | <result column="scene_address" jdbcType="VARCHAR" property="sceneAddress"/> | ||||
| @@ -88,8 +88,8 @@ | |||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCUserFrom" resultMap="BaseResultMap"> | <select id="findList" parameterType="com.iformall.domain.po.WxCUserFrom" resultMap="BaseResultMap"> | ||||
| select <include refid="allColumns" /> | select <include refid="allColumns" /> | ||||
| ,wcu.nick_name c_user_nick_name | |||||
| ,wcu.phone c_user_phone | |||||
| ,wcu.nick_name user_nick_name | |||||
| ,wcu.phone user_phone | |||||
| ,wuc.description scene_address_desc | ,wuc.description scene_address_desc | ||||
| from wx_c_user_from wcuf | from wx_c_user_from wcuf | ||||
| left join wx_c_user wcu on wcu.id = wcuf.c_user_id | left join wx_c_user wcu on wcu.id = wcuf.c_user_id | ||||
| @@ -107,7 +107,7 @@ | |||||
| </if> | </if> | ||||
| <!-- select <include refid="allColumns" />--> | <!-- select <include refid="allColumns" />--> | ||||
| <!-- ,(select nick_name from wx_c_user where id = wcuf.c_user_id ) c_user_nick_name--> | |||||
| <!-- ,(select nick_name from wx_c_user where id = wcuf.c_user_id ) user_nick_name--> | |||||
| <!-- ,(select description from wx_user_channel where scene_address = wcuf.scene_address ) scene_address_desc--> | <!-- ,(select description from wx_user_channel where scene_address = wcuf.scene_address ) scene_address_desc--> | ||||
| <!-- ,case when wcuf.from_type = 1 then (select nick_name from wx_c_user where id = wcuf.from_id)--> | <!-- ,case when wcuf.from_type = 1 then (select nick_name from wx_c_user where id = wcuf.from_id)--> | ||||
| <!-- when wcuf.from_type = 2 then (select nick_name from wx_c_user_basic_info where id = wcuf.from_id)--> | <!-- when wcuf.from_type = 2 then (select nick_name from wx_c_user_basic_info where id = wcuf.from_id)--> | ||||