基本法 - 算法接口

yd-csf-api/src/main/java/com/yd/csf/api/dto/AlgorithmDto.java

 package com.yd.csf.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -17,6 +16,11 @@ import java.util.List;
 public class AlgorithmDto {
 
     /**
+     * 保单发佣批次ID
+     */
+    private String batchBizId;
+
+    /**
      * 转介人业务ID（客户端用户表唯一业务ID）
      */
     private String brokerBizId;

yd-csf-api/src/main/java/com/yd/csf/api/dto/AlgorithmResDto.java

 package com.yd.csf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -23,12 +24,18 @@ public class AlgorithmResDto {
     private String ruleItemBizId;
 
     /**
+     * 基本法项目名称
+     */
+    private String itemName;
+
+    /**
      * 计算值 - sqlAlgorithmResultDtoList集合里面的计算值和值
      */
     private BigDecimal calculatedValue;
 
     /**
      * 当前变量绑定的SQL模板计算结果集合列表（含计算值，以及计算值的提供者等等）（sql语句返回多个值作为算子计算）
+     * SQL计算结果按照积分贡献者或者其他维度分组的集合计算结果列表
      */
     private List<SqlAlgorithmResultDto> sqlAlgorithmResultDtoList;
 }

yd-csf-api/src/main/java/com/yd/csf/api/dto/ExecuteBillingDto.java

+package com.yd.csf.api.dto;
+
+import com.yd.csf.service.model.Commission;
+import com.yd.csf.service.model.Policy;
+import com.yd.csf.service.model.PolicyBroker;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ExecuteBillingDto {
+
+    private PolicyBroker policyBroker;
+
+    private Policy policy;
+
+    private Commission commission;
+
+    private String batchBizId;
+}

yd-csf-api/src/main/java/com/yd/csf/api/dto/GenerateFortuneDto.java

+package com.yd.csf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class GenerateFortuneDto {
+
+    /**
+     * 保单发佣批次ID
+     */
+    private String batchBizId;
+
+    /**
+     * 保单发佣业务id
+     */
+    private String fortuneBizId;
+
+    /**
+     * 保单号
+     */
+    private String policyNo;
+
+    /**
+     * 发佣期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
+     */
+    private Integer fortunePeriod;
+
+    /**
+     * 发佣总期数
+     */
+    private Integer fortuneTotalPeriod;
+
+    /**
+     * 转介人
+     */
+    private String broker;
+
+    /**
+     * 转介人业务ID
+     */
+    private String brokerBizId;
+
+    /**
+     * 所属团队
+     */
+    private String team;
+
+    /**
+     * 所属团队业务ID
+     */
+    private String teamBizId;
+
+    /**
+     * 来佣名称
+     */
+    private String fortuneName;
+
+    /**
+     * 发佣类型
+     */
+    private String fortuneType;
+
+    /**
+     * 发佣金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 发佣币种
+     */
+    private String currency;
+
+    /**
+     * 佣金发放状态 0=待出账 1=可出账 2=已出账
+     */
+    private String status;
+
+    /**
+     * 发佣日期
+     */
+    private Date payoutDate;
+
+    /**
+     * 基本法项目配置表唯一业务ID
+     */
+    private String ruleItemBizId;
+
+    /**
+     * 转介人绑定的基本法列表对应计算值
+     */
+    private List<AlgorithmResDto> algorithmResDtoList;
+}

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAgentDetailFycServiceImpl.java

@@ -65,8 +65,8 @@ public class ApiAgentDetailFycServiceImpl implements ApiAgentDetailFycService {
                         agentDetailFyc.setRuleItemBizId(algorithmResDto.getRuleItemBizId());
                         //保单发佣批次ID
                         agentDetailFyc.setBatchBizId(dto.getBatchBizId());
-                        //积分提供保单表唯一业务ID
-                        agentDetailFyc.setPolicyBizId(dto.getPolicyBizId());
+                        //积分提供的保单号
+                        agentDetailFyc.setPolicyNo(dto.getPolicyNo());
                         //积分提供者（客户端用户表唯一业务ID）
                         agentDetailFyc.setProvideId(sqlAlgorithmResultDto.getProvider());
                         agentDetailFycList.add(agentDetailFyc);
@@ -89,8 +89,8 @@ public class ApiAgentDetailFycServiceImpl implements ApiAgentDetailFycService {
                     agentDetailFyc.setRuleItemBizId(algorithmResDto.getRuleItemBizId());
                     //保单发佣批次ID
                     agentDetailFyc.setBatchBizId(dto.getBatchBizId());
-                    //积分提供保单表唯一业务ID
-                    agentDetailFyc.setPolicyBizId(dto.getPolicyBizId());
+                    //积分提供的保单号
+                    agentDetailFyc.setPolicyNo(dto.getPolicyNo());
                     //积分提供者（客户端用户表唯一业务ID）
 //                    agentDetailFyc.setProvideId(sqlAlgorithmResultDto.getProvider());
                     agentDetailFycList.add(agentDetailFyc);

yd-csf-service/src/main/java/com/yd/csf/service/dto/QueryPolicyDto.java

+package com.yd.csf.service.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class QueryPolicyDto {
+
+    /**
+     * 保单号列表
+     */
+    private List<String> policyNoList;
+}

yd-csf-service/src/main/java/com/yd/csf/service/model/Fortune.java

@@ -146,6 +146,11 @@ public class Fortune implements Serializable {
     private String calculationFormula;
 
     /**
+     * 基本法项目配置表唯一业务ID
+     */
+    private String ruleItemBizId;
+
+    /**
      * 通用备注
      */
     private String remark;

yd-csf-service/src/main/java/com/yd/csf/service/service/PolicyService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.service.dto.PolicyDto;
 import com.yd.csf.service.dto.PolicyQueryRequest;
 import com.yd.csf.service.dto.PolicyUpdateRequest;
+import com.yd.csf.service.dto.QueryPolicyDto;
 import com.yd.csf.service.model.Policy;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yd.csf.service.vo.PolicyVO;
@@ -25,5 +26,5 @@ public interface PolicyService extends IService<Policy> {
     Boolean updatePolicy(PolicyUpdateRequest policyUpdateRequest);
 
 
-    List<Policy> queryList(PolicyDto dto);
+    List<Policy> queryList(QueryPolicyDto dto);
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyServiceImpl.java

@@ -10,6 +10,7 @@ import com.yd.common.exception.BusinessException;
 import com.yd.csf.service.dto.PolicyDto;
 import com.yd.csf.service.dto.PolicyQueryRequest;
 import com.yd.csf.service.dto.PolicyUpdateRequest;
+import com.yd.csf.service.dto.QueryPolicyDto;
 import com.yd.csf.service.model.AppointmentFile;
 import com.yd.csf.service.model.Policy;
 import com.yd.csf.service.service.PolicyPolicyholderService;
@@ -106,7 +107,7 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
      * @return
      */
     @Override
-    public List<Policy> queryList(PolicyDto dto) {
+    public List<Policy> queryList(QueryPolicyDto dto) {
         List<Policy> list = baseMapper.selectList(new LambdaQueryWrapper<Policy>()
                 .in(!CollectionUtils.isEmpty(dto.getPolicyNoList()),Policy::getPolicyNo,dto.getPolicyNoList())
         );