新版消息实体与用户资金修改

admin

2019-01-14 3d8592ea3220dca3bd33fb77b16c99069c68e461

新版消息实体与用户资金修改

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java

@@ -259,8 +259,11 @@
        vo.setTotalShareMoney(

                userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());



        maxDate = new Date(timeStamp);

        minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(timeStamp, "yyyy-MM"), "yyyy-MM"));

        Calendar ca = Calendar.getInstance();

        ca.setTime(new Date(timeStamp));

        ca.add(Calendar.MONTH, 1);

        maxDate = new Date(ca.getTimeInMillis());



        // 本月未到账

        vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate));


 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java

New file
@@ -0,0 +1,99 @@
package com.yeshi.fanli.controller.client;



import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.JsonUtil;



import com.google.gson.GsonBuilder;

import com.google.gson.JsonElement;

import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.msg.CommonMsgItemVO;

import com.yeshi.fanli.vo.msg.UserMsgVO;



import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/v1/user/msg")

public class UserMsgController {

    /**

     * 获取订单消息列表

     * 
     * @param acceptData

     * @param uid

     * @param page

     * @param out

     */

    @RequestMapping(value = "getOrderMsgList", method = RequestMethod.POST)

    public void getOrderMsgList(AcceptData acceptData, Long uid, int page, PrintWriter out) {



        if (uid == null) {

            out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

            return;

        }



        List<UserMsgVO> list = new ArrayList<>();



        List<CommonMsgItemVO> items = new ArrayList<>();



        List<ClientTextStyleVO> contentList = new ArrayList<>();

        contentList.add(new ClientTextStyleVO("206089388856584237", "#000000"));

        items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单号", "#888888"), contentList));



        contentList.clear();

        contentList.add(new ClientTextStyleVO("共", "#000000"));

        contentList.add(new ClientTextStyleVO("1", "#E5005C"));

        contentList.add(new ClientTextStyleVO("件商品", "#000000"));

        items.add(new CommonMsgItemVO(new ClientTextStyleVO("商品数量", "#888888"), contentList));



        contentList.clear();

        contentList.add(new ClientTextStyleVO("邀请订单", "#000000"));

        items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单类型", "#888888"), contentList));



        contentList.clear();

        contentList.add(new ClientTextStyleVO("已付款", "#E5005C"));

        items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单状态", "#888888"), contentList));



        contentList.clear();

        contentList.add(new ClientTextStyleVO("￥58", "#E5005C"));

        items.add(new CommonMsgItemVO(new ClientTextStyleVO("付款金额", "#888888"), contentList));



        contentList.clear();

        contentList.add(new ClientTextStyleVO("￥0.36", "#E5005C"));

        items.add(new CommonMsgItemVO(new ClientTextStyleVO("邀请奖金", "#888888"), contentList));



        contentList.clear();

        contentList.add(new ClientTextStyleVO("无", "#000000"));

        items.add(new CommonMsgItemVO(new ClientTextStyleVO("备注", "#888888"), contentList));



        list.add(new UserMsgVO("http://ec-1255749512.file.myqcloud.com/resource/portrait.png", "订单消息", new Date(),

                items));

        GsonBuilder builder = new GsonBuilder();

        builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<Date>() {

            @Override

            public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {

                if (value == null) {

                    return new JsonPrimitive("");

                } else {

                    return new JsonPrimitive("今天 10:25");

                }

            }

        });

        JSONObject root = new JSONObject();

        root.put("data", builder.create().toJson(list));

        root.put("count", 1);

        out.print(JsonUtil.loadTrueResult(root));

    }



}


 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserMessage.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserMsgUnReadNum.java

New file
@@ -0,0 +1,93 @@
package com.yeshi.fanli.entity.bus.msg;



import java.util.Date;



import com.yeshi.fanli.entity.bus.user.UserInfo;



/*

 * 用户消息已读状态存储

 */

public class UserMsgUnReadNum {

    private Long id;

    private Integer typeOrder;// 订单消息未读数

    private Integer typeMoney;// 资金消息未读数

    private Integer typeAccount;// 账户消息未读数

    private Integer typeInvite;// 邀请消息未读数

    private Integer typeScore;// 积分消息未读数

    private UserInfo user;

    private Date createTime;

    private Date updateTime;



    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public Integer getTypeOrder() {

        return typeOrder;

    }



    public void setTypeOrder(Integer typeOrder) {

        this.typeOrder = typeOrder;

    }



    public Integer getTypeMoney() {

        return typeMoney;

    }



    public void setTypeMoney(Integer typeMoney) {

        this.typeMoney = typeMoney;

    }



    public Integer getTypeAccount() {

        return typeAccount;

    }



    public void setTypeAccount(Integer typeAccount) {

        this.typeAccount = typeAccount;

    }



    public Integer getTypeInvite() {

        return typeInvite;

    }



    public void setTypeInvite(Integer typeInvite) {

        this.typeInvite = typeInvite;

    }



    public Integer getTypeScore() {

        return typeScore;

    }



    public void setTypeScore(Integer typeScore) {

        this.typeScore = typeScore;

    }



    public UserInfo getUser() {

        return user;

    }



    public void setUser(UserInfo user) {

        this.user = user;

    }



    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/UserSystemMsg.java

New file
@@ -0,0 +1,114 @@
package com.yeshi.fanli.entity.bus.msg;



import java.util.Date;



import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.system.SystemZnx;



/**

 * 用户系统消息

 * 
 * @author Administrator

 *

 */

public class UserSystemMsg {

    private Long id;

    private UserInfo user;

    private UserSystemMsgTypeEnum type;// 消息类型

    private SystemZnx systemZNX;// 系统统一广播的站内信，当有系统站内信时，标题内容等为空

    private Boolean read;// 是否已读

    private Boolean solved;// 是否已经解决

    private String title;// 标题

    private String content;// 内容

    private Integer timeTag;// 时间标识：1-紧急 0-普通

    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 UserSystemMsgTypeEnum getType() {

        return type;

    }



    public void setType(UserSystemMsgTypeEnum type) {

        this.type = type;

    }



    public SystemZnx getSystemZNX() {

        return systemZNX;

    }



    public void setSystemZNX(SystemZnx systemZNX) {

        this.systemZNX = systemZNX;

    }



    public Boolean getRead() {

        return read;

    }



    public void setRead(Boolean read) {

        this.read = read;

    }



    public Boolean getSolved() {

        return solved;

    }



    public void setSolved(Boolean solved) {

        this.solved = solved;

    }



    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 Integer getTimeTag() {

        return timeTag;

    }



    public void setTimeTag(Integer timeTag) {

        this.timeTag = timeTag;

    }



    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/UserSystemMsgTypeEnum.java

New file
@@ -0,0 +1,22 @@
package com.yeshi.fanli.entity.bus.msg;



/**

 * 用户系统消息的类型

 * 
 * @author Administrator

 *

 */

public enum UserSystemMsgTypeEnum {

    // 普通消息-只是通知用户，不需要用户反馈

    // 问题消息-用户的账户有问题出现，需要用户协助解决的

    common("普通消息"), question("问题消息");

    private final String desc;



    private UserSystemMsgTypeEnum(String desc) {

        this.desc = desc;

    }



    public String getDesc() {

        return desc;

    }

}