From 63082cc227b24ab6b2664592c73894c2c7bfb666 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 14 三月 2019 09:38:54 +0800
Subject: [PATCH] 订单状态bug修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 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 2413a33..723a795 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
@@ -63,12 +63,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 {

--
Gitblit v1.8.0