管理费修改

src/main/java/com/ydtech/modules/admin/dao/DeptBalanceMapper.java

@@ -27,7 +27,8 @@ public interface DeptBalanceMapper {
      *  @Date: 2024/08/23 9:04
      *  @Description:  合伙人保费金额
      */
-    HashMap<String, BigDecimal> getByDeptId(String deptId);
+    HashMap<String, BigDecimal> getByDeptId(@Param("deptId") String deptId);
+
     /**
      * @version
      * @author: whp

src/main/java/com/ydtech/modules/admin/model/SysAgencyLeader.java

@@ -65,6 +65,7 @@ public class SysAgencyLeader implements Serializable {
      */
     @ApiModelProperty(value = "抽成比例（总保费抽成）")
     private String proportional;
+
     @ApiModelProperty(value = "推荐人id")
     private String suggestId;
 

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

@@ -107,35 +107,35 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                 BigDecimal allWithdrawn = BigDecimal.ZERO;//已体现
                 BigDecimal allNotWithdrawn = BigDecimal.ZERO;//未提现
 //              查询机构负责人
-                List<SysRelationPerson> byUserIdList = this.sysRelationPersonMapper.getByAgencyLeaderId(item.getUserId());
-                List<String> collect = byUserIdList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-                if (!collect.isEmpty()) {
+
+                List<SysAgencyLeader> deptLeader = sysAgencyLeaderService.lambdaQuery().eq(SysAgencyLeader::getSuggestId, item.getUserId()).list();
+
 //                  机构负责人
-                    List<SysAgencyLeader> deptLeader = sysAgencyLeaderService.getByUserIdList(collect);
-                    for (SysAgencyLeader itemLeader : deptLeader) {
-                        String deptId = itemLeader.getDeptId();
-                        if (StringUtils.isNotEmpty(deptId)) {
-                            HashMap<String, BigDecimal> orderAmount = deptBalanceMapper.getByDeptId(deptId);
-                            if (orderAmount != null && !orderAmount.isEmpty()) {
-                                allTotalIncome = this.calculateTotal(orderAmount.get("totalIncome"), allTotalIncome, null);  // 总保费
-                                allDeptManagementFee = this.calculateTotal(orderAmount.get("deptManagementFee"), allDeptManagementFee, null);//机构管理费
-                            }
-                            SysUser sysUser = new SysUser();
-                            sysUser.setDeptId(deptId);
+                for (SysAgencyLeader itemLeader : deptLeader) {
+                    String deptId = itemLeader.getDeptId();
+                    if (StringUtils.isNotEmpty(deptId)) {
+                        String proportional = item.getProportional();
+                        HashMap<String, BigDecimal> orderAmount = deptBalanceMapper.getByDeptId(deptId);
+
+                        if (orderAmount != null && !orderAmount.isEmpty()) {
+                            allTotalIncome = this.calculateTotal(orderAmount.get("totalIncome").multiply(new BigDecimal(proportional).divide(new BigDecimal(100))), allTotalIncome, null);  // 总保费
+                            allDeptManagementFee = this.calculateTotal(orderAmount.get("deptManagementFee"), allDeptManagementFee, null);//机构管理费
+                        }
+                        SysUser sysUser = new SysUser();
+                        sysUser.setDeptId(deptId);
 //                          机构下的userId
-                            List<SysUserVO> listByDeptId = sysUserService.findListByDeptId(sysUser);
-                            List<String> institutionId = listByDeptId.stream().map(SysUserVO::getId).collect(Collectors.toList());
+                        List<SysUserVO> listByDeptId = sysUserService.findListByDeptId(sysUser);
+                        List<String> institutionId = listByDeptId.stream().map(SysUserVO::getId).collect(Collectors.toList());
 //                          已提现
-                            SysAmountAuditingVo sysAmountAuditingVo = new SysAmountAuditingVo();
-                            sysAmountAuditingVo.setUserIdList(institutionId);
-                            sysAmountAuditingVo.setAuditingStatus("3");
-                            BigDecimal withdrawn = sysAmountAuditingService.querySumAmount(sysAmountAuditingVo);
-                            allWithdrawn = this.calculateTotal(withdrawn, allWithdrawn, null);
+                        SysAmountAuditingVo sysAmountAuditingVo = new SysAmountAuditingVo();
+                        sysAmountAuditingVo.setUserIdList(institutionId);
+                        sysAmountAuditingVo.setAuditingStatus("3");
+                        BigDecimal withdrawn = sysAmountAuditingService.querySumAmount(sysAmountAuditingVo);
+                        allWithdrawn = this.calculateTotal(withdrawn, allWithdrawn, null);
 //                          未提现
-                            sysAmountAuditingVo.setAuditingStatus("2");
-                            BigDecimal notWithdrawn = sysAmountAuditingService.querySumAmount(sysAmountAuditingVo);
-                            allNotWithdrawn = this.calculateTotal(notWithdrawn, allNotWithdrawn, null);
-                        }
+                        sysAmountAuditingVo.setAuditingStatus("2");
+                        BigDecimal notWithdrawn = sysAmountAuditingService.querySumAmount(sysAmountAuditingVo);
+                        allNotWithdrawn = this.calculateTotal(notWithdrawn, allNotWithdrawn, null);
                     }
                 }
                 item.setTotalIncome(allTotalIncome);

src/main/java/com/ydtech/modules/fee/service/impl/InsFeeOrderNewHistoryServiceImpl.java

@@ -40,6 +40,7 @@ public class InsFeeOrderNewHistoryServiceImpl extends ServiceImpl<InsFeeOrderNew
     public InsFeeOrderNewHistory toInsFeeOrderNewHistory(InsFeeOrderNew insFeeOrderNew) {
         InsFeeOrderNewHistory insFeeOrderNewHistory = new InsFeeOrderNewHistory();
         BeanUtils.copyProperties(insFeeOrderNew, insFeeOrderNewHistory);
+        insFeeOrderNewHistory.setId(null);
         insFeeOrderNewHistory.setOperatorId(BaseController.getUserId());
         insFeeOrderNewHistory.setOperatorTime(new Date());
         return insFeeOrderNewHistory;

src/main/java/com/ydtech/modules/order/service/impl/InsTelemarketingOrderServiceImpl.java

@@ -117,7 +117,7 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
         String state = telemarketingQueryExpensesVo.getState();
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(telemarketingQueryExpensesVo.getSubOrderId());
         InsFeeOrderNew insFeeOrderNew = new InsFeeOrderNew();
-        if ("1".equals(state)) {
+        if ("2".equals(state)) {
             // 费用信息
             insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
             return new TelemarketingAuditOrderEditVo(insFeeOrderNew);

src/main/resources/mapper/modules/admin/DeptBalanceMapper.xml

@@ -91,20 +91,18 @@
 
     <select id="getByDeptId" resultType="java.util.HashMap">
         SELECT
-        sum(IFNULL(iac.jqpremium,0) + IFNULL(iac.sypremium,0) + IFNULL(iac.jypremium,0)) * (sal.proportional /100) as
+        sum(IFNULL(iac.jqpremium,0) + IFNULL(iac.sypremium,0) + IFNULL(iac.jypremium,0))  as
         "totalIncome",
-        sum(IFNULL(iac.jqpremium,0) + IFNULL(iac.sypremium,0) + IFNULL(iac.jypremium,0)) * (sal.proportional /100) as
+        sum(IFNULL(iac.jqpremium,0) + IFNULL(iac.sypremium,0) + IFNULL(iac.jypremium,0)) as
         "deptManagementFee"
         FROM
         ins_orders io
-        left join ins_area_company iac on iac.orderno =io.orderno
-        left join sys_agency_leader sal on sal.dept_id = iac.deptid
+        left join ins_area_company iac on iac.orderno = io.orderno
         <where>
             io.orderstatus ='3'
             and iac.orderstatus ='3'
-            and sal.del_flag ='1'
             <if test="deptId  != null  and  deptId !=''">
-                iac.deptid =#{deptId}
+               and io.deptid like CONCAT( #{deptId}, '%' )
             </if>
         </where>
     </select>