From a364fbab598a45842d4b38d156e8b5e55f9513ad Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 十一月 2019 14:35:54 +0800
Subject: [PATCH] 红包封禁 + 后台管理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 206ac38..29a0344 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;
@@ -90,7 +89,7 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;
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;
@@ -103,6 +102,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserRankService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
@@ -230,7 +230,10 @@
private BindRemindService bindRemindService;
@Resource
- private RedPackBalanceService redPackBalanceService;
+ private UserRankService userRankService;
+
+ @Resource
+ private RedPackForbidService redPackForbidService;
private static final String PASSWORD_MAX_ERROR = "password_max_error";
@@ -2176,14 +2179,8 @@
}
// 2.0.2 鐗堟湰
- if (VersionUtil.greaterThan_2_0_2(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);
- }
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ data.put("redPackLock", redPackForbidService.verifyForbid(uid));
}
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0