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

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

@@ -25,11 +25,14 @@ public class FortuneAccountExportDTO implements Serializable {
 
     private String teamBizId;
 
-    @ExcelProperty("出账币种")
-    private String currency;
+    @ExcelProperty("发放币种")
+    private String payoutCurrency;
 
-    @ExcelProperty("出账总额")
-    private BigDecimal amount;
+    @ExcelProperty("发放金额")
+    private BigDecimal payoutAmount;
+
+    @ExcelProperty("出账港币总额")
+    private BigDecimal hkdAmount;
 
     private List<Fortune> fortuneList;
 

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

@@ -54,17 +54,17 @@ public class FortuneAccount implements Serializable {
     private String teamBizId;
 
     /**
-     * 出账币种
+     * 发放币种
      */
-    private String currency;
+    private String payoutCurrency;
 
     /**
-     * 出账总额
+     * 发放金额
      */
-    private BigDecimal amount;
+    private BigDecimal payoutAmount;
 
     /**
-     * 港币出账金额
+     * 港币金额
      */
     private BigDecimal hkdAmount;
 

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

@@ -167,8 +167,9 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
             fortuneAccount.setBrokerBizId(accountExportDTO.getBrokerBizId());
             fortuneAccount.setTeam(accountExportDTO.getTeam());
             fortuneAccount.setTeamBizId(accountExportDTO.getTeamBizId());
-            fortuneAccount.setCurrency(accountExportDTO.getCurrency());
-            fortuneAccount.setHkdAmount(accountExportDTO.getAmount());
+            fortuneAccount.setPayoutCurrency(accountExportDTO.getPayoutCurrency());
+            fortuneAccount.setPayoutAmount(accountExportDTO.getPayoutAmount());
+            fortuneAccount.setHkdAmount(accountExportDTO.getHkdAmount());
             fortuneAccount.setFortuneAccountDate(this.getActualPayoutDate(accountExportDTO.getActualPayoutDate()));
             // 出账状态默认待出账
             fortuneAccount.setStatus(FortuneStatusEnum.CHECKED.getItemValue());

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

@@ -431,7 +431,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                 for (Map.Entry<String, List<Fortune>> entry : fortuneMap.entrySet()) {
                     String broker = entry.getKey().split("_")[0];
                     String actualPayoutDate = entry.getKey().split("_")[1];
-                    String currency = entry.getKey().split("_")[2];
+                    String payoutCurrency = entry.getKey().split("_")[2];
                     List<Fortune> brokerFortunes = entry.getValue();
 
                     FortuneAccountExportDTO accountDTO = new FortuneAccountExportDTO();
@@ -443,15 +443,19 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                     if (CollUtil.isNotEmpty(brokerFortunes)) {
                         accountDTO.setTeam(brokerFortunes.get(0).getTeam());
                         accountDTO.setTeamBizId(brokerFortunes.get(0).getTeamBizId());
-                        accountDTO.setCurrency(currency);
+                        accountDTO.setPayoutCurrency(payoutCurrency);
                         accountDTO.setActualPayoutDate(LocalDate.parse(actualPayoutDate));
                     }
 
-                    // 计算出账总额
-                    BigDecimal totalAmount = brokerFortunes.stream()
-                            .map(Fortune::getCurrentPaymentHkdAmount)
-                            .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    accountDTO.setAmount(totalAmount);
+                    // 计算出账港币总额、发放币种总额
+                    BigDecimal totalHkdAmount = BigDecimal.ZERO;
+                    BigDecimal totalPayoutAmount = BigDecimal.ZERO;
+                    for (Fortune fortune : brokerFortunes) {
+                        totalHkdAmount = totalHkdAmount.add(fortune.getCurrentPaymentHkdAmount());
+                        totalPayoutAmount = totalPayoutAmount.add(fortune.getPayoutAmount());
+                    }
+                    accountDTO.setHkdAmount(totalHkdAmount);
+                    accountDTO.setPayoutAmount(totalPayoutAmount);
 
                     // 按fortune项目分组并累加金额
                     Map<String, BigDecimal> fortuneAmountMap = brokerFortunes.stream()

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

@@ -11,8 +11,8 @@
             <result property="brokerBizId" column="broker_biz_id" />
             <result property="team" column="team" />
             <result property="teamBizId" column="team_biz_id" />
-            <result property="currency" column="currency" />
-            <result property="amount" column="amount" />
+            <result property="payoutCurrency" column="payout_currency" />
+            <result property="payoutAmount" column="payout_amount" />
             <result property="hkdAmount" column="hkd_amount" />
             <result property="status" column="status" />
             <result property="fortuneAccountDate" column="fortune_account_date" />
@@ -27,7 +27,7 @@
 
     <sql id="Base_Column_List">
         id,fortune_account_biz_id,broker,broker_biz_id,team,team_biz_id,
-        currency,amount,hkd_amount,status,fortune_account_date,content,remark,
+        payout_currency,payout_amount,hkd_amount,status,fortune_account_date,content,remark,
         is_deleted,creator_id,updater_id,create_time,update_time
     </sql>
 </mapper>