薪资管理-出账金额

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

@@ -49,6 +49,11 @@ public class FortuneAccount implements Serializable {
     private BigDecimal amount;
     private BigDecimal amount;
 
 
     /**
     /**
+     * 港币出账金额
+     */
+    private BigDecimal hkdAmount;
+
+    /**
      * 出账状态 可出账、待出账、已出账
      * 出账状态 可出账、待出账、已出账
      */
      */
     private String status;
     private String status;

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

@@ -124,7 +124,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
             fortuneAccount.setBroker(accountExportDTO.getBroker());
             fortuneAccount.setBroker(accountExportDTO.getBroker());
             fortuneAccount.setTeam(accountExportDTO.getTeam());
             fortuneAccount.setTeam(accountExportDTO.getTeam());
             fortuneAccount.setCurrency(accountExportDTO.getCurrency());
             fortuneAccount.setCurrency(accountExportDTO.getCurrency());
-            fortuneAccount.setAmount(accountExportDTO.getAmount());
+            fortuneAccount.setHkdAmount(accountExportDTO.getAmount());
             fortuneAccount.setFortuneAccountDate(currentDate);
             fortuneAccount.setFortuneAccountDate(currentDate);
             // 出账状态默认待出账
             // 出账状态默认待出账
             fortuneAccount.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
             fortuneAccount.setStatus(FortuneStatusEnum.CHECKED.getItemValue());

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

@@ -402,7 +402,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
 
 
                     // 计算出账总额
                     // 计算出账总额
                     BigDecimal totalAmount = brokerFortunes.stream()
                     BigDecimal totalAmount = brokerFortunes.stream()
-                            .map(Fortune::getCurrentPaymentAmount)
+                            .map(Fortune::getCurrentPaymentHkdAmount)
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
                     accountDTO.setAmount(totalAmount);
                     accountDTO.setAmount(totalAmount);
 
 
@@ -410,7 +410,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                     Map<String, BigDecimal> fortuneAmountMap = brokerFortunes.stream()
                     Map<String, BigDecimal> fortuneAmountMap = brokerFortunes.stream()
                             .collect(Collectors.groupingBy(
                             .collect(Collectors.groupingBy(
                                     Fortune::getFortuneName,
                                     Fortune::getFortuneName,
-                                    Collectors.reducing(BigDecimal.ZERO, Fortune::getCurrentPaymentAmount, BigDecimal::add)
+                                    Collectors.reducing(BigDecimal.ZERO, Fortune::getCurrentPaymentHkdAmount, BigDecimal::add)
                             ));
                             ));
 
 
                     // 设置各个fortune项目的金额
                     // 设置各个fortune项目的金额

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

@@ -8,6 +8,10 @@
             <id property="id" column="id" />
             <id property="id" column="id" />
             <result property="fortuneAccountBizId" column="fortune_account_biz_id" />
             <result property="fortuneAccountBizId" column="fortune_account_biz_id" />
             <result property="broker" column="broker" />
             <result property="broker" column="broker" />
+            <result property="currency" column="currency" />
+            <result property="amount" column="amount" />
+            <result property="hkdAmount" column="hkd_amount" />
+            <result property="status" column="status" />
             <result property="fortuneAccountDate" column="fortune_account_date" />
             <result property="fortuneAccountDate" column="fortune_account_date" />
             <result property="content" column="content" />
             <result property="content" column="content" />
             <result property="remark" column="remark" />
             <result property="remark" column="remark" />
@@ -19,7 +23,7 @@
     </resultMap>
     </resultMap>
 
 
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
-        id,fortune_account_biz_id,broker,fortune_account_date,content,remark,
+        id,fortune_account_biz_id,broker,currency,amount,hkd_amount,status,fortune_account_date,content,remark,
         is_deleted,creator_id,updater_id,create_time,update_time
         is_deleted,creator_id,updater_id,create_time,update_time
     </sql>
     </sql>
 </mapper>
 </mapper>