From dd209750c5fecd9b05e827bc3e634b06816f1249 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 一月 2019 09:07:31 +0800
Subject: [PATCH] 浏览足迹添加时间
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoOrderAdminController.java | 60 +-----------------------------------------------------------
1 files changed, 1 insertions(+), 59 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoOrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoOrderAdminController.java
index e83b4ad..6644b6b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoOrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoOrderAdminController.java
@@ -1,14 +1,7 @@
package com.yeshi.fanli.controller.admin;
import java.io.PrintWriter;
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
import java.util.Map;
-import java.util.UUID;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -16,27 +9,14 @@
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
-import org.springframework.util.Base64Utils;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.entity.admin.ReslutOrder;
-import com.yeshi.fanli.entity.bus.user.HongBao;
-import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.service.inter.count.TaoBaoOrderCountService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.tag.PageEntity;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import com.yeshi.fanli.vo.order.TaoBaoOrderVO;
-
-import org.yeshi.utils.JsonUtil;
@Controller
@RequestMapping("admin/new/api/v1/taoBaoOrder")
@@ -56,43 +36,6 @@
@Resource
private UserInfoService userInfoService;
- @RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, Integer keyType,
- String key, String startTime, String endTime, Integer state, PrintWriter out) {
- try {
-
- if (pageSize == null || pageSize < 1)
- pageSize = Constant.PAGE_SIZE;
-
- if (pageIndex == null || pageIndex < 1)
- pageIndex = 1;
-
- List<TaoBaoOrderVO> listQuery = taoBaoOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key, startTime, endTime, state);
- if (listQuery == null || listQuery.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
-
- long count= taoBaoOrderService.countQuery(keyType, key, startTime, endTime, state);
-
- int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
- PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-
- GsonBuilder gsonBuilder = new GsonBuilder();
- gsonBuilder.serializeNulls(); // 閲嶇偣
- Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
-
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- data.put("result_list", gson.toJson(listQuery));
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- e.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- }
- }
-
@RequestMapping(value = "countByType")
@@ -107,7 +50,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
- // TODO Auto-generated catch block
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("缁熻澶辫触"));
e.printStackTrace();
}
--
Gitblit v1.8.0