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/client/v1/UserInfoController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index a5925fe..da91c13 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -63,7 +63,6 @@
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.HongBaoOrder;
-import com.yeshi.fanli.entity.redpack.RedPackBalance;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
@@ -91,6 +90,7 @@
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
+import com.yeshi.fanli.service.inter.redpack.RedPackForbidService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.BindRemindService;
@@ -231,7 +231,7 @@
@Resource
private BindRemindService bindRemindService;
- @Resource
+ @Resource
private RedPackBalanceService redPackBalanceService;
@Resource
@@ -239,6 +239,9 @@
@Resource
private UserVIPInfoService userVIPInfoService;
+ private RedPackForbidService redPackForbidService;
+
+
private static final String PASSWORD_MAX_ERROR = "password_max_error";
private static final String EXTRACT_MIN_MONEY = "extract_min_money";
@@ -2195,13 +2198,8 @@
// 2.0.2 鐗堟湰
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- RedPackBalance redPackBalance = redPackBalanceService.selectByPrimaryKey(uid);
- if (redPackBalance != null && redPackBalance.getState() != null
- && redPackBalance.getState() == RedPackBalance.STATE_LOCKED) {
- data.put("redPackLock", RedPackBalance.STATE_LOCKED);
- } else {
- data.put("redPackLock", RedPackBalance.STATE_INIT);
- }
+
+ data.put("redPackLock", redPackForbidService.verifyForbid(uid));
}
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0