From 54402107ca335c2896fc9c61864f6054ad5bfabb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 16 十二月 2019 16:07:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 252d761..7dd810a 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
@@ -216,14 +216,17 @@
// 鏌ヨ鏄惁缁存潈
for (CommonOrderVO order : list) {
+ if (order.getUserId() == null)
+ continue;
+
// 鏌ヨ鏄惁缁存潈
TaoBaoWeiQuanOrder weiQuanOrder = taoBaoWeiQuanOrderService.listByorderItemId(order.getTradeId());
if (weiQuanOrder != null)// 鏈夌淮鏉�
{
order.setWeiQuanState(weiQuanOrder.getState());
order.setState(CommonOrder.STATE_WQ);
- TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService
- .selectByOrderItemId(weiQuanOrder.getOrderItemId());
+ TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(weiQuanOrder.getOrderItemId(),
+ Long.parseLong(order.getUserId()));
if (drawBack != null) {// 宸茬粡閫�娆�
// 璁＄畻閫�娆捐祫閲�
--
Gitblit v1.8.0