用户等级进度晋升、等级进度

cweb/src/main/java/com/hfkj/controller/UserGradeController.java

@@ -8,9 +8,15 @@ import com.hfkj.common.security.UserCenter;
 import com.hfkj.common.utils.MemberValidateUtil;
 import com.hfkj.common.utils.RedisUtil;
 import com.hfkj.common.utils.ResponseMsgUtil;
+import com.hfkj.entity.BsUser;
 import com.hfkj.model.ResponseData;
 import com.hfkj.model.UserSessionObject;
+import com.hfkj.service.user.BsUserAccountRecordService;
+import com.hfkj.service.user.BsUserAccountService;
+import com.hfkj.service.user.BsUserGradeService;
 import com.hfkj.service.user.BsUserService;
+import com.hfkj.sysenum.user.UserAccountRecordSourceTypeEnum;
+import com.hfkj.sysenum.user.UserGradeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -22,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -34,185 +41,61 @@ import java.util.Map;
 @RequestMapping(value="/userGrade")
 @Api(value="客户端业务")
 public class UserGradeController {
+    @Autowired
+    private UserCenter userCenter;
     @Resource
     private BsUserService userService;
     @Resource
-    private RedisUtil redisUtil;
+    private BsUserGradeService userGradeService;
-    @Autowired
-    private UserCenter userCenter;
 
-    @RequestMapping(value = "/getUser", method = RequestMethod.GET)
+    @RequestMapping(value = "/payGrade2", method = RequestMethod.POST)
     @ResponseBody
-    @ApiOperation(value = "查询用户信息")
+    @ApiOperation(value = "购买【优淘会员】等级")
-    public ResponseData getUser() {
+    public ResponseData payGrade2() {
         try {
-            Map<String,Object> param = new HashMap<>();
-            // 用户信息
-            param.put("user", userCenter.getSessionModel(UserSessionObject.class));
-
-            return ResponseMsgUtil.success(param);
-
-        } catch (Exception e) {
-            return ResponseMsgUtil.exception(e);
-        }
-    }
-
-    @RequestMapping(value = "/updateWechat", method = RequestMethod.POST)
-    @ResponseBody
-    @ApiOperation(value = "修改用户微信号")
-    public ResponseData updateWechat(@RequestBody JSONObject body) {
-        try {
-            if (body == null || StringUtils.isBlank(body.getString("wechatNum"))) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
-            }
             UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class);
-            userService.updateWechatNum(userSession.getUser().getId(), body.getString("wechatNum"));
-            return ResponseMsgUtil.success("操作成功");
 
-        } catch (Exception e) {
+            // 购买
-            return ResponseMsgUtil.exception(e);
+            userGradeService.payGrade2(userSession.getUser().getId());
-        }
-    }
-
-    @RequestMapping(value = "/bindPhone", method = RequestMethod.POST)
-    @ResponseBody
-    @ApiOperation(value = "绑定手机号")
-    public ResponseData bindPhone(@RequestBody JSONObject body) {
-        try {
-            if (body == null
-                    || StringUtils.isBlank(body.getString("phone"))
-                    || StringUtils.isBlank(body.getString("smsCode"))) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
-            }
-            UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class);
-            if (StringUtils.isNotBlank(userSession.getUser().getPhone())) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "手机号已绑定");
-            }
-            String phone = body.getString("phone");
-            // 校验手机号格式
-            if (!MemberValidateUtil.validatePhone(phone)) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入正确的手机号");
-            }
-            if (StringUtils.isBlank(body.getString("smsCode"))) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入短信验证码");
-            }
-            if (userService.getUser(phone) != null) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "手机号已被绑定");
-            }
-            // 手机号的验证码
-            Object phoneCodeObject = redisUtil.get("SMS_BIND_PHONE_CODE:" + phone);
-            if (phoneCodeObject == null) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "短信验证码错误");
-            }
-            if (!body.getString("smsCode").equals(phoneCodeObject.toString())) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "短信验证码错误");
-            }
-            redisUtil.del("SMS_BIND_PHONE_CODE:" + phone);
 
-            // 更新手机号
+            return ResponseMsgUtil.success("操作成功");
-            userService.updatePhone(userSession.getUser().getId(), body.getString("phone"));
-
-            return ResponseMsgUtil.success(userCenter.getSessionModel(UserSessionObject.class));
 
         } catch (Exception e) {
             return ResponseMsgUtil.exception(e);
         }
     }
 
-    @RequestMapping(value = "/bindInviteUser", method = RequestMethod.POST)
+    @RequestMapping(value = "/queryProgress", method = RequestMethod.GET)
     @ResponseBody
