更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowCount.java

@@ -17,9 +17,11 @@ import java.math.BigDecimal;
 @AllArgsConstructor
 @NoArgsConstructor
 public class ExpenseFlowCount {
+
     @Schema(description = "总数，单位：分")
     private BigDecimal payAmount = BigDecimal.ZERO;
 
     @Schema(description = "订单数量")
     private Long total = 0L;
+
 }

FullCardClient/src/main/java/com/zhongshu/card/client/type/StatisticType.java

@@ -6,9 +6,10 @@ import lombok.Getter;
  * 统计类型
  */
 public enum StatisticType {
-    Year("年", "year"),
+    Year("年", "year"), // 数据库字段
     Month("月", "month"),
     Week("周", "week"),
+    HourOfDay("小时", "hourOfDay"),
     ;
 
     @Getter

FullCardClient/src/main/java/com/zhongshu/card/client/utils/PayExceptionToShowUtil.java

@@ -0,0 +1,21 @@
+package com.zhongshu.card.client.utils;
+
+/**
+ * 支付异常提示
+ *
+ * @author TRX
+ * @date 2024/11/4
+ */
+public class PayExceptionToShowUtil {
+
+    /**
+     * 支付中心 错误提示转换
+     * @param cls
+     * @return
+     */
+    public static String convertException(String cls) {
+        String msg = "";
+        return msg;
+    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -371,14 +371,12 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         }
 
         // 判断设备和用户是否绑定
-        DevicePermiss devicePermiss = devicePermissDao.findTopByUserIdAndDeviceIdAndProjectOid(
-                entity.getUserId(), entity.getDeviceId(), entity.getProjectOid());
+        DevicePermiss devicePermiss = devicePermissDao.findTopByUserIdAndDeviceIdAndProjectOid(entity.getUserId(), entity.getDeviceId(), entity.getProjectOid());
         if (ObjectUtils.isEmpty(devicePermiss)) {
             entity.setVerifyError("用户没有使用设备权限");
             return;
         }
-        if (devicePermiss.getDataState() == null ||
-                devicePermiss.getDataState() != DataState.Enable) {
+        if (devicePermiss.getDataState() == null || devicePermiss.getDataState() != DataState.Enable) {
             entity.setVerifyError("用户设备权限未启用");
             return;
         }
@@ -726,6 +724,19 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         return ResultContent.buildSuccess(statisticModel);
     }
 
+    /**
+     * 机构今天和昨天的订单统计
+     *
+     * @param statisticSearch
+     * @return
+     */
+    public ResultContent<BusinessMainStatisticModel> orgStatisticDay(StatisticSearch statisticSearch) {
+        BusinessMainStatisticModel statisticModel = new BusinessMainStatisticModel();
+
+
+        return ResultContent.buildSuccess(statisticModel);
+    }
+
     /**
      * 得到详情
      *

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -91,8 +91,11 @@ public class PayCallService extends SuperService {
             if (StringUtils.isNotEmpty(msg) && msg.contains("Connection reset")) {
                 msg = "调用支付中心失败";
             }
+            msg = resultContent.getException().getMessage();
+
+
             if (StringUtils.isEmpty(msg)) {
-                msg = "支付失败";
+                msg = "支付中心失败";
             }
             entity.setPaymentStatus(msg);
             entity.setIsPaySuccess(Boolean.FALSE);