订单找回时间修改

Administrator

2018-11-16 1e4b73e01937606a18cbd7e2f8d28afe56e3fd72

订单找回时间修改

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

@@ -7,11 +7,19 @@
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 org.yeshi.utils.encrypt.DESUtil;



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

import com.yeshi.fanli.entity.config.AppHomeFloatImg;

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TBPid;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.service.inter.config.ConfigService;

import org.yeshi.utils.JsonUtil;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONObject;



@@ -28,6 +36,12 @@
    @Resource

    private ConfigService configService;



    @Resource

    private TBPidService tbPidService;



    @Resource

    private TaoBaoUnionConfigService taoBaoUnionConfigService;



    /**

     * 首页配置信息

     * 

@@ -43,4 +57,48 @@
        out.print(JsonUtil.loadTrueResult(data));

    }



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

    public void getTaoBaoCartConfig(AcceptData acceptData, Long uid, PrintWriter out) {

        if (uid == null || uid <= 0) {

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

            return;

        }



        ClientTBPid clientTBPid = null;

        if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {

            TBPid tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_IOS);

            if (tbPid == null)

                clientTBPid = tbPidService.getIOSDefault();

            else {

                String siteId = tbPid.getPid().split("_")[2];

                String adzoneId = tbPid.getPid().split("_")[3];

                TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            }

        } else {

            TBPid tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_ANDROID);

            if (tbPid == null)

                clientTBPid = tbPidService.getAndroidDefault();

            else {

                String siteId = tbPid.getPid().split("_")[2];

                String adzoneId = tbPid.getPid().split("_")[3];

                TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            }

        }



        String cartJS = configService.get("taobao_cart_js");

        String js = null;

        try {

             js = DESUtil.encode(cartJS, StringUtil.getBase64String("YeShiFANLI889*+"),

                    StringUtil.getBase64String("*M#34f?,"));

        } catch (Exception e) {

            e.printStackTrace();

        }

        JSONObject data = new JSONObject();

        data.put("js", js);

        data.put("tbPidInfo", clientTBPid);

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

    }



}


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

@@ -14,6 +14,7 @@
import com.google.gson.Gson;

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

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

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TimeUtil;

@@ -34,6 +35,9 @@


    @Resource

    private LostOrderService lostOrderService;



    @Resource

    private ConfigService configService;



    /**

     * 获取动态推荐

@@ -69,13 +73,14 @@
                json.remove("remake");

                json.remove("judge");



                json.put("createTime", TimeUtil.getGernalTime(order.getCreateTime(), "yyyy-MM-dd HH:mm"));

                if (order.getState() == 1 && order.getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {

                json.put("createTime", TimeUtil.getGernalTime(order.getCreateTime(), "yyyy.MM.dd HH:mm"));

                if (order.getState() == 1 && order.getResultCode() != null

                        && order.getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {

                    // 申诉成功

                    json.put("state", 1);

                    json.put("stateDesc", "申诉成功，请在订单列表中查看");

                } else if (order.getState() == 2

                        || (order.getState() == 1 && order.getResultCode() == LostOrder.RESULT_CODE_FAIL)) {

                } else if (order.getState() == 2 || (order.getState() == 1 && order.getResultCode() != null

                        && order.getResultCode() == LostOrder.RESULT_CODE_FAIL)) {

                    // 申诉失败

                    json.put("state", 2);

                    json.put("stateDesc", "申诉失败");

@@ -100,7 +105,7 @@
            return;

        }

        LostOrder lostOrder = lostOrderService.getOne(id);

        if (lostOrder != null && lostOrder.getUserInfo().getId() == uid) {

        if (lostOrder != null && lostOrder.getUserInfo().getId() == uid.longValue()) {

            lostOrderService.deleteLostOrder(id);

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

        } else {

@@ -131,7 +136,7 @@


        if (lostOrder.getUserInfo() == null || lostOrder.getUserInfo().getId() == null

                || lostOrder.getUserInfo().getId() <= 0) {

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

            out.print(JsonUtil.loadFalseResult(1, "请登录返利券账号"));

            return;

        }



@@ -139,17 +144,18 @@
        String stateInfo = "提交成功，请等待审核结果。";

        if (!orderNum) {

            state = -4;

            stateInfo = "请提交标准的订单号";

            stateInfo = "请提交准确的订单号";

        } else {

            lostOrder.setResultCode(LostOrder.RESULT_CODE_VERFING);

            state = lostOrderService.addLostOrder(lostOrder);

            if (state == -3) {

                stateInfo = "该订单已是返利订单。";

                stateInfo = "该订单已被统计，无需申诉。";

            } else if (state == -2) {

                stateInfo = "请勿重复提交,该订单已在审核中。";

                stateInfo = "请勿重复提交,该订单正在审核中。";

            } else if (state == -1) {

                stateInfo = "该订单申诉已通过，请稍后查看。";

                stateInfo = "该订单申诉已通过，请在订单列表中查看。";

            } else if (state == -5) {

                stateInfo = "该订单为分享奖金订单";

                stateInfo = "分享奖金订单无需申诉";

            }

        }

        JSONObject data = new JSONObject();

@@ -158,4 +164,12 @@
        out.print(JsonUtil.loadTrueResult(data));

    }



    @RequestMapping("getConfig")

    public void getConfig(AcceptData acceptData, PrintWriter out) {

        JSONObject data = new JSONObject();

        data.put("what", configService.get("lost_order_help_what"));

        data.put("reason", configService.get("lost_order_help_reason"));

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

    }



}


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

@@ -2,9 +2,11 @@


import java.io.PrintWriter;

import java.lang.reflect.InvocationTargetException;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Date;

import java.util.List;

import java.util.Map;

import java.util.UUID;

@@ -16,9 +18,19 @@
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.HttpUtil;

import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.tencentcloud.COSManager;



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.entity.accept.AcceptData;

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

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

@@ -76,11 +88,6 @@
import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.wx.WXLoginUtil;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.tencentcloud.COSManager;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -1474,12 +1481,23 @@
            goodsBrief.setSalesCount(TaoBaoUtil.getSaleCount(goodsBrief.getBiz30day()));

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,

                    fcRate, "");

            taoBaoGoodsBriefExtra.setCreatetime(new Date(cg.getCreateTime()));



            list.add(taoBaoGoodsBriefExtra);

        });

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().create();

        GsonBuilder builder = new GsonBuilder().registerTypeAdapter(Date.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 = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(builder).excludeFieldsWithoutExposeAnnotation()

                .create();

        data.put("list", gson.toJson(list));

        data.put("count", count);

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