From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
index eb0d183..0a913a1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
@@ -26,6 +26,7 @@
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
import com.yeshi.fanli.entity.integral.IntegralDetail;
import com.yeshi.fanli.entity.shop.BanLiShopOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -86,7 +87,7 @@
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void addUserVIPInfo(UserVIPInfo info) throws UserVIPInfoException {
if (info.getId() == null) {
throw new UserVIPInfoException(1, "淇℃伅涓嶅畬鏁�");
@@ -142,7 +143,7 @@
try {
// 濂栧姳鍒�
- BigDecimal percent = new BigDecimal(configService.get("exchange_rebate_percent"));
+ BigDecimal percent = new BigDecimal(configService.get(ConfigKeyEnum.exchangeRebatePercent.getKey()));
for (int i = 0; i < Constant.VIP_COUPON_REWARD_NUM; i++) {
userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
UserSystemCoupon.SOURCE_SYSTEM_PUSH, percent, false);
@@ -188,7 +189,7 @@
userInviteSeparateService.updateStateByWorkerIdAndBossId(uid, bossId, UserInviteSeparate.STATE_INVALID);
// 闄愬埗鏃堕棿
- int limitDays = Integer.parseInt(configService.get("invite_separate_limit_days"));
+ int limitDays = Integer.parseInt(configService.get(ConfigKeyEnum.inviteSeparateLimitDays.getKey()));
UserInviteSeparate inviteSeparate = new UserInviteSeparate();
inviteSeparate.setBossId(bossId);
inviteSeparate.setWorkerId(uid);
@@ -207,7 +208,7 @@
userOtherMsgNotificationService.teamVIPCallBoss(bossId, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgboss);
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void rejectVIPApply(Long uid, String reason) throws UserVIPInfoException {
UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
@@ -231,7 +232,7 @@
userOtherMsgNotificationService.rejectVIPApply(uid, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgOther);
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void applyVIP(Long uid) throws UserVIPInfoException {
UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
@@ -297,6 +298,12 @@
if (extra == null)
return false;
+ // 1銆佺洿鎺ョ矇涓濓紙浠� 2020 骞� 1 鏈� 1 鏃ヨ捣鐩存帴绮変笣浜х敓鏈夋晥璁㈠崟锛�
+ BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
+ long teamNum = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);
+
+
+ // 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
Date executeDate = null;
try {
@@ -308,9 +315,6 @@
if (executeDate == null)
return false;
- // 1銆佺洿鎺ョ矇涓濓紙浠� 2020 骞� 1 鏈� 1 鏃ヨ捣鐩存帴绮変笣浜х敓鏈夋晥璁㈠崟锛�
- BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
- long teamNum = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, executeDate.getTime(), payMoney);
if (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime()) {
long limitNum = Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user"));
if (teamNum < limitNum)
@@ -358,6 +362,7 @@
@Override
+ @Transactional(rollbackFor = Exception.class)
public void inviteSeparate(Long workerId, Long bossId) {
if (workerId == null || bossId == null)
return;
@@ -396,7 +401,7 @@
// 鑴辩閭�璇峰叧绯�
threeSaleSerivce.inviteSeparate(workerId, bossId);
- int limitDays = Integer.parseInt(configService.get("invite_separate_limit_days"));
+ int limitDays = Integer.parseInt(configService.get(ConfigKeyEnum.inviteSeparateLimitDays.getKey()));
// 娑堟伅
UserInfo userInfo = userInfoService.selectByPKey(workerId);
MsgOtherVIPDTO msgboss = new MsgOtherVIPDTO();
--
Gitblit v1.8.0