From 4d0c5d771b04d7ba32471df58c91c37dabe96bbf Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 24 十二月 2019 12:08:32 +0800
Subject: [PATCH] 返利订单到账时同时扣除维权金额
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 4 ++--
1 files changed, 2 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 84bf835..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,7 +216,7 @@
// 鏌ヨ鏄惁缁存潈
for (CommonOrderVO order : list) {
- if (order.getUserInfo() == null || order.getUserInfo().getId() == null)
+ if (order.getUserId() == null)
continue;
// 鏌ヨ鏄惁缁存潈
@@ -226,7 +226,7 @@
order.setWeiQuanState(weiQuanOrder.getState());
order.setState(CommonOrder.STATE_WQ);
TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(weiQuanOrder.getOrderItemId(),
- order.getUserInfo().getId());
+ Long.parseLong(order.getUserId()));
if (drawBack != null) {// 宸茬粡閫�娆�
// 璁＄畻閫�娆捐祫閲�
--
Gitblit v1.8.0