From d3db196ed2fe8b6c3905ff111d665d9fc2c951a3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 10 十二月 2019 15:41:58 +0800
Subject: [PATCH] 返利比例与会员比例调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 20 +++++++++-----------
1 files changed, 9 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 a5925fe..ac7861a 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;
@@ -239,6 +239,9 @@
@Resource
private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private RedPackForbidService redPackForbidService;
private static final String PASSWORD_MAX_ERROR = "password_max_error";
private static final String EXTRACT_MIN_MONEY = "extract_min_money";
@@ -1230,7 +1233,7 @@
} else if (etype == 111) {
out.print(JsonUtil.loadFalseResult("淇敼鎵嬫満鍙峰悗锛�7澶╁唴鏃犳硶鎻愮幇"));
} else if (etype == 110) {
- out.print(JsonUtil.loadFalseResult("鏈夌淮鏉冭鍗曞皻鏈墸娆�"));
+ out.print(JsonUtil.loadFalseResult("鏈夊敭鍚庤鍗曞皻鏈墸娆�"));
}
}
@@ -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);
- }
+ boolean verifyForbid = redPackForbidService.verifyForbid(uid);
+ data.put("redPackLock", verifyForbid);
}
out.print(JsonUtil.loadTrueResult(data));
@@ -2376,7 +2374,7 @@
if (!StringUtil.isNullOrEmpty(inviteCode)) {// 閭�璇风爜涓嶄负绌�
inviteCode = inviteCode.trim();
- if (inviteCode.length() >= 6 && inviteCode.length() <= 12) {
+ if (inviteCode.length() >= 4 && inviteCode.length() <= 12) {
if (!userVIPInfoService.isVIP(uid)) {
out.print(JsonUtil.loadFalseResult(20, "鍙湁瓒呯骇浼氬憳鎵嶈兘淇敼"));
@@ -2391,7 +2389,7 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
}
} else {
- out.print(JsonUtil.loadFalseResult(1, "閭�璇风爜蹇呴』涓�6鍒�12浣�"));
+ out.print(JsonUtil.loadFalseResult(1, "閭�璇风爜蹇呴』涓�4鍒�12浣�"));
return;
}
}
--
Gitblit v1.8.0