设备交易记录、商户交易记录

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * 订单状态
@@ -22,6 +23,13 @@ public enum HardOrderStatusEnum {
     private final String type;
     private final String description;
 
+    public static List<String> getPaySuccessCodes() {
+        return List.of(
+                HardOrderStatusEnum.PAY.type,
+                HardOrderStatusEnum.CANCEL.type
+        );
+    }
+
     public static HardOrderStatusEnum valueOfByType(Integer type) {
         if (ObjectUtil.isEmpty(type)) return null;
         return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java

@@ -26,6 +26,8 @@ public class HardOrderDto extends HardOrderEntity {
 
     private List<Long> mchIds;
 
+    private List<String> orderStatusCodes;
+
     private LocalDate[] createTimeList;
 
     private LocalDate[] payTimeList;

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderCsVo.java

@@ -0,0 +1,50 @@
+package com.bsd.pjcloud.hard.api.vo.order;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@HeadRowHeight(40)
+@ColumnWidth(50)
+@ContentRowHeight(20)
+@ExcelIgnoreUnannotated
+public class HardOrderCsVo implements BaseMchInterface, BaseHardInterface {
+
+    @ExcelProperty("设备名称")
+    @Schema(description = "设备id")
+    private Long hardId;
+
+    @ExcelProperty("设备名称")
+    private String hardName;
+
+    @Schema(description = "设备类型")
+    private String hardType;
+
+    @ExcelProperty("所属商户")
+    @Schema(description = "商户名")
+    private String merchantName;
+
+    @Schema(description = "商户logo")
+    private String logoPic;
+
+    @Schema(description = "商户id")
+    private Long merchantId;
+
+    @ExcelProperty("总消费金额")
+    @Schema(description = "总消费金额")
+    private BigDecimal totalPayPrice;
+
+    @ExcelProperty("总消费次数")
+    @Schema(description = "总消费次数")
+    private BigDecimal totalPayCount;
+
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderSbVo.java

@@ -0,0 +1,47 @@
+package com.bsd.pjcloud.hard.api.vo.order;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@HeadRowHeight(40)
+@ColumnWidth(50)
+@ContentRowHeight(20)
+@ExcelIgnoreUnannotated
+public class HardOrderSbVo implements BaseMchInterface, BaseHardInterface {
+
+    @Schema(description = "设备id")
+    private Long hardId;
+
+    @Schema(description = "商户id")
+    private Long merchantId;
+
+    @Schema(description = "总消费金额")
+    private BigDecimal totalPayPrice;
+
+    @Schema(description = "总消费次数")
+    private BigDecimal totalPayCount;
+
+    /**
+     * 商户相关
+     */
+    private String merchantName;
+
+    private String logoPic;
+
+    /**
+     * 设备相关
+     */
+    private String hardName;
+
+    private String hardType;
+
+}