Merge remote-tracking branch 'origin/test' into test

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

@@ -611,6 +611,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
             return queryWrapper;
         }
         // 获取参数
+        String payableNo = request.getPayableNo();
         String policyNo = request.getPolicyNo();
         LocalDate payoutDateStart = request.getPayoutDateStart();
         LocalDate payoutDateEnd = request.getPayoutDateEnd();
@@ -626,6 +627,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         String fortuneBizType = request.getFortuneBizType();
 
         // 按保单号模糊查询
+        queryWrapper.eq(ObjectUtils.isNotEmpty(payableNo), "payable_no", payableNo);
         queryWrapper.like(StringUtils.isNotBlank(policyNo), "policy_no", policyNo);
         queryWrapper.gt(ObjectUtils.isNotEmpty(payoutDateStart), "payout_date", payoutDateStart);
         queryWrapper.lt(ObjectUtils.isNotEmpty(payoutDateEnd), "payout_date", payoutDateEnd);

yd-csf-feign/src/main/java/com/yd/csf/feign/request/expectedfortune/ApiExpectedFortunePageRequest.java

@@ -10,6 +10,12 @@ import java.util.List;
 @Data
 public class ApiExpectedFortunePageRequest extends PageDto {
     /**
+     * 应付款编号
+     */
+    @Schema(description = "应付款编号")
+    private String payableNo;
+
+    /**
      * 保单号
      */
     @Schema(description = "保单号")

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

@@ -11,6 +11,12 @@ import java.util.List;
 @Data
 public class CommissionExpectedQueryRequest extends PageDto {
     /**
+     * 应收款编号
+     */
+    @Schema(description = "应收款编号")
+    private String receivableNo;
+
+    /**
      * 保单号
      */
     @Schema(description = "保单号")

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

@@ -174,6 +174,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
             return queryWrapper;
         }
         // 获取查询参数
+        String receivableNo = commissionExpectedQueryRequest.getReceivableNo();
         String policyNo = commissionExpectedQueryRequest.getPolicyNo();
         String commissionType = commissionExpectedQueryRequest.getCommissionType();
         List<String> insurerCompanyBizIdList = commissionExpectedQueryRequest.getInsurerCompanyBizIdList();
@@ -186,6 +187,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         String commissionBizType = commissionExpectedQueryRequest.getCommissionBizType();
         String teamBizId = commissionExpectedQueryRequest.getTeamBizId();
         // 精确查询
+        queryWrapper.eq(ObjectUtils.isNotEmpty(receivableNo), "receivable_no", receivableNo);
         queryWrapper.eq(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
         queryWrapper.eq(ObjectUtils.isNotEmpty(commissionType), "commission_type", commissionType);
         queryWrapper.in(ObjectUtils.isNotEmpty(insurerCompanyBizIdList), "insurance_company_biz_id", insurerCompanyBizIdList);

yd-csf-service/src/main/java/com/yd/csf/service/vo/ReceivableReportVO.java

@@ -13,6 +13,12 @@ import java.time.LocalDate;
 @Data
 public class ReceivableReportVO {
     /**
+     * 应收款编号
+     */
+    @Schema(description = "应收款编号")
+    private String receivableNo;
+
+    /**
      * 保单号
      */
     @Schema(description = "保单号")
@@ -56,6 +62,12 @@ public class ReceivableReportVO {
     private BigDecimal amount;
 
     /**
+     * 入账币种
+     */
+    @Schema(description = "入账币种")
+    private String currency;
+
+    /**
      * 预估入账金额（港币）
      */
     @Schema(description = "预估入账金额（港币）")

yd-csf-service/src/main/resources/mappers/CommissionExpectedMapper.xml

@@ -67,6 +67,7 @@
 
     <select id="receivableReportPage" resultType="com.yd.csf.service.vo.ReceivableReportVO">
         select
+            null as receivableNo,
             ce.policy_no as policyNo,
             ce.reconciliation_company as reconciliationCompany,
             ce.commission_period as commissionPeriod,
@@ -74,6 +75,7 @@
             DATE_ADD(DATE_ADD(p.effective_date, INTERVAL 2 MONTH), INTERVAL (ce.commission_period - 1) YEAR) as commissionDate,
             ifnull(avg(ce.commission_ratio), 0) as commissionRatio,
             ifnull(sum(ce.amount), 0) as amount,
+            ce.currency as currency,
             ifnull(sum(ce.expected_amount), 0) as hkdAmount,
             ifnull(sum(ce.paid_amount), 0) as paidAmount,
             ifnull(sum(ce.expected_amount) - sum(ce.paid_amount), 0) as unpaidAmount,
@@ -93,8 +95,9 @@
         from commission_expected ce
         left join policy p on ce.policy_no = p.policy_no
         <where>
+            ce.commission_biz_type = 'R'
             <if test="expectedIds != null and expectedIds.size > 0">
-                ce.id in
+                and ce.id in
                 <foreach collection="expectedIds" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
@@ -102,6 +105,44 @@
             and ce.is_deleted = 0
         </where>
         group by ce.policy_no, ce.commission_period
-        order by ce.policy_no, ce.commission_period
+        union all
+        select
+            ce.receivable_no as receivableNo,
+            ce.policy_no as policyNo,
+            ce.reconciliation_company as reconciliationCompany,
+            ce.commission_period as commissionPeriod,
+            ce.total_period as totalPeriod,
+            ce.commission_date as commissionDate,
+            null as commissionRatio,
+            ifnull(ce.amount, 0) as amount,
+            ce.currency as currency,
+            ifnull(ce.expected_amount, 0) as hkdAmount,
+            ifnull(ce.paid_amount, 0) as paidAmount,
+            ifnull(ce.expected_amount - ce.paid_amount, 0) as unpaidAmount,
+            case when ifnull(ce.expected_amount, 0) > 0
+                then round(ifnull(ce.paid_amount, 0) / ifnull(ce.expected_amount, 0) * 100, 2)
+                else 0
+            end as paidRatio,
+            case when ifnull(ce.expected_amount, 0) > 0
+                then round((ifnull(ce.expected_amount, 0) - ifnull(ce.paid_amount, 0)) / ifnull(ce.expected_amount, 0) * 100, 2)
+                else 0
+            end as unpaidRatio,
+            ce.default_exchange_rate as exchangeRate,
+            p.insurance_company as insuranceCompany,
+            p.product_name as productName,
+            ifnull(ce.premium, 0) as premium,
+            null as policyCurrency
+        from commission_expected ce
+        left join policy p on ce.policy_no = p.policy_no
+        <where>
+            ce.commission_biz_type = 'U'
+            <if test="expectedIds != null and expectedIds.size > 0">
+                and ce.id in
+                <foreach collection="expectedIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            and ce.is_deleted = 0
+        </where>
     </select>
 </mapper>