From 9d8dfb01ff72c57abad3b80f3d65e81a5354db03 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 09:10:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 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 3ef6f94..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,15 +161,16 @@
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()) {
- case HongBaoV2.TYPE_ZIGOU:
+ case 1:
detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(
UserMoneyDetailTypeEnum.fanliWeiQuan, Long.parseLong(order.getUserId()),
drawBack.getId());
@@ -178,16 +179,12 @@
UserMoneyDetailTypeEnum.weiQuan, Long.parseLong(order.getUserId()),
drawBack.getId());
break;
- case HongBaoV2.TYPE_YIJI:
- case HongBaoV2.TYPE_ERJI:
- case HongBaoV2.TYPE_SHARE_YIJI:
- case HongBaoV2.TYPE_SHARE_ERJI:
+ case 3:
detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(
UserMoneyDetailTypeEnum.inviteWeiQuan, Long.parseLong(order.getUserId()),
drawBack.getId());
break;
-
- case HongBaoV2.TYPE_SHARE_GOODS:
+ case 2:
detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(
UserMoneyDetailTypeEnum.shareWeiQuan, Long.parseLong(order.getUserId()),
drawBack.getId());
--
Gitblit v1.8.0