Merge remote-tracking branch 'origin/master'

cif-service/src/main/java/com/txz/cif/web/UserApiController.java

@@ -371,6 +371,15 @@ public class UserApiController extends AbstractApiController {
             } catch (Exception e) {
                 log.error("直推红包新增异常", e);
             }
+            //  更新VIP等级
+            Condition c = new Condition(User.class);
+            Example.Criteria criteria = c.createCriteria();
+            criteria.andEqualTo("pid", puser.getId());
+            Integer kidsNum = userService.countByCondition(c);
+            ConfigMember nextLevel = configMemberService.findBy("level", puser.getVipLevel() + 1);
+            if (nextLevel.getInvitedNo().compareTo(kidsNum+1)>= 0){
+                userService.update(User.builder().id(puser.getId()).vipLevel(nextLevel.getLevel()).build());
+            }
         }
         if (StrUtil.isBlank(user.getHeadPic())) {
             String zm = user.getName().substring(0, 1).toUpperCase();
@@ -380,6 +389,7 @@ public class UserApiController extends AbstractApiController {
             user.setHeadPic(headPic);
         }
         user.setVipLevel(0);
+        // 新增
         userService.add(user);
         user.setInvitedCode(ShareCodeUtils.idToInvitationCode(user.getId()));
         // 补位

cif-service/src/main/java/com/txz/cif/web/mng/UserController.java

@@ -138,10 +138,25 @@ public class UserController extends AbstractApiController {
                 Integer inviteNextNum = userService.countByCondition(c);
                 bo.setTeamNum(inviteNum + inviteNextNum);
                 // 付款过的订单
+//                c = new Condition(Flow.class);
+//                c.createCriteria().andIn("bizType", CollUtil.newArrayList(BizTypeEnum.OPEN_GROUP_PAY.getKey(), BizTypeEnum.JOIN_GROUP_PAY.getKey()));
+//                Integer payNum = flowService.countByCondition(c);
+//                bo.setSuccessGroupNum(payNum);
+
                 c = new Condition(Flow.class);
-                c.createCriteria().andIn("bizType", CollUtil.newArrayList(BizTypeEnum.OPEN_GROUP_PAY.getKey(), BizTypeEnum.JOIN_GROUP_PAY.getKey()));
+                c.createCriteria().andEqualTo("userId", u.getId()).andIn("bizType", CollUtil.newArrayList(BizTypeEnum.OPEN_GROUP_PAY.getKey(), BizTypeEnum.JOIN_GROUP_PAY.getKey()));
                 Integer payNum = flowService.countByCondition(c);
-                bo.setSuccessGroupNum(payNum);
+                if (payNum == null) {
+                    payNum = 0;
+                }
+                c = new Condition(Flow.class);
+                c.createCriteria().andEqualTo("userId", u.getId()).andEqualTo("bizType", BizTypeEnum.FAIL_GROUP_REFUND.getKey());
+                Integer unpayNum = flowService.countByCondition(c);
+                if (unpayNum == null) {
+                    unpayNum = 0;
+                }
+                bo.setSuccessGroupNum(payNum-unpayNum);
+
                 // 钱包余额
                 Account wallet = accountService.getAccount(u.getId(), 1);
                 bo.setWalletBalance(wallet.getBalance());