-    @ApiOperation(value = "绑定邀请人Id")
+    @ApiOperation(value = "查询升级条件进度")
-    public ResponseData bindInviteUser(@RequestBody JSONObject body) {
+    public ResponseData queryProgress() {
         try {
-            if (body == null || body.getLong("inviteUseId") == null) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
-            }
             UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class);
 
-            // 绑定邀请人
+            // 查询用户
-            userService.bindInviteUser(userSession.getUser().getId(), body.getLong("inviteUseId"));
+            BsUser user = userService.getUser(userSession.getUser().getId());
 
-            return ResponseMsgUtil.success(userCenter.getSessionModel(UserSessionObject.class));
+            Map<String,Object> map = new HashMap<>();
+            if (UserGradeEnum.grade1.getCode().equals(user.getGrade())) {
+                // 晋升优淘会员
+                map = userGradeService.promoteGrade2Progress(user.getId());
 
-        } catch (Exception e) {
+            } else if (UserGradeEnum.grade2.getCode().equals(user.getGrade())) {
-            return ResponseMsgUtil.exception(e);
+                // 晋升团长渠道
-        }
+                map = userGradeService.promoteGrade3Progress(user.getId());
-    }
 
-    @RequestMapping(value = "/verifyUpdPhoneSmsCode", method = RequestMethod.POST)
+            } else if (UserGradeEnum.grade3.getCode().equals(user.getGrade())) {
-    @ResponseBody
+                // 晋升渠道进度
-    @ApiOperation(value = "验证修改手机号验证码")
+                map = userGradeService.promoteGrade4Progress(user.getId());
-    public ResponseData verifyUpdPhoneSmsCode(@RequestBody JSONObject body) {
-        try {
-            if (body == null
-                    || StringUtils.isBlank(body.getString("phone"))
-                    || StringUtils.isBlank(body.getString("smsCode"))) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
-            }
-            String phone = body.getString("phone");
-            // 手机号的验证码
-            Object phoneCodeObject = redisUtil.get("SMS_UPDATE_PHONE_CODE:" + phone);
-            if (phoneCodeObject == null) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "短信验证码错误或已失效");
             }
-            if (!body.getString("smsCode").equals(phoneCodeObject.toString())) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "短信验证码错误或已失效");
-            }
-            redisUtil.del("SMS_UPDATE_PHONE_CODE:" + phone);
 
-            return ResponseMsgUtil.success(true);
+            map.put("currentUserGrade", user.getGrade());
+            return ResponseMsgUtil.success(map);
 
         } catch (Exception e) {
             return ResponseMsgUtil.exception(e);
         }
     }
 
-    @RequestMapping(value = "/updatePhone", method = RequestMethod.POST)
-    @ResponseBody
-    @ApiOperation(value = "修改手机号")
-    public ResponseData updatePhone(@RequestBody JSONObject body) {
-        try {
-            if (body == null
-                    || StringUtils.isBlank(body.getString("newPhone"))
-                    || StringUtils.isBlank(body.getString("smsCode"))) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
-            }
-            UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class);
-            if (StringUtils.isBlank(userSession.getUser().getPhone())) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "用户未绑定手机号");
-            }
-            String phone = body.getString("newPhone");
-            if (userSession.getUser().getPhone().equals(phone)) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "新手机号与现绑定手机号相同");
-            }
-            if (userService.getUser(phone) != null) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "手机号已被绑定");
-            }
-            // 校验手机号格式
-            if (!MemberValidateUtil.validatePhone(phone)) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入正确的手机号");
-            }
-            if (StringUtils.isBlank(body.getString("smsCode"))) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入短信验证码");
-            }
-            // 手机号的验证码
-            Object phoneCodeObject = redisUtil.get("SMS_UPDATE_PHONE_CODE:" + phone);
-            if (phoneCodeObject == null) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "短信验证码错误或已失效");
-            }
-            if (!body.getString("smsCode").equals(phoneCodeObject.toString())) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "短信验证码错误或已失效");
-            }
-            redisUtil.del("SMS_UPDATE_PHONE_CODE:" + phone);
-
-            // 更新手机号
-            userService.updatePhone(userSession.getUser().getId(), body.getString("newPhone"));
-
-            return ResponseMsgUtil.success(userCenter.getSessionModel(UserSessionObject.class));
-
-        } catch (Exception e) {
-            return ResponseMsgUtil.exception(e);
-        }
-    }
 
 }

service/src/main/java/com/hfkj/service/user/BsUserGradeService.java

@@ -1,5 +1,7 @@
 package com.hfkj.service.user;
 
+import java.util.Map;
+
 /**
  * @className: BsUserService
  * @author: HuRui
@@ -13,4 +15,32 @@ public interface BsUserGradeService {
      */
     void promote(Long userId);
 
