123

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java

@@ -43,6 +43,12 @@ public class BaseUserMemberLevel implements Serializable {
     @Column(name = "level")
 	@ApiModelProperty(value = "等级")
     private Integer level;
+
+
+
+	@Column(name = "extract")
+	@ApiModelProperty(value = "提成比例")
+	private Integer extract;
 	
 	    //描述
     @Column(name = "describes")

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -4,8 +4,11 @@ import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
 import com.github.wxiaoqi.security.admin.dto.*;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.mapper.AppUserSellingWaterMapper;
+import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.SellingWalletPagVo;
 import com.github.wxiaoqi.security.admin.vo.SellingWalletVo;
+import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
@@ -56,6 +59,12 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
     @Autowired
     MyWaterBiz myWaterBiz;
 
+    @Autowired
+    BaseUserMemberBiz userMemberBiz;
+
+    @Autowired
+    BaseUserMemberLevelMapper BaseUserMemberLevelMapper;
+
 
     //计算用户拥金
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
@@ -106,6 +115,11 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         AppUserPosition position = positionBiz.getExtract(parentId);
         if (position != null) {
             positionId = position.getId();
+            if (position.getLevel() != null && position.getLevel() == 0){
+                Integer extract = position.getExtract();
+                getMemberExtract(parentId,extract);
+                position.setExtract(extract);
+            }
         }
         AppUserPosition position1 = positionBiz.getExtract(userId);
         if (position != null) {
@@ -519,4 +533,22 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         }
     }
 
+    public  void getMemberExtract(Integer userId,Integer extract){
+        AppUserVo appUserVo = appUserDetailBiz.getUserInfoById(userId);
+        if (appUserVo.getIsMember() != null && appUserVo.getIsMember() == 1){
+            UserMemberVo userMemberVo = userMemberBiz.getMemberInfoByUserId(userId);
+            if (userMemberVo != null){
+                BaseUserMemberLevel memberLevel1=new BaseUserMemberLevel();
+                memberLevel1.setLevel(userMemberVo.getMemberLevel());
+                memberLevel1.setIsdel(0);
+                memberLevel1=BaseUserMemberLevelMapper.selectOne(memberLevel1);
+                if (memberLevel1 !=null  ){
+                    extract = memberLevel1.getExtract() == null ? extract : memberLevel1.getExtract();
+
+                }
+
+            }
+        }
+    }
+
 }
\ No newline at end of file