From e65037e672ecab852e2a6c5b242cdadfd1a58b33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 十一月 2019 09:30:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackAdminController.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/RedPackAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackAdminController.java
similarity index 95%
rename from fanli/src/main/java/com/yeshi/fanli/controller/admin/RedPackAdminController.java
rename to fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackAdminController.java
index faca0a6..01e9962 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/RedPackAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackAdminController.java
@@ -1,4 +1,4 @@
-package com.yeshi.fanli.controller.admin;
+package com.yeshi.fanli.controller.admin.redpack;
import java.io.PrintWriter;
import java.math.BigDecimal;
@@ -17,7 +17,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.redpack.RedPackExchange;
-import com.yeshi.fanli.exception.redpack.RedPackBalanceException;
import com.yeshi.fanli.exception.redpack.RedPackExchangeException;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
@@ -119,13 +118,7 @@
return;
}
Long uid = exchange.getUid();
- BigDecimal balance;
- try {
- balance = redPackBalanceService.getBalance(uid);
- } catch (RedPackBalanceException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴风孩鍖呭姛鑳藉凡琚皝绂�"));
- return;
- }
+ BigDecimal balance = redPackBalanceService.getBalance(uid);
UserInfo userInfo = userInfoService.selectByPKey(uid);
JSONObject data = new JSONObject();
--
Gitblit v1.8.0