From b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 七月 2019 17:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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..0dffec8 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
@@ -169,7 +169,7 @@
// 璁＄畻閫�娆捐祫閲�
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 +178,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