1.掌柜财务结算bug

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -3000,6 +3000,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
                     byBxLicenseno.setCommissionFeerate(this.calculateTotal(jqSuperviseCostsProportion,sySuperviseCostsProportion,noSuperviseCostsProportion));
 
                     byBxLicenseno.setAllFeeValue(this.calculateTotal(byBxLicenseno.getOtherFeevalue(),byBxLicenseno.getCommissionFeevalue(),null));
+                    byBxLicenseno.setReceivableAmount(this.calculateTotal(byBxLicenseno.getOtherFeevalue(),byBxLicenseno.getCommissionFeevalue(),null));
 
                     byBxLicenseno.setJqReceivableProportion(this.calculateTotal(jqSuperviseCostsProportion,jqOtherCostsProportion,null));
                     byBxLicenseno.setSyReceivableProportion(this.calculateTotal(sySuperviseCostsProportion,syOtherCostsProportion,null));

src/main/java/com/ydtech/modules/ins/model/vo/res/BxOtherDetailsNorExcel.java

@@ -57,6 +57,6 @@ public class BxOtherDetailsNorExcel {
 
     @ApiModelProperty("跟单费金额")
     @ExcelProperty(value = "跟单费金额",index = 9)
-    private BigDecimal noOtherCostsPremium;
+    private BigDecimal otherFeevalue;
 
 }

src/main/java/com/ydtech/modules/ins/model/vo/res/SettlementFeesExcel.java

@@ -139,7 +139,7 @@ public class SettlementFeesExcel implements Serializable {
 
     @ApiModelProperty("应收金额")
     @ExcelProperty("应收金额")
-    private BigDecimal receivableAmount;
+    private BigDecimal allFeeValue;
 
     @ExcelProperty(value = "创建日期", converter = DateConverter.class)
     @ApiModelProperty(value = "创建日期")

src/main/java/com/ydtech/modules/inv/utils/CheckInsPlyComeUtils.java

@@ -284,15 +284,12 @@ public class CheckInsPlyComeUtils {
     }
 
     private static String pareTimeLocalDate(String signDate) {
-        DateTimeFormatter originalFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter originalFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter targetFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-        // 解析原始字符串日期为 LocalDate
-        LocalDate originalDate = LocalDate.parse(signDate, originalFormatter);
-
-        // 将 LocalDate 转换为 LocalDateTime，时间设为午夜
-        LocalDateTime dateTime = originalDate.atStartOfDay();
-        String b = dateTime.format(targetFormatter);
+        // 解析原始字符串日期为 LocalDateTime
+        LocalDateTime originalDateTime = LocalDateTime.parse(signDate, originalFormatter);
+        // 将 LocalDateTime 转换为目标格式的字符串
+        String b = originalDateTime.format(targetFormatter);
         return b;
     }