admin
2019-01-15 dd209750c5fecd9b05e827bc3e634b06816f1249
浏览足迹添加时间
1个文件已修改
5个文件已添加
120 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -1,10 +1,12 @@
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.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -14,6 +16,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.BigDecimalUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.NumberUtil;
@@ -21,6 +24,10 @@
import com.google.gson.Gson;
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.dao.mybatis.HongBaoManageMapper;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.Special;
@@ -1297,14 +1304,30 @@
        JSONObject data = new JSONObject();
        data.put("count", count);
        JSONArray array = new JSONArray();
        Gson gson = JsonUtil.getApiCommonGson();
        GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
        gsonBuilder.excludeFieldsWithoutExposeAnnotation();
        gsonBuilder.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(value.getTime() + "");
                }
            }
        });
        Gson gson = gsonBuilder.create();
        if (list != null) {
            Map<String, String> map = hongBaoManageService.convertMap();
            BigDecimal proportion = manageService.getFanLiRate();
            for (ScanHistoryV2 sh : list) {
                TaoBaoGoodsBrief goods = TaoBaoUtil.convert(sh.getCommonGoods());
                goods.setId(sh.getId());
                array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));
                TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");
                extra.setCreatetime(sh.getCreateTime());
                array.add(gson.toJson(extra));
            }
        }
        data.put("data", array);
@@ -2002,7 +2025,7 @@
        data.put("goods", goods);
        data.put("shareUsers", listShareUser);
        data.put("couponUsers", listCouponUser);
        data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id="+id);
        data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
        out.print(JsonUtil.loadTrueResult(data));
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java
New file
@@ -0,0 +1,43 @@
package com.yeshi.fanli.util.factory.msg;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
public class MsgAccountDetailFactory {
    /**
     * 账号绑定成功
     *
     * @param uid
     * @param type
     * @return
     */
    public static MsgAccountDetail createBindingAccount(Long uid, int type) {
        return null;
    }
    /**
     * 账号解绑成功
     *
     * @param uid
     * @param type
     * @return
     */
    public static MsgAccountDetail createUnBindingAccount(Long uid, int type) {
        return null;
    }
    /**
     * 账号更换成功
     *
     * @param uid
     * @param type
     * @return
     */
    public static MsgAccountDetail createChangeBindingAccount(Long uid, int type) {
        return null;
    }
}
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java
New file
@@ -0,0 +1,5 @@
package com.yeshi.fanli.util.factory.msg;
public class MsgInviteDetailFactory {
}
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
New file
@@ -0,0 +1,5 @@
package com.yeshi.fanli.util.factory.msg;
public class MsgMoneyDetailFactory {
}
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java
New file
@@ -0,0 +1,5 @@
package com.yeshi.fanli.util.factory.msg;
public class MsgOrderDetailFactory {
}
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
New file
@@ -0,0 +1,31 @@
package com.yeshi.fanli.util.factory.msg;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
import com.yeshi.fanli.vo.msg.UserMsgVO;
public class UserMsgVOFactory {
    public static UserMsgVO create(MsgOrderDetail msg) {
        return null;
    }
    public static UserMsgVO create(MsgMoneyDetail msg) {
        return null;
    }
    public static UserMsgVO create(MsgAccountDetail msg) {
        return null;
    }
    public static UserMsgVO create(MsgInviteDetail msg) {
        return null;
    }
}