+    /**
+     * 购买优淘会员
+     * @param userId
+     */
+    void payGrade2(Long userId) throws Exception;
+
+    /**
+     * 晋升【优淘会员】进度
+     * @param userId
+     * @return
+     */
+    Map<String,Object> promoteGrade2Progress(Long userId);
+
+    /**
+     * 晋升【团长】进度
+     * @param userId
+     * @return
+     */
+    Map<String,Object> promoteGrade3Progress(Long userId);
+
+    /**
+     * 晋升【渠道】进度
+     * @param userId
+     * @return
+     */
+    Map<String,Object> promoteGrade4Progress(Long userId);
+
+
 }

service/src/main/java/com/hfkj/service/user/impl/BsUserAccountServiceImpl.java

@@ -146,6 +146,10 @@ public class BsUserAccountServiceImpl implements BsUserAccountService {
 
                 // 查询账户
                 BsUserAccount userAccount = getAccount(userId);
+                // 余额 是否小于 消费余额
+                if (userAccount.getGoldCoin().compareTo(amount) == -1) {
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "元宝不足");
+                }
                 // 变更前金额
                 BigDecimal beforeAmount = userAccount.getGoldCoin();
                 // 计算金额

service/src/main/java/com/hfkj/service/user/impl/BsUserGradeServiceImpl.java

@@ -5,12 +5,10 @@ import com.hfkj.common.exception.ErrorHelp;
 import com.hfkj.common.exception.SysCode;
 import com.hfkj.entity.BsUser;
 import com.hfkj.model.UserTeamModel;
-import com.hfkj.service.user.BsUserGradeService;
+import com.hfkj.service.user.*;
-import com.hfkj.service.user.BsUserAccountRecordService;
-import com.hfkj.service.user.BsUserParentRelService;
-import com.hfkj.service.user.BsUserService;
 import com.hfkj.sysenum.user.UserAccountRecordSourceTypeEnum;
 import com.hfkj.sysenum.user.UserGradeEnum;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +29,8 @@ public class BsUserGradeServiceImpl implements BsUserGradeService {
     @Resource
     private BsUserService userService;
     @Resource
+    private BsUserAccountService userAccountService;
+    @Resource
     private BsUserAccountRecordService userAccountRecordService;
     @Resource
     private BsUserParentRelService userParentRelService;
@@ -72,6 +72,86 @@ public class BsUserGradeServiceImpl implements BsUserGradeService {
         }
     }
 
