Fna接口58

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

@@ -18,6 +18,9 @@ public class FortuneAccountExportDTO implements Serializable {
     @ExcelProperty("所属团队")
     @ExcelProperty("所属团队")
     private String team;
     private String team;
 
 
+    @ExcelProperty("出账币种")
+    private String currency;
+
     @ExcelProperty("出账总额")
     @ExcelProperty("出账总额")
     private BigDecimal amount;
     private BigDecimal amount;
 
 

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

@@ -38,6 +38,11 @@ public class FortuneAccount implements Serializable {
     private String team;
     private String team;
 
 
     /**
     /**
+     * 出账币种
+     */
+    private String currency;
+
+    /**
      * 出账总额
      * 出账总额
      */
      */
     private BigDecimal amount;
     private BigDecimal amount;

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

@@ -87,6 +87,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
             fortuneAccount.setFortuneAccountBizId(RandomStringGenerator.generateBizId16("fortune_account"));
             fortuneAccount.setFortuneAccountBizId(RandomStringGenerator.generateBizId16("fortune_account"));
             fortuneAccount.setBroker(accountExportDTO.getBroker());
             fortuneAccount.setBroker(accountExportDTO.getBroker());
             fortuneAccount.setTeam(accountExportDTO.getTeam());
             fortuneAccount.setTeam(accountExportDTO.getTeam());
+            fortuneAccount.setCurrency(accountExportDTO.getCurrency());
             fortuneAccount.setAmount(accountExportDTO.getAmount());
             fortuneAccount.setAmount(accountExportDTO.getAmount());
             fortuneAccount.setFortuneAccountDate(currentDate);
             fortuneAccount.setFortuneAccountDate(currentDate);
             // 出账状态默认待出账
             // 出账状态默认待出账

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

@@ -185,6 +185,8 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                 List<List<String>> head = new ArrayList<>();
                 List<List<String>> head = new ArrayList<>();
                 head.add(Collections.singletonList("转介人"));
                 head.add(Collections.singletonList("转介人"));
                 head.add(Collections.singletonList("所属团队"));
                 head.add(Collections.singletonList("所属团队"));
+                head.add(Collections.singletonList("出账币种"));
+                head.add(Collections.singletonList("出账总额"));
 
 
                 // 添加所有fortune项目作为表头
                 // 添加所有fortune项目作为表头
                 for (String fortuneName : allFortuneNames) {
                 for (String fortuneName : allFortuneNames) {

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

@@ -32,6 +32,12 @@ public class FortuneAccountVO {
     private String team;
     private String team;
 
 
     /**
     /**
+     * 出账币种
+     */
+    @Schema(description = "出账币种")
+    private String currency;
+
+    /**
      * 出账总额
      * 出账总额
      */
      */
     @Schema(description = "出账总额")
     @Schema(description = "出账总额")