Merge remote-tracking branch 'origin/master'

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

@@ -39,6 +39,7 @@ public enum HardPayTypeEnum {
             WALLET_DEFAULT,
             WALLET_QR_CODE,
             WALLET_QR_CODE_SCAN,
+            WALLET_CARD,
             FACE,
             CASH,
             WECHANT_SELF_QR_CODE_PAY,

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

@@ -21,4 +21,6 @@ public class HardCarDto extends HardCarEntity {
 
     private Long merchantId;
 
+    private List<Long> mchIds;
+
 }

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

@@ -67,6 +67,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
 
     private String createTimeStr;
 
+    private List<String> saleStatusCodes;
+
     /**
      * 是否查询时间段为空的数据
      */

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/xfj/XfjServerTimeDto.java

@@ -10,9 +10,4 @@ public class XfjServerTimeDto {
      */
     private Integer WLSum;
 
-    /**
-     * 自定义机号
-     */
-    private Integer DeviceID;
-
 }

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

@@ -0,0 +1,40 @@
+package com.bsd.pjcloud.hard.api.vo.order;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class HardCarTotalVo {
+
+    /**
+     * 商品id
+     */
+    @Schema(description = "商品id")
+    private Long productId;
+
+    /**
+     * 商品名
+     */
+    @Schema(description = "商品名")
+    private String productName;
+
+    /**
+     * 商品图片
+     */
+    @Schema(description = "商品图片")
+    private String productPic;
+
+    /**
+     * 商品价格
+     */
+    @Schema(description = "商品价格")
+    private Integer productPrice;
+
+    /**
+     * 购买总数
+     */
+     @Schema(description = "购买总数")
+    private Integer payToalNum;
+
+
+}

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

@@ -21,4 +21,9 @@ public class HardCarVo extends HardCarEntity {
     // 购买次数【统计使用】
     private Long payCount;
 
+    // 统计使用
+    private Long merchantId;
+
+    private String merchantName;
+
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/xfj/XfjWhiteListVo.java

@@ -13,12 +13,12 @@ public class XfjWhiteListVo extends XfjBaseVo {
     /**
      * 页数(获取那一页的数据)
      */
-    private Long Page;
+    private Integer Page;
 
     /**
      * 名单个数
      */
-    private Long PageLen;
+    private Integer PageLen;
 
     /**
      * 白名单数据(1|0000000001|1,序号|卡号|操作)
@@ -31,6 +31,6 @@ public class XfjWhiteListVo extends XfjBaseVo {
      * 1:继续获取
      * 0:已经更新完成
      */
-    private String Uptate;
+    private Integer Uptate;
 
 }