更新

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

@@ -55,24 +55,21 @@ public class ExpenseFlowSearch extends SuperSearch {
     @Schema(description = "当前年的第几天")
     private Integer dayOfYear;
 
+    @Schema(description = "当前的第几小时")
+    private Integer hourOfDay;
+
     @Schema(description = "消费订单号")
     private String orderNo;
 
     @Schema(description = "支付订单号")
     private String paymentNo;
 
-    @Schema(description = "消费时间")
-    private String paymentTime;
-
     @Schema(description = "支付方式")
     private String paymentWay;
 
     @Schema(description = "消费金额（单位：分）")
     private BigDecimal payAmount;
 
-    @Schema(description = "关联信息")
-    private JSONObject goodsInfo;
-
     @Schema(description = "支付订单状态")
     private String paymentStatus;
 
@@ -93,7 +90,7 @@ public class ExpenseFlowSearch extends SuperSearch {
     @Schema(description = "是否查询所有的商户")
     private Boolean isAllBusinessMain = Boolean.TRUE;
 
-    @Schema(description = "查询商户集合")
+    @Schema(description = "查询商户集合", hidden = true)
     private List<String> shopOids;
 
     @Schema(description = "统计类型，按年、月、周", hidden = true)

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/ExpenseFlowDaoImpl.java

@@ -78,6 +78,10 @@ public class ExpenseFlowDaoImpl extends BaseImpl implements ExpenseFlowDaoExtend
             criteria.and("dayOfYear").is(param.getDayOfYear());
         }
 
+        if (param.getHourOfDay() != null) {
+            criteria.and("hourOfDay").is(param.getHourOfDay());
+        }
+
         // 是否支付成功
         if (param.getIsPaySuccess() != null) {
             criteria.and("isPaySuccess").is(param.getIsPaySuccess());

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -9,6 +9,7 @@ import com.zhongshu.card.client.utils.type.RefundState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.school.CardInfo;
+import com.zhongshu.card.server.core.util.DateUtils;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -96,15 +97,28 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "当前年的第几天")
     private Integer dayOfYear;
 
+    @Schema(description = "当前的第几小时")
+    private Integer hourOfDay;
+
+    @Schema(description = "消费创建时间")
+    private String paymentTime;
+
+    public void setTimes() {
+        this.year = DateUtils.getCurrentYear();
+        this.dayOfYear = DateUtils.getCurrentDayInYear();
+        this.month = DateUtils.getCurrentMonthInYear();
+        this.week = DateUtils.getCurrentWeekInYear();
+        this.dayOfMonth = DateUtils.getCurrentDayInMonth();
+        this.hourOfDay = DateUtils.getCurrentHourOfDay();
+        this.paymentTime = DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyySSS);
+    }
+
     @Schema(description = "消费订单号")
     private String orderNo;
 
     @Schema(description = "支付订单号")
     private String paymentNo;
 
-    @Schema(description = "消费创建时间")
-    private String paymentTime;
-
     @Schema(description = "支付来源：刷卡 二维码")
     private OrderFromType orderFromType;
 

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

@@ -115,14 +115,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
      */
     public ResultContent<ExpenseFlow> createExpenseFlowByHxz(ConsumTransactionsModel iotParam, ExpenseFlow expenseFlow) {
         expenseFlow.setMqttDataId(iotParam.getMqttDataId());
-
-        expenseFlow.setYear(DateUtils.getCurrentYear());
-        expenseFlow.setMonth(DateUtils.getCurrentMonthInYear());
-        expenseFlow.setWeek(DateUtils.getCurrentWeekInYear());
-        expenseFlow.setDayOfMonth(DateUtils.getCurrentDayInMonth());
-        expenseFlow.setDayOfYear(DateUtils.getCurrentDayInYear());
-        expenseFlow.setPaymentTime(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyySSS));
-
+        expenseFlow.setTimes();
         // 消费订单号
         expenseFlow.setOrderNo(iotParam.getOrder());
         // 卡片信息
@@ -216,13 +209,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         expenseFlow.setOrderFromType(OrderFromType.QrCode);
         expenseFlow.setUserId(userId);
 
-        expenseFlow.setYear(DateUtils.getCurrentYear());
-        expenseFlow.setMonth(DateUtils.getCurrentMonthInYear());
-        expenseFlow.setWeek(DateUtils.getCurrentWeekInYear());
-        expenseFlow.setDayOfMonth(DateUtils.getCurrentDayInMonth());
-        expenseFlow.setDayOfYear(DateUtils.getCurrentDayInYear());
-        expenseFlow.setPaymentTime(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyySSS));
-
+        expenseFlow.setTimes();
         // 消费订单号
         String orderNo = NextNoUtil.getNextPaymentNo("W");
         expenseFlow.setOrderNo(orderNo);

FullCardServer/src/main/java/com/zhongshu/card/server/core/test/Test.java

@@ -39,7 +39,7 @@ public class Test {
         BigDecimal b2 = BigDecimal.valueOf(54.32);
         System.out.println("m= " + b1.divide(b2, 5, RoundingMode.HALF_UP));
 
-        System.out.println("weekDays: " + DateUtils.getCurrentDayInYear());
+        System.out.println("weekDays: " + DateUtils.getCurrentHourOfDay());
 
         GroovyShell groovyShell = new GroovyShell();
         String res = " println 'Hello, Groovy!' ";

FullCardServer/src/main/java/com/zhongshu/card/server/core/util/DateUtils.java

@@ -241,6 +241,16 @@ public class DateUtils {
         return date.getDayOfYear();
     }
 
+    /**
+     * 当前的第几小时
+     *
+     * @return
+     */
+    public static int getCurrentHourOfDay() {
+        Calendar calendar = Calendar.getInstance();
+        return calendar.get(Calendar.HOUR_OF_DAY);
+    }
+
     /**
      * 获得本小时的开始时间
      *