dd

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/domain/BusinessDayBill.java

@@ -66,6 +66,11 @@ public class BusinessDayBill implements Serializable {
      * 今日结算
      */
     private BigDecimal todaySettlement;
+
+    /**
+     * 今日结算前真实余额
+     */
+    private BigDecimal todayRealSettlement;
     /**
      * 结算时间
      */

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/domain/bo/BusinessDayBillBo.java

@@ -99,6 +99,11 @@ public class BusinessDayBillBo implements Serializable {
     @ApiModelProperty(value = "今日结算", required = true)
     private BigDecimal todaySettlement;
 
+    /**
+     * 今日真实实际结算余额
+     */
+    @ApiModelProperty(value = "今日结算前真实余额", required = true)
+    private BigDecimal todayRealSettlement;
     /**
      * 结算时间
      */

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/domain/vo/BusinessDayBillVo.java

@@ -108,6 +108,17 @@ public class BusinessDayBillVo implements Serializable {
     @ApiModelProperty("预估结算")
     private BigDecimal todaySettlement;
 
+
+    /**
+     * 今日结算前真实余额
+     */
+    @ExcelProperty(value = "今日结算前真实余额")
+    @ApiModelProperty("今日结算前真实余额")
+    private BigDecimal todayRealSettlement;
+
+
+
+
     @ExcelProperty(value = "平台服务费")
     @ApiModelProperty(value = "平台服务费")
     private BigDecimal platformServiceFee;

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/service/impl/BusinessDayBillServiceImpl.java

@@ -209,11 +209,12 @@ public class BusinessDayBillServiceImpl implements IBusinessDayBillService {
             businessDayBill.setDayValue(format);
             businessDayBill.setBillDay(DateUtil.parse(format, "yyyy-MM-dd"));
             businessDayBill.setTodaySettlement(BigDecimal.ZERO);
+            businessDayBill.setTodayRealSettlement(BigDecimal.ZERO);
             businessDayBill.setActualReceivePayment(BigDecimal.ZERO);
             businessDayBill.setActualCredited(BigDecimal.ZERO);
             businessDayBill.setUserUsePoint(BigDecimal.ZERO);
             businessDayBill.setBusinessGivePoint(BigDecimal.ZERO);
-            businessDayBill.setTodaySettlementTime(new Date());
+            businessDayBill.setTodaySettlementTime(null);
             this.baseMapper.insert(businessDayBill);
         }
         return businessDayBill;

ruoyi-business/src/main/resources/mapper/businessDayBill/BusinessDayBillMapper.xml

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="platformIncome" column="platform_income"/>
         <result property="pointVerifiedOrderNum" column="point_verified_order_num"/>
         <result property="pointVerifiedOrderAmount" column="point_verified_order_amount"/>
+        <result property="todayRealSettlement" column="today_real_settlement"/>
 
     </resultMap>
 
@@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         IFNULL(sum(user_use_point), 0) as user_use_point,
         IFNULL(sum(business_give_point), 0) as business_give_point,
         IFNULL(sum(today_settlement), 0) as today_settlement,
+        IFNULL(sum(today_real_settlement), 0) as today_real_settlement,
         IFNULL(sum(online_order_num), 0) as online_order_num,
         IFNULL(sum(shop_order_num), 0) as shop_order_num,
         IFNULL(sum(online_order_amount), 0) as online_order_amount,
@@ -92,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         IFNULL(sum(user_use_point), 0) as user_use_point,
         IFNULL(sum(business_give_point), 0) as business_give_point,
         IFNULL(sum(today_settlement), 0) as today_settlement,
+        IFNULL(sum(today_real_settlement), 0) as today_real_settlement,
         IFNULL(sum(online_order_num), 0) as online_order_num,
         IFNULL(sum(shop_order_num), 0) as shop_order_num,
         IFNULL(sum(online_order_amount), 0) as online_order_amount,
@@ -128,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                IFNULL(sum(user_use_point), 0) as user_use_point,
                IFNULL(sum(business_give_point), 0) as business_give_point,
                IFNULL(sum(today_settlement), 0) as today_settlement,
+               IFNULL(sum(today_real_settlement), 0) as today_real_settlement,
                IFNULL(sum(online_order_num), 0) as online_order_num,
                IFNULL(sum(shop_order_num), 0) as shop_order_num,
                IFNULL(sum(online_order_amount), 0) as online_order_amount,