Merge branch 'dev' into merge_adapay

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ClearingBillVO.java

@@ -3,6 +3,8 @@ package com.jsowell.pile.vo.web;
 import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class ClearingBillVO {
     /**
@@ -10,6 +12,11 @@ public class ClearingBillVO {
      */
     private String orderCode;
 
+    /**
+     * 结算金额
+     */
+    private BigDecimal settleAmount;
+
     /**
      * 支付id
      */

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java

@@ -0,0 +1,49 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.Data;
+
+/**
+ * 运营商清分账单VO
+ *
+ * @author Lemon
+ * @Date 2023/8/28 13:30
+ */
+@Data
+public class MerchantClearingBillVO {
+
+    // 交易日期
+    private String tradeDate;
+
+    // 账单状态
+    private String billStatus;
+
+    // 清分账单编号
+    private String clearingBillCode;
+
+    // 清分时间
+    private String clearingTime;
+
+    // 运营商id
+    private String merchantId;
+
+    // 运营商名称
+    private String merchantName;
+
+    // 应收金额
+    private String receivableAmount;
+
+    // 应清分金额
+    private String shouldClearingAmount;
+
+    // 实际清分金额
+    private String actualClearingAmount;
+
+    // 手续费
+    private String feeAmount;
+
+    // 可提现金额
+    private String withdrawAbleAmount;
+
+    // 提现单号
+    private String withdrawCode;
+}

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java

@@ -45,5 +45,8 @@ public class MerchantOrderReportVO {
 
         // 虚拟金额
         private BigDecimal virtualAmount;
+
+        // 白名单支付次数
+        private BigDecimal whitelistPaymentsNum;
    }
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSettleDetailVO.java

@@ -2,6 +2,8 @@ package com.jsowell.pile.vo.web;
 
 import lombok.*;
 
+import java.math.BigDecimal;
+
 /**
  * 订单结算详情
  */
@@ -19,7 +21,7 @@ public class OrderSettleDetailVO {
     /**
      * 结算金额
      */
-    private String settleAmount;
+    private BigDecimal settleAmount;
 
     /**
      * 清分状态
@@ -34,7 +36,7 @@ public class OrderSettleDetailVO {
 
     /**
      * 提现状态
-     * 0-未提现；1-体现中；2-提现到账
+     * 0-未提现；1-提现中；2-提现到账
      */
     private String withdrawStatus;