From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 16:34:13 +0800
Subject: [PATCH] 订单bug,分享爆款自购修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
index 0dffec8..35b471a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
@@ -161,11 +161,12 @@
 				TaoBaoWeiQuanOrder weiQuanOrder = taoBaoWeiQuanOrderService.listByorderItemId(order.getTradeId());
 				if (weiQuanOrder != null)// 鏈夌淮鏉�
 				{
+					order.setWeiQuanState(weiQuanOrder.getState());
 					order.setState(CommonOrder.STATE_WQ);
 					TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService
 							.selectByOrderItemId(weiQuanOrder.getOrderItemId());
 					if (drawBack != null) {// 宸茬粡閫�娆�
-						order.setWeiQuanState(weiQuanOrder.getState());
+						
 						// 璁$畻閫�娆捐祫閲�
 						UserMoneyDetail detail = null;
 						switch (order.getHongBaoType()) {

--
Gitblit v1.8.0