Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-taiping/src/main/java/com/jzg/quotation/taiping/crawler/entity/request/TaiPingCrawlerPremiumCalculateRequest.java

@@ -2090,7 +2090,7 @@ public class TaiPingCrawlerPremiumCalculateRequest {
         @JsonProperty("shortRate")
         private Integer shortRate;
         @JsonProperty("discount")
-        private Integer discount;
+        private Double discount;
         @JsonProperty("adjustRate")
         private Integer adjustRate;
         @JsonProperty("noChange")
@@ -2118,7 +2118,7 @@ public class TaiPingCrawlerPremiumCalculateRequest {
                 kind.setKindInd(kindCodeEnum.getKindInd());
                 kind.setKindCode(kindCode);
                 kind.setShortRate(100);
-                kind.setDiscount(100);
+                kind.setDiscount(100.00);
                 kind.setAdjustRate(100);
                 kind.setRelatedInd("0");
                 kind.setRelatedFlagFG2020("0");

tenant/insurance/quotation-taiping/src/main/java/com/jzg/quotation/taiping/crawler/service/impl/TaipingCrawlerRequestImpl.java

@@ -467,7 +467,7 @@ public class TaipingCrawlerRequestImpl implements TaipingCrawlerRequest {
         if (taiPingCrawlerPremiumCalculateRequest.getPfItemKind0802DtoList() != null && !taiPingCrawlerPremiumCalculateRequest.getPfItemKind0802DtoList().isEmpty()) {
             taiPingCrawlerPremiumCalculateRequest.getPfItemKind0802DtoList().stream()
                     .forEach(pfItemKind0802Dto -> {
-                        pfItemKind0802Dto.setDiscount(recalculateResponse.getData().getPfItemKindDto0802List().stream().filter(dto -> dto.getKindCode().equals(pfItemKind0802Dto.getKindCode())).findFirst().map(TaiPingCrawlerPremiumCalculateData.PfItemKindDto0802ListDTO::getDiscount).orElse(100.0).intValue());
+                        pfItemKind0802Dto.setDiscount(recalculateResponse.getData().getPfItemKindDto0802List().stream().filter(dto -> dto.getKindCode().equals(pfItemKind0802Dto.getKindCode())).findFirst().map(TaiPingCrawlerPremiumCalculateData.PfItemKindDto0802ListDTO::getDiscount).orElse(100.0));
                     });
         }
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -522,6 +522,13 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     public String exportYwyIORecs(YwyIOParam ywyIOParam) {
         log.info("导出业务员收支明细：ywyIOParam=[{}]", JSONUtil.toJsonStr(ywyIOParam));
         List<SysUserAccountChangeLog> changeLogs = sysUserAccountIncomeLogService.queryYwyIORecs(ywyIOParam);
+        for (SysUserAccountChangeLog changeLog : changeLogs) {
+            // 提现驳回的时候，金额设置为0
+            if("4".equals(String.valueOf(changeLog.getOperType()))){
+                changeLog.setRemark("提现驳回" + changeLog.getAmount());
+                changeLog.setAmount(BigDecimal.ZERO);
+            }
+        }
         log.info("导出业务员收支明细：ywyIOParam=[{}].导出[{}]条记录", JSONUtil.toJsonStr(ywyIOParam), CollUtil.size(changeLogs));
         String userName=null;
         if(CollUtil.isNotEmpty(changeLogs)){