From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopOrderAdminController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopOrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopOrderAdminController.java
index 7c2febd..91e2022 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopOrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopOrderAdminController.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -26,10 +27,10 @@
import com.yeshi.fanli.service.inter.shop.BanLiShopOrderPayService;
import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-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;
@@ -61,7 +62,7 @@
* @param out
*/
@RequestMapping(value = "listOrder")
- public void listOrder(String callback, String orderId, int page, String state, Long uid, PrintWriter out) {
+ public void listOrder(AdminAcceptData acceptData, String callback, String orderId, int page, String state, Long uid, PrintWriter out) {
long count = 0;
List<BanLiShopOrder> orderList = new ArrayList<>();
if (!StringUtil.isNullOrEmpty(orderId)) {
@@ -106,7 +107,7 @@
// 璁㈠崟鍏呭��
@RequestMapping(value = "charge")
- public void charge(String callback, Long id, String code, HttpServletRequest request, PrintWriter out) {
+ public void charge(AdminAcceptData acceptData,String callback, Long id, String code, HttpServletRequest request, PrintWriter out) {
/* 妫�楠屾槸鍚︾櫥闄� */
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
@@ -137,7 +138,7 @@
}
@RequestMapping(value = "reject")
- public void reject(String callback, Long id, String desc,HttpServletRequest request, PrintWriter out) {
+ public void reject(AdminAcceptData acceptData,String callback, Long id, String desc,HttpServletRequest request, PrintWriter out) {
/* 妫�楠屾槸鍚︾櫥闄� */
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
if (admin == null) {
@@ -160,7 +161,7 @@
}
@RequestMapping(value = "getOrderDetail")
- public void getOrderDetail(String callback, Long id, PrintWriter out) {
+ public void getOrderDetail(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKey(id);
if (order == null) {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, "璁㈠崟涓嶅瓨鍦�")));
--
Gitblit v1.8.0