代理人app开发

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1375,6 +1375,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         } else {
             return HttpResult.error("密码不能为空");
         }
+        if (sysUser2Vo.getSysUser().getGradeList().size() == 1 && StringUtils.equals(sysUser2Vo.getSysUser().getGradeList().get(0),"4")){
+            String deptId = addDeptUser(sysUser,"4");
+            sysUser.setDeptId(deptId);
+        }
         String userId = "";
         //19 出单员 校验机构和业务员机构是否一致
         if ("19".equals(sysUser.getRoleId())) {
@@ -3709,9 +3713,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 .collect(Collectors.toList());
         int minGrade = sortedGrades.get(0);
         boolean hasReferrer = StringUtils.isNotEmpty(sysUser.getReferrerId());
+        boolean hasDept = true;
+        if (gradeList.size() == 1 && StringUtils.equals(gradeList.get(0),"4")){
+            hasDept = false;
+        }
+
         for (int grade : sortedGrades) {
             String deptId = sysUser.getDeptId();
-            if (4 == grade){
+            if (4 == grade && hasDept){
                 deptId = addDeptUser(sysUser,String.valueOf(grade));
             }
             PartnerUser partnerUser = createPartnerUser(sysUser, grade, minGrade, hasReferrer,deptId);

src/main/java/com/ydtech/modules/partner/dao/PartnerExpiredCommissionMapper.java

@@ -3,7 +3,14 @@ package com.ydtech.modules.partner.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.partner.model.PartnerExpiredCommission;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
 
 @Mapper
 public interface PartnerExpiredCommissionMapper extends BaseMapper<PartnerExpiredCommission> {
+
+
+    @Select("select SUM(lock_commission) from partner_expired_commission where user_id=#{userId} ")
+    BigDecimal selectCountInvalid(String userId);
 }

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -23,10 +23,7 @@ import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.dao.InsUploadFilesMapper;
 import com.ydtech.modules.order.entity.api.zhongmei.constants.TimeConstants;
 import com.ydtech.modules.order.entity.po.InsUploadFiles;
-import com.ydtech.modules.partner.dao.PartnerLiftingRecordMapper;
-import com.ydtech.modules.partner.dao.PartnerPartnerAccountMapper;
-import com.ydtech.modules.partner.dao.PartnerPremiumDetailsMapper;
-import com.ydtech.modules.partner.dao.PartnerUserMapper;
+import com.ydtech.modules.partner.dao.*;
 import com.ydtech.modules.partner.model.*;
 import com.ydtech.modules.partner.model.param.*;
 import com.ydtech.modules.partner.model.vo.*;
@@ -80,6 +77,9 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
     @Autowired
     private PartnerRuleService partnerRuleService;
 
+    @Autowired
+    private PartnerExpiredCommissionMapper expiredCommissionMapper;
+
     @Value("${partner.expireDays}")
     private Long expireDays;
 
@@ -1279,7 +1279,10 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
     @Override
     public PartnerPartnerAccount newGetFee(String userId) {
-        return partnerPartnerAccountMapper.selectByUserId(userId);
+        PartnerPartnerAccount account = partnerPartnerAccountMapper.selectByUserId(userId);
+        BigDecimal invalid = expiredCommissionMapper.selectCountInvalid(userId);
+        account.setCashFee(account.getCashFee().subtract(invalid));
+        return account;
     }
 
     private static List<JSONObject> getObjects(List<PartnerPremiumDetails> details) {