From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java
index 18fc791..dee3431 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -21,9 +22,11 @@
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.job.order.taobao.UpdateOrderJob;
import com.yeshi.fanli.job.order.taobao.UpdateTBRelationAndSpecialOrderJob;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -37,6 +40,9 @@
@Resource
private TaoBaoOrderService taoBaoOrderService;
+
+ @Resource
+ private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
@Resource
private UpdateTBRelationAndSpecialOrderJob updateRelationAndSpecialOrderJob;
@@ -54,7 +60,7 @@
* @param out
*/
@RequestMapping(value = "listTaoBaoOrder")
- public void listTaoBaoOrder(String callback, String key, Integer pageIndex, PrintWriter out) {
+ public void listTaoBaoOrder(AdminAcceptData acceptData, String callback, String key, Integer pageIndex, PrintWriter out) {
try {
@@ -102,7 +108,7 @@
}
@RequestMapping(value = "updateTaoBaoOrder")
- public void updateTaoBaoOrder(String callback, String ids, PrintWriter out) {
+ public void updateTaoBaoOrder(AdminAcceptData acceptData,String callback, String ids, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(ids)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂笂浼犺鍗旾D"));
@@ -140,4 +146,48 @@
}
}
+ @RequestMapping(value = "listTaoBaoWQOrder")
+ public void listTaoBaoWeiQuanOrder(AdminAcceptData acceptData,String callback, String key, Integer pageIndex, PrintWriter out) {
+ try {
+ if (pageIndex == null || pageIndex < 0) {
+ pageIndex = 1;
+ }
+ List<TaoBaoWeiQuanOrder> orderList = null;
+ Long count = null;
+ if (!StringUtil.isNullOrEmpty(key)) {
+ orderList = taoBaoWeiQuanOrderService.listByOrderId(key);
+ count = (long) orderList.size();
+ } else {
+ orderList = taoBaoWeiQuanOrderService.listByState(null, pageIndex, Constant.PAGE_SIZE);
+ count = taoBaoWeiQuanOrderService.countByState(null);
+ }
+
+ int pageSize = Constant.PAGE_SIZE;
+
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+ Gson gson = 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(TimeUtil.getGernalTime(value.getTime(), "yyyy-MM-dd HH:mm:ss"));
+ }
+ }
+ }).create();
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("result_list", gson.toJson(orderList));
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.8.0