Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop

Browse Source
This commit is contained in:
huangdeliang
2021-02-09 14:17:37 +08:00
parent 1775b657a7 ab630fd612
commit 5f4b1ec33f
36 changed files with 3042 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthy.java
View File

@@ -4,6 +4,7 @@ import lombok.Data;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.List;
/**
@@ -57,7 +58,7 @@ public class SysCustomerHealthy extends BaseEntity
/** 体重 */
@Excel(name = "体重")
private Long weight;
private BigDecimal weight;
/** 调味品种类，使用 , 隔开 */
@Excel(name = "调味品种类，使用 , 隔开")
@@ -429,6 +430,9 @@ public class SysCustomerHealthy extends BaseEntity
@Excel(name = "气血数据")
private String bloodData;
//备注
private String remark;
/** 湿气数据 */
@Excel(name = "湿气数据")
private String moistureDate;

66
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxDistribution.java Normal file
View File

@@ -0,0 +1,66 @@
package com.stdiet.custom.domain;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 微信分配管理对象 sys_wx_distribution
*
* @author xiezhijun
* @date 2021-02-03
*/
@Data
public class SysWxDistribution extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* $column.columnComment
*/
private Long id;
/**
* 后台用户id
*/
private Long userId;
@Excel(name = "销售")
private String userName;
/**
* 字典表中销售小组对应键值
*/
private Integer saleGroupId;
@Excel(name = "销售组别")
private String saleGroup;
/**
* 字典表中账号对应键值
*/
private Integer accountId;
@Excel(name = "收款账号")
private String account;
/**
* 微信账号id
*/
private Long wechatAccount;
@Excel(name = "微信昵称")
private String wxNickName;
@Excel(name = "微信号")
private String wxAccount;
/**
* 微信账号类型，0接粉号 1新号，默认0
*/
private Integer wechatAccountType;
/**
* 删除标识 0未删除 1已删除，默认0
*/
private Integer delFlag;
}

64
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java Normal file
View File

@@ -0,0 +1,64 @@
package com.stdiet.custom.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 进粉统计对象 sys_wx_fan_statistics
*
* @author xiezhijun
* @date 2021-02-03
*/
@Data
public class SysWxFanStatistics extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long id;
@Excel(name = "销售")
private String userName;
//销售ID
private Long userId;
@Excel(name = "进粉账号")
private String account;
//销售组别
private String saleGroup;
/** 微信号ID */
private Long wxId;
@Excel(name = "微信昵称")
private String wxNickName;
@Excel(name = "微信号")
private String wxAccount;
/** 进粉时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "进粉时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date fanTime;
/** 进粉个数 */
@Excel(name = "进粉个数")
private Integer fanNum;
/** 删除标识 0未删除 1已删除，默认0 */
private Integer delFlag;
//进粉总数量
private Integer totalFanNum;
//销售组别ID
private Integer saleGroupId;
//排序参数，null或者0：按照id倒序 1：按照组别ID、id顺序正序
private Integer sortFlag;
}

118
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxSaleAccount.java
View File

@@ -1,18 +1,16 @@
package com.stdiet.custom.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
/**
* 微信销售账号对象 sys_wx_sale_account
*
* @author wonder
* @date 2021-01-29
* 微信账号对象 sys_wx_sale_account
*
* @author xiezhijun
* @date 2021-02-03
*/
@Data
public class SysWxSaleAccount extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -20,28 +18,106 @@ public class SysWxSaleAccount extends BaseEntity
/** $column.columnComment */
private Long id;
/** 账号名称 */
@Excel(name = "账号名称")
private String nickName;
/** 账号id */
@Excel(name = "账号id")
private Long accountId;
/** 微信昵称 */
@Excel(name = "微信昵称")
private String wxNickName;
/** 微信号 */
@Excel(name = "微信号")
private String wxId;
private String wxAccount;
/** 手机号 */
@Excel(name = "手机号")
private String phone;
/** 微信手机号 */
@Excel(name = "微信手机号")
private String wxPhone;
private String imgUrl;
/** 二维码图片 */
private String wxCodeUrl;
private String mediaId;
/** 微信类型 */
private Integer wxType;
private String remark;
/** 删除标识 0未删除 1已删除，默认0 */
private Integer delFlag;
private Integer count;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setWxNickName(String wxNickName)
{
this.wxNickName = wxNickName;
}
public String getWxNickName()
{
return wxNickName;
}
public void setWxAccount(String wxAccount)
{
this.wxAccount = wxAccount;
}
public String getWxAccount()
{
return wxAccount;
}
public void setWxPhone(String wxPhone)
{
this.wxPhone = wxPhone;
}
public String getWxPhone()
{
return wxPhone;
}
public void setWxCodeUrl(String wxCodeUrl)
{
this.wxCodeUrl = wxCodeUrl;
}
public String getWxCodeUrl()
{
return wxCodeUrl;
}
public void setWxType(Integer wxType)
{
this.wxType = wxType;
}
public Integer getWxType()
{
return wxType;
}
public void setDelFlag(Integer delFlag)
{
this.delFlag = delFlag;
}
public Integer getDelFlag()
{
return delFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("wxNickName", getWxNickName())
.append("wxAccount", getWxAccount())
.append("wxPhone", getWxPhone())
.append("wxCodeUrl", getWxCodeUrl())
.append("remark", getRemark())
.append("wxType", getWxType())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.append("delFlag", getDelFlag())
.toString();
}
}