增加上级邀请人数

cif-service/src/main/java/com/txz/cif/model/ConfigMember.java

@@ -26,6 +26,10 @@ public class ConfigMember {
     @ApiModelProperty(value="invitedNo邀请人数")
     private Integer invitedNo;
 
+    @Column(name = "has_invited_no")
+    @ApiModelProperty(value="上级邀请人数")
+    private Integer hasInvitedNo;
+
     /**
      * 一级佣金
      */
@@ -93,8 +97,9 @@ public class ConfigMember {
      *
      * @param invitedNo 邀请人数
      */
-    public void setInvitedNo(Integer invitedNo) {
+    public ConfigMember setInvitedNo(Integer invitedNo) {
         this.invitedNo = invitedNo;
+        return this;
     }
 
     /**
@@ -150,4 +155,12 @@ public class ConfigMember {
     public void setJoinedGroupsNo(Integer joinedGroupsNo) {
         this.joinedGroupsNo = joinedGroupsNo;
     }
+
+    public Integer getHasInvitedNo() {
+        return hasInvitedNo;
+    }
+
+    public void setHasInvitedNo(Integer hasInvitedNo) {
+        this.hasInvitedNo = hasInvitedNo;
+    }
 }

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

@@ -209,7 +209,7 @@ public class UserApiController extends AbstractApiController {
     @GetMapping("/memberConfigs")
     public Result<List<ConfigMember>> memberConfigs() {
         List<ConfigMember> result = configMemberService.findAll();
-        return ResultGenerator.genSuccessResult(result);
+        return ResultGenerator.genSuccessResult(result.stream().map(e -> e.setInvitedNo( e.getInvitedNo() - e.getHasInvitedNo())).collect(Collectors.toList()));
     }
     
     
@@ -243,7 +243,7 @@ public class UserApiController extends AbstractApiController {
         if (nextLevel == null) {
             bo.setNextInvitedNo(invited);
         } else {
-            bo.setNextInvitedNo(nextLevel.getInvitedNo());
+            bo.setNextInvitedNo( nextLevel.getInvitedNo() - nextLevel.getHasInvitedNo());
         }
         c = new Condition(User.class);
         c.createCriteria().andEqualTo("ppid", user.getId());

cif-service/src/main/resources/mapper/ConfigMemberMapper.xml

@@ -11,5 +11,8 @@
     <result column="direct_referral_reward" jdbcType="DECIMAL" property="directReferralReward" />
     <result column="Indirect_referral_reward" jdbcType="DECIMAL" property="indirectReferralReward" />
     <result column="joined_groups_no" jdbcType="INTEGER" property="joinedGroupsNo" />
+    <result column="has_invited_no" jdbcType="INTEGER" property="hasInvitedNo" />
+
+
   </resultMap>
 </mapper>