admin
2019-01-14 0b9f71d36cbd76288ebb041f35cc1cddb224f692
订单实体创建
2个文件已添加
2 文件已重命名
13个文件已删除
809 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MessageHistory.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgAccountDetail.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgTypeEnum.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgMoneyHongBaoMap.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeAccount.java 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeAccountException.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeActivity.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeExtraFunction.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeExtract.java 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeGoods.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeHongBao.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeOrder.java 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeScore.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeVipUser.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MessageHistory.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgAccountDetail.java
New file
@@ -0,0 +1,70 @@
package com.yeshi.fanli.entity.bus.msg;
import com.yeshi.fanli.entity.bus.user.UserInfo;
/**
 * 账号
 *
 * @author Administrator
 *
 */
public class MsgAccountDetail {
    public enum MsgTypeAccountEnumType {
        bingding("账号绑定"), cancelBinding("取消绑定"), bingdingChange("绑定更换"), update("账号修改"), level("账号等级"), connect("账号合并");
        private final String desc;
        private MsgTypeAccountEnumType(String desc) {
            this.desc = desc;
        }
        public String getDesc() {
            return desc;
        }
    }
    private UserInfo user;
    private MsgTypeAccountEnumType type;// 类型
    private String title;// 事项
    private String content;// 状态
    private String beiZhu;// 备注
    public UserInfo getUser() {
        return user;
    }
    public void setUser(UserInfo user) {
        this.user = user;
    }
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    public MsgTypeAccountEnumType getType() {
        return type;
    }
    public void setType(MsgTypeAccountEnumType type) {
        this.type = type;
    }
    public String getBeiZhu() {
        return beiZhu;
    }
    public void setBeiZhu(String beiZhu) {
        this.beiZhu = beiZhu;
    }
}
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeInvite.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.entity.bus.msg.content;
package com.yeshi.fanli.entity.bus.msg;
import java.util.Date;
@@ -11,9 +11,9 @@
 * @author Administrator
 *
 */
