From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/order/JDOrderController.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/JDOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/JDOrderController.java
index b08e7c4..8c249f1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/JDOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/JDOrderController.java
@@ -3,13 +3,11 @@
import java.io.PrintWriter;
import java.lang.reflect.Type;
import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
-import java.util.Set;
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,16 +19,10 @@
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.yeshi.fanli.entity.jd.JDOrderItem;
-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.order.jd.JDOrderService;
-import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import net.sf.json.JSONObject;
@@ -52,7 +44,7 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, String key, Integer pageIndex, PrintWriter out) {
+ public void query(AdminAcceptData acceptData, String callback, String key, Integer pageIndex, PrintWriter out) {
try {
if (pageIndex == null || pageIndex < 0) {
pageIndex = 1;
--
Gitblit v1.8.0