Merge branch 'refs/heads/test_zjn' into test

# Conflicts:
#	yd-csf-service/src/main/java/com/yd/csf/service/model/ExpectedFortune.java

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

@@ -115,6 +115,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
     private FeignResultHelper feignResultHelper;
     @Resource
     private ApiAnnouncementCommissionRatioFeignClient ratioFeignClient;
+    @Resource
+    private FortuneService fortuneService;
 
     @Autowired
     private ApiCommissionConditionService apiCommissionConditionService;
@@ -480,19 +482,28 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
             log.info("结算汇率：{}", exchangeRate);
 
             for (ExpectedFortune expectedFortune : expectedFortuneList) {
-                //设置保单币种
-                expectedFortune.setRuleCurrency(currency);
-                //设置默认保单币种 -> 港币汇率
-                expectedFortune.setDefaultExchangeRate(exchangeRate);
-                //设置港币金额（标准发佣金额 * 默认保单币种 -> 港币汇率）
-                expectedFortune.setHkdAmount(expectedFortune.getRuleAmount().multiply(exchangeRate));
+                ExpectedFortune updateObj = new ExpectedFortune();
+                updateObj.setId(expectedFortune.getId());
+
+                //原币种
+                updateObj.setOriginalCurrency(currency);
+                //原币种金额
+                updateObj.setOriginalAmount(expectedFortune.getRuleAmount());
+                //原币种 -> 港币汇率
+                updateObj.setOriginalToHkdRate(exchangeRate);
+                //保单币种
+                updateObj.setRuleCurrency(currency);
+                //默认保单币种 -> 港币汇率
+                updateObj.setDefaultExchangeRate(exchangeRate);
+                //港币金额（标准发佣金额 * 默认保单币种 -> 港币汇率）
+                updateObj.setHkdAmount(expectedFortune.getRuleAmount().multiply(exchangeRate));
                 //默认值
-                expectedFortune.setPaidAmount(BigDecimal.ZERO);
-                expectedFortune.setPaidRatio(BigDecimal.ZERO);
-                expectedFortune.setUnpaidAmount(expectedFortune.getHkdAmount());
-                expectedFortune.setUnpaidRatio(BigDecimal.valueOf(100));
+                updateObj.setPaidAmount(BigDecimal.ZERO);
+                updateObj.setPaidRatio(BigDecimal.ZERO);
+                updateObj.setUnpaidAmount(expectedFortune.getHkdAmount());
+                updateObj.setUnpaidRatio(BigDecimal.valueOf(100));
 
-                iExpectedFortuneService.updateById(expectedFortune);
+                iExpectedFortuneService.updateById(updateObj);
             }
         }
     }
@@ -622,18 +633,25 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         //获取当前序号作为起点
         int currentSeq = 0;
         if (!Objects.isNull(latest)) {
-            currentSeq = Integer.parseInt(latest.getPayableNo().substring(12));
+            String payableNo = latest.getPayableNo();
+            currentSeq = Integer.parseInt(payableNo.substring(payableNo.length() - 6));
         }
 
         //批量更新应付款编号，每个item递增
         ExpectedFortune expectedFortune;
+        List<ExpectedFortune> updateList = new ArrayList<>();
         for (int i = 0; i < expectedFortuneList.size(); i++) {
             expectedFortune = expectedFortuneList.get(i);
-            expectedFortune.setPayableNo(this.createPayableNo("R", currentSeq + i + 1));
-            expectedFortune.setFortuneType(GetDictItemListByDictTypeResponse.getItemValue(dictTypeResponses,
+
+            ExpectedFortune updateObj = new ExpectedFortune();
+            updateObj.setId(expectedFortune.getId());
+            updateObj.setPayableNo(this.createPayableNo("R", currentSeq + i + 1));
+            updateObj.setFortuneType(GetDictItemListByDictTypeResponse.getItemValue(dictTypeResponses,
                     "csf_fortune_type", expectedFortune.getFortuneName()));
+
+            updateList.add(updateObj);
         }
-        iExpectedFortuneService.updateBatchById(expectedFortuneList);
+        iExpectedFortuneService.updateBatchById(updateList);
 
         return expectedFortuneList;
     }
@@ -876,6 +894,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                     fortune.setRuleAmount(standardAmount);
                 }
 
+                // 创建人
+                fortune.setCreatorName("系统生成");
+
                 fortuneList.add(fortune);
             }
         }
@@ -898,6 +919,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         List<ExpectedFortune> fortuneList = iExpectedFortuneService.list(queryWrapper);
         ExpectedFortuneStatisticsVO statisticsVO = this.getStatistics(fortuneList.stream().map(ExpectedFortune::getId).collect(Collectors.toList()));
 
+        // 查询实际发佣列表
+        List<Fortune> expectedFortuneList = fortuneService.list();
+
         // 组装返回结果
         ApiExpectedFortunePageResponseVO response = new ApiExpectedFortunePageResponseVO();
         response.setStatisticsVO(statisticsVO);

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

@@ -281,13 +281,13 @@ public class ExpectedFortune implements Serializable {
     /**
      * 创建人ID
      */
-    @TableField(value = "creator_id", fill = FieldFill.INSERT)
+    @TableField(value = "creator_id")
     private String creatorId;
 
     /**
      * 创建人名称
      */
-    @TableField(value = "creator_name", fill = FieldFill.INSERT)
+    @TableField(value = "creator_name")
     private String creatorName;
 
     /**

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

@@ -192,7 +192,8 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
         //获取当前序号作为起点
         int currentSeq = 0;
         if (!Objects.isNull(latest)) {
-            currentSeq = Integer.parseInt(latest.getPayableNo().substring(12));
+            String payableNo = latest.getPayableNo();
+            currentSeq = Integer.parseInt(payableNo.substring(payableNo.length() - 6));
         }
 
         return currentSeq;

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

@@ -931,6 +931,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             newExpectedFortune.setRemark(expectedRemark);
 
             newExpectedFortune.setCreatorId(loginUserId);
+            newExpectedFortune.setCreatorName(username);
             newExpectedFortune.setCreateTime(localDateTime);
             newExpectedFortune.setUpdaterId(loginUserId);
             newExpectedFortune.setUpdateTime(localDateTime);