From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java | 89 +++++++++++++++++---------------------------
1 files changed, 35 insertions(+), 54 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java
index d611d32..9f76b59 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java
@@ -6,8 +6,7 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -18,9 +17,10 @@
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.service.inter.order.LostOrderService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.GsonUtil;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/lostOrder")
@@ -29,49 +29,6 @@
@Resource
private LostOrderService lostOrderService;
- @RequestMapping("findLostOrderList")
- public void findLostOrderList(int page, String key, PrintWriter out) {
- List<LostOrder> list = lostOrderService.findLostOrderList(key, page);
- int count = lostOrderService.getCount(key);
- PageEntity pe = new PageEntity(page, Constant.PAGE_SIZE, count);
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- data.put("lostOrderList", GsonUtil.toJsonByUserAp(list));
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- @RequestMapping("pass")
- public void pass(long id, PrintWriter out) {
- LostOrder lostOrder = lostOrderService.getOne(id);
- if (lostOrder == null) {
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鏌ヨ璁㈠崟"));
- return;
- }
- if (lostOrder.getState() != 0) {
- out.print(JsonUtil.loadFalseResult("璇ヨ鍗曞凡澶勭悊"));
- return;
- }
- lostOrderService.pass(lostOrder);
- out.print(JsonUtil.loadTrueResult(""));
- }
-
- @RequestMapping("reject")
- public void reject(long id,String reason, PrintWriter out) {
- LostOrder lostOrder = lostOrderService.getOne(id);
- if (lostOrder == null) {
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鏌ヨ璁㈠崟"));
- return;
- }
- if (lostOrder.getState() != 0) {
- out.print(JsonUtil.loadFalseResult("璇ヨ鍗曞凡澶勭悊"));
- return;
- }
- lostOrder.setRemake(reason);
- lostOrderService.reject(lostOrder);
- out.print(JsonUtil.loadTrueResult(""));
- }
-
-
/**
* 鏂扮増鍚庡彴 鍒楄〃鏌ヨ
* @param callback
@@ -80,8 +37,8 @@
* @param out
*/
@RequestMapping("query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
- Integer handleType, PrintWriter out) {
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+ Integer handleType, Integer type, PrintWriter out) {
if (pageIndex == null || pageIndex < 0){
pageIndex = 1;
@@ -93,7 +50,7 @@
try {
- List<LostOrder> list = lostOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state, handleType);
+ List<LostOrder> list = lostOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state, handleType, type,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏇村鏁版嵁"));
return;
@@ -102,12 +59,35 @@
for (LostOrder lostOrder: list) {
+ Integer stateOrder = lostOrder.getState();
+ Integer resultCode = lostOrder.getResultCode();
+ if (stateOrder != null && stateOrder == 1 && resultCode!= null) {
+ switch(resultCode) {
+ case 1:
+ lostOrder.setRemake("绛夊緟鐖彇涓�");
+ break;
+ case 2:
+ lostOrder.setRemake("澶勭悊鎴愬姛");
+ break;
+ case 3:
+ lostOrder.setState(2);
+ lostOrder.setRemake("澶勭悊澶辫触");
+ break;
+ default:
+ break;
+ }
+ } else if (stateOrder != null && stateOrder == 2) {
+ lostOrder.setRemake("宸叉嫆缁�");
+ }
+
+
Order order = lostOrder.getOrder();
if (order == null) {
lostOrder.setOrder(new Order());
}
- UserInfo userInfo = lostOrder.getUserInfo();
+
+ UserInfo userInfo = lostOrder.getUserInfo();
if (userInfo == null) {
lostOrder.setUserInfo(new UserInfo());
} else {
@@ -119,7 +99,7 @@
}
}
- long count = lostOrderService.countQuery(key, state, handleType);
+ long count = lostOrderService.countQuery(key, state, handleType, type,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -147,7 +127,7 @@
* @param out
*/
@RequestMapping("passOrder")
- public void passOrder(String callback, Long id, PrintWriter out) {
+ public void passOrder(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
@@ -185,7 +165,7 @@
* @param out
*/
@RequestMapping("rejectOrder")
- public void rejectOrder(String callback, Long id, String reason, PrintWriter out) {
+ public void rejectOrder(AdminAcceptData acceptData,String callback, Long id, String reason, PrintWriter out) {
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
return;
@@ -214,4 +194,5 @@
}
}
+
}
--
Gitblit v1.8.0