public class MsgTypeInvite {
public class MsgInviteDetail {
    public enum MsgTypeInviteEnumType {
        invite("邀请消息"), welcome("新人欢迎");
        invite("邀请消息");
        private final String desc;
        private MsgTypeInviteEnumType(String desc) {
@@ -28,7 +28,6 @@
    private Long id;
    private UserInfo user;
    private MsgTypeInviteEnumType msgType;// 消息类型
    private String welcomeContent;// 欢迎用语
    private ThreeSale inviteUser;// 邀请信息
    private String desc;// 说明
    private String beiZhu;// 备注
@@ -56,17 +55,8 @@
        return msgType;
    }
    public void setMsgType(MsgTypeInviteEnumType msgType) {
        this.msgType = msgType;
    }
    public String getWelcomeContent() {
        return welcomeContent;
    }
    public void setWelcomeContent(String welcomeContent) {
        this.welcomeContent = welcomeContent;
    }
    public ThreeSale getInviteUser() {
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeMoney.java
@@ -1,9 +1,9 @@
package com.yeshi.fanli.entity.bus.msg.content;
package com.yeshi.fanli.entity.bus.msg;
import java.math.BigDecimal;
import java.util.Date;
import com.yeshi.fanli.entity.bus.GoodsSourceTypeEnum;
import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -13,9 +13,9 @@
 * @author Administrator
 *
 */
public class MsgTypeMoney {
public class MsgMoneyDetail {
    public enum MsgTypeMoneyEnumType {
        extract("提现"), shareMoney("奖金到账"), fanLiMoney("返利到账");
        share("分享奖金"), invite("邀请奖金"), fanli("返利到账"), extract("提现"), extractValid("提现账号验证");
        private final String desc;
        private MsgTypeMoneyEnumType(String desc) {
@@ -31,10 +31,10 @@
    private UserInfo user;
    private MsgTypeMoneyEnumType msgType;// 消息类型
    private Integer orderCount;// 订单数(奖金适用)
    private Integer goodsCount;
    private Integer goodsCount;// 商品数
    private String orderId;// 订单号(返利适用)
    private GoodsSourceTypeEnum sourceType;// 产生订单的商品来源类型
    private Extract extract;// 提现详情
    private AlipayAccountValidNormalHistory alipayAccountValid;// 提现账号验证详情
    private BigDecimal money;// 到账资金
    private BigDecimal balance;// 账户余额
    private String beiZhu;// 备注
@@ -88,14 +88,6 @@
    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }
    public GoodsSourceTypeEnum getSourceType() {
        return sourceType;
    }
    public void setSourceType(GoodsSourceTypeEnum sourceType) {
        this.sourceType = sourceType;
    }
    public Extract getExtract() {
@@ -154,4 +146,12 @@
        this.read = read;
    }
    public AlipayAccountValidNormalHistory getAlipayAccountValid() {
        return alipayAccountValid;
    }
    public void setAlipayAccountValid(AlipayAccountValidNormalHistory alipayAccountValid) {
        this.alipayAccountValid = alipayAccountValid;
    }
}
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
New file
@@ -0,0 +1,142 @@
package com.yeshi.fanli.entity.bus.msg;
import java.math.BigDecimal;
import java.util.Date;
import com.yeshi.fanli.entity.bus.user.UserInfo;
/***
 * 订单类型的消息
 *
 * @author Administrator
 *
 */
public class MsgOrderDetail {
    public final static int STATE_FK = 1;// 已付款
    public final static int STATE_JS = 2;// 已收货
    public final static int STATE_WQ = 3;// 已维权
    public final static int STATE_SX = 4;// 未付款/已退款
    public enum MsgTypeOrderTypeEnum {
        fanli("返利订单"), share("分享订单"), invite("邀请订单");
        private final String desc;
        private MsgTypeOrderTypeEnum(String desc) {
            this.desc = desc;
        }
        public String getDesc() {
            return desc;
        }
    }
    private Long id;
    private UserInfo user;
    private MsgTypeOrderTypeEnum type;// 消息类型
    private String orderId;// 订单号
    private Integer state;// 状态
    private Integer goodsCount;// 商品数量
    private BigDecimal payMoney;// 付款金额
    private BigDecimal hongBaoMoney;// 佣金
    private String beiZhu;
    private Boolean read;// 是否已读
    private Date createTime;
    private Date updateTime;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public UserInfo getUser() {
        return user;
    }
    public void setUser(UserInfo user) {
        this.user = user;
    }
    public MsgTypeOrderTypeEnum getType() {
        return type;
    }
    public void setType(MsgTypeOrderTypeEnum type) {
        this.type = type;
    }
    public String getOrderId() {
        return orderId;
    }
    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }
    public Integer getState() {
        return state;
    }
    public void setState(Integer state) {
        this.state = state;
    }
    public Integer getGoodsCount() {
        return goodsCount;
    }
    public void setGoodsCount(Integer goodsCount) {
        this.goodsCount = goodsCount;
    }
    public BigDecimal getPayMoney() {
        return payMoney;
    }
    public void setPayMoney(BigDecimal payMoney) {
        this.payMoney = payMoney;
    }
    public BigDecimal getHongBaoMoney() {
        return hongBaoMoney;
    }
    public void setHongBaoMoney(BigDecimal hongBaoMoney) {
        this.hongBaoMoney = hongBaoMoney;
    }
    public String getBeiZhu() {
        return beiZhu;
    }
    public void setBeiZhu(String beiZhu) {
        this.beiZhu = beiZhu;
    }
    public Boolean getRead() {
        return read;
    }
    public void setRead(Boolean read) {
        this.read = read;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
}
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgTypeEnum.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgMoneyHongBaoMap.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeAccount.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeAccountException.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeActivity.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeExtraFunction.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeExtract.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeGoods.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeHongBao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeOrder.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeScore.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeVipUser.java
File was deleted