+    @Override
+    @Transactional(propagation= Propagation.REQUIRED,rollbackFor= {RuntimeException.class})
+    public void payGrade2(Long userId) throws Exception {
+        // 查询用户
+        BsUser user = userService.getUser(userId);
+        if (!UserGradeEnum.grade1.getCode().equals(user.getGrade())) {
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "只有“见习会员”才能进行购买");
+        }
+        Map<String,Object> otherParam = new HashMap<>();
+        otherParam.put("sourceContent", "升级优淘会员");
+        // 支付3元宝
+        userAccountService.consume(user.getId(),new BigDecimal("3"), UserAccountRecordSourceTypeEnum.type2, otherParam);
+
+        // 等级晋升
+        promote(userId);
+    }
+
+    @Override
+    public Map<String, Object> promoteGrade2Progress(Long userId) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("condition1", false);
+
+        // 条件一（支付3元宝）
+        Map<String,Object> accountRecordParam = new HashMap<>();
+        accountRecordParam.put("userId", userId);
+        accountRecordParam.put("sourceType", UserAccountRecordSourceTypeEnum.type2.getType());
+        if (!userAccountRecordService.getList(accountRecordParam).isEmpty()) {
+            map.put("condition1", true);
+        }
+
+        // 条件二（元宝收益达到5元宝）
+        BigDecimal profit = userAccountRecordService.getUserTotalProfit(userId);
+        map.put("condition2", profit);
+
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> promoteGrade3Progress(Long userId) {
+        Map<String,Object> map = new HashMap<>();
+
+        Map<String,Object> param = new HashMap<>();
+        param.put("parentUserId", userId);
+        List<UserTeamModel> subData = userParentRelService.getTeamSubList(param);
+
+        // 条件一（直属正式会员达到30人）
+        map.put("condition1", subData.stream().filter(o -> o.getRelType().equals(1)).count());
+
+        // 条件二（非直属正式会员达到100人）
+        map.put("condition2", subData.stream().filter(o -> o.getRelType().equals(2)).count());
+
+        // 条件三（累计元宝收益达到100元宝）
+        BigDecimal profit = userAccountRecordService.getUserTotalProfit(userId);
+        map.put("condition3", profit);
+
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> promoteGrade4Progress(Long userId) {
+        Map<String,Object> map = new HashMap<>();
+
+        Map<String,Object> param = new HashMap<>();
+        param.put("parentUserId", userId);
+        param.put("userType", 4);
+        List<UserTeamModel> directlyUnderData = userParentRelService.getTeamSubList(param);
+
+        // 条件一（直属团长达到100人）
+        map.put("condition1", directlyUnderData.stream().filter(o -> o.getRelType().equals(1)).count());
+
+        // 条件二（非直属团长达到300人）
+        map.put("condition2", directlyUnderData.stream().filter(o -> o.getRelType().equals(2)).count());
+
+        // 条件三（累计元宝收益达到10000元宝）
+        BigDecimal profit = userAccountRecordService.getUserTotalProfit(userId);
+        map.put("condition3", profit);
+
+        return map;
+    }
+
     /**
      * 晋升条件【优淘会员】
      * @param user
@@ -82,17 +162,16 @@ public class BsUserGradeServiceImpl implements BsUserGradeService {
         boolean payCondition = false;
         boolean profitCondition = false;
 
+        // 完成进度
+        Map<String, Object> map = promoteGrade2Progress(user.getId());
+
         // 条件一（支付3元宝）
-        Map<String,Object> accountRecordParam = new HashMap<>();
+        if (MapUtils.getBoolean(map, "condition1")) {
-        accountRecordParam.put("userId", "");
-        accountRecordParam.put("sourceType", UserAccountRecordSourceTypeEnum.type2.getType());
-        if (!userAccountRecordService.getList(accountRecordParam).isEmpty()) {
             payCondition = true;
         }
 
         // 条件二（元宝收益达到5元宝）
-        BigDecimal profit = userAccountRecordService.getUserTotalProfit(user.getId());
+        if (new BigDecimal(MapUtils.getString(map, "condition2")).compareTo(new BigDecimal("5")) >= 1) {
-        if (profit.compareTo(new BigDecimal("5")) >= 1) {
             profitCondition = true;
         }
         // 满足其中条件一项
@@ -110,24 +189,21 @@ public class BsUserGradeServiceImpl implements BsUserGradeService {
         boolean nonDirect = false;          // 非直属
         boolean profitCondition = false;    // 元宝收益
 
-        Map<String,Object> param = new HashMap<>();
+        // 完成进度
-        param.put("parentUserId", user.getId());
+        Map<String, Object> map = promoteGrade3Progress(user.getId());
-        List<UserTeamModel> subData = userParentRelService.getTeamSubList(param);
 
         // 条件一（直属正式会员达到30人）
-        if (subData.stream().filter(o -> o.getRelType().equals(1)).count() >= 30) {
+        if (MapUtils.getInteger(map, "condition1") >= 30) {
             directlyUnder = true;
         }
         // 条件二（非直属正式会员达到100人）
-        if (subData.stream().filter(o -> o.getRelType().equals(2)).count() >= 100) {
+        if (MapUtils.getInteger(map, "condition2") >= 100) {
             nonDirect = true;
         }
         // 条件三（累计元宝收益达到100元宝）
-        BigDecimal profit = userAccountRecordService.getUserTotalProfit(user.getId());
+        if (new BigDecimal(MapUtils.getString(map, "condition3")).compareTo(new BigDecimal("100")) >= 1) {
-        if (profit.compareTo(new BigDecimal("100")) >= 1) {
             profitCondition = true;
         }
-
         // 满足全部条件
         return (directlyUnder && nonDirect && profitCondition);
     }
@@ -143,24 +219,19 @@ public class BsUserGradeServiceImpl implements BsUserGradeService {
         boolean nonDirect = false;          // 非直属
         boolean profitCondition = false;    // 元宝收益
 
-        Map<String,Object> param = new HashMap<>();
+        // 完成进度
-        param.put("parentUserId", user.getId());
+        Map<String, Object> map = promoteGrade3Progress(user.getId());
-        param.put("userType", 4);
-        List<UserTeamModel> directlyUnderData = userParentRelService.getTeamSubList(param);
 
         // 条件一（直属团长达到100人）
-        if (directlyUnderData.stream().filter(o -> o.getRelType().equals(1)).count() >= 100) {
+        if (MapUtils.getInteger(map, "condition1") >= 100) {
             directlyUnder = true;
         }
-
         // 条件二（非直属团长达到300人）
-        if (directlyUnderData.stream().filter(o -> o.getRelType().equals(2)).count() >= 300) {
+        if (MapUtils.getInteger(map, "condition2") >= 300) {
             nonDirect = true;
         }
-
         // 条件三（累计元宝收益达到10000元宝）
-        BigDecimal profit = userAccountRecordService.getUserTotalProfit(user.getId());
+        if (new BigDecimal(MapUtils.getString(map, "condition3")).compareTo(new BigDecimal("10000")) >= 1) {
-        if (profit.compareTo(new BigDecimal("10000")) >= 1) {
             profitCondition = true;
         }
         return (directlyUnder && nonDirect && profitCondition);