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

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

@@ -81,11 +81,10 @@ public class CommissionAddRequest implements Serializable {
     private BigDecimal exchangeRate;
 
     /**
-     * 入账日（实）
+     * 入账年月（实）
      */
-    @Schema(description = "入账日（实）", requiredMode = Schema.RequiredMode.REQUIRED, format = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date commissionDate;
+    @Schema(description = "入账年月（实）", requiredMode = Schema.RequiredMode.REQUIRED, format = "yyyy-MM")
+    private String commissionDate;
 
     /**
      * 备注

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

@@ -92,11 +92,10 @@ public class CommissionUpdateRequest implements Serializable {
     private BigDecimal exchangeRate;
 
     /**
-     * 入账日期
+     * 入账年月 yyyy-MM
      */
-    @Schema(description = "入账日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date commissionDate;
+    @Schema(description = "入账年月 yyyy-MM")
+    private String commissionDate;
 
     /**
      * 备注

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

@@ -442,6 +442,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
 
         // 更新属性
         BeanUtils.copyProperties(commissionUpdateRequest, commission, "commissionBizId");
+        // 入账年月
+        commission.setCommissionDate(DateUtil.parse(commissionUpdateRequest.getCommissionDate() + "-01"));
         if ("U".equals(commissionUpdateRequest.getCommissionBizType())) {
             commission.setPolicyNo(null);
         }
@@ -568,10 +570,10 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             CommissionEditRecord commissionRecord = getCommissionEditRecord("结算汇率", commission.getExchangeRate(), commissionUpdateRequest.getExchangeRate(), commission.getCommissionBizId(), currentLoginUser);
             commissionEditRecords.add(commissionRecord);
         }
-        String commissionDate = DateUtil.formatDate(commission.getCommissionDate());
-        String requestCommissionDate = DateUtil.formatDate(commissionUpdateRequest.getCommissionDate());
+        String commissionDate = DateUtil.format(commission.getCommissionDate(), "yyyy-MM");
+        String requestCommissionDate = commissionUpdateRequest.getCommissionDate();
         if (!Objects.equals(commissionDate, requestCommissionDate)) {
-            CommissionEditRecord commissionRecord = getCommissionEditRecord("来佣日期", commissionDate, requestCommissionDate, commission.getCommissionBizId(), currentLoginUser);
+            CommissionEditRecord commissionRecord = getCommissionEditRecord("来佣年月", commissionDate, requestCommissionDate, commission.getCommissionBizId(), currentLoginUser);
             commissionEditRecords.add(commissionRecord);
         }
         if (!Objects.equals(commission.getRemark(), commissionUpdateRequest.getRemark())) {
@@ -860,6 +862,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             Commission commission = new Commission();
             BeanUtils.copyProperties(request, commission);
 
+            // 入账年月
+            commission.setCommissionDate(DateUtil.parse(request.getCommissionDate() + "-01"));
             // 计算来佣金额（港币）
             commission.setHkdAmount(calculateHKDAmount(request.getAmount(), request.getCurrency()));
             // 入账业务id

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

@@ -171,10 +171,10 @@ public class CommissionVO implements Serializable {
     private String currency;
 
     /**
-     * 来佣日期
+     * 来佣年月 yyyy-MM
      */
-    @Schema(description = "来佣日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Schema(description = "来佣年月 yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     private Date commissionDate;
 
     /**

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

@@ -25,8 +25,8 @@
             <result property="shareRate" column="share_rate" />
             <result property="fortuneName" column="fortune_name" />
             <result property="fortuneType" column="fortune_type" />
-            <result property="amount" column="amount" />
-            <result property="currency" column="currency" />
+            <result property="ruleAmount" column="rule_amount" />
+            <result property="ruleCurrency" column="rule_currency" />
             <result property="exchangeRate" column="exchange_rate" />
             <result property="hkdAmount" column="hkd_amount" />
             <result property="currentPaymentAmount" column="current_payment_amount" />
@@ -55,7 +55,7 @@
         id,fortune_biz_id,expected_fortune_biz_id,payable_no,reconciliation_year_month,fortune_biz_type,batch_biz_id,
         commission_biz_id,commission_expected_biz_id,policy_no,policy_currency,fortune_period,fortune_total_period,broker_biz_id,
         team_biz_id,grade_commission_rate,share_rate,fortune_name,fortune_type,is_part,
-        amount,currency,exchange_rate,hkd_amount,current_payment_amount,current_payment_hkd_amount,current_payment_ratio,status,payout_date,actual_payout_date,is_tax,
+        rule_amount,rule_currency,exchange_rate,hkd_amount,current_payment_amount,current_payment_hkd_amount,current_payment_ratio,status,payout_date,actual_payout_date,is_tax,
         tax_amount,net_amount,salary_biz_id,base_rule_biz_id,settlement_biz_id,reconciliation_operator,
         calculation_formula,remark,is_deleted,creator_id,updater_id,
         create_time,update_time
@@ -71,7 +71,17 @@
                 from expected_fortune where status = '0' and policy_no = f.policy_no
                 ),0) AS pendingOutAmount,
             IFNULL(SUM(CASE WHEN f.status in ('6','1') THEN f.current_payment_hkd_amount ELSE 0 END),0) AS availableOutAmount,
-            COUNT(DISTINCT f.policy_no) AS totalPolicyCount
+            (SELECT COUNT(DISTINCT f2.policy_no)
+             FROM fortune f2
+             WHERE 1 = 1
+             <if test="fortuneIdList != null and fortuneIdList.size() > 0">
+                 AND f2.id IN
+                 <foreach collection="fortuneIdList" item="fortuneId" open="(" close=")" separator=",">
+                     #{fortuneId}
+                 </foreach>
+             </if>
+             AND f2.is_part in (0,1)
+            ) AS totalPolicyCount
         FROM fortune f
         WHERE 1 = 1
         <if test="fortuneIdList != null and fortuneIdList.size() > 0">