feat:饭卡支付

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

@@ -72,7 +72,8 @@ public enum HardPayTypeEnum {
     // 简单支付(没有购物车)
     public static final List<HardPayTypeEnum> isSimplePayList = List.of(
             WALLET_QR_CODE_SCAN,
-            ACT_CANCEL
+            ACT_CANCEL,
+            WALLET_CARD
     );
 
     public static HardPayTypeEnum valueOfByType(String type) {

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

@@ -17,6 +17,11 @@ public class HardXfjFastCreateOrderDto {
      */
     private Long hardId;
 
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
     /**
      * 支付金额(分)
      */

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

@@ -13,11 +13,11 @@ public class XfjWhiteListDto {
     /**
      * 页数
      */
-    private Integer Page;
+    private Long Page;
 
     /**
      * 页个数(一页最多有多少个名单)
      */
-    private Integer PageNumber;
+    private Long PageNumber;
 
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardOrderEntity.java

@@ -35,7 +35,7 @@ public class HardOrderEntity extends Model<HardOrderEntity> {
     /**
      * 订单编号
      */
-    @Schema(description = "订单编号 目前正元、微信支付、支付宝支付正在使用")
+    @Schema(description = "订单编号 目前正元、微信支付、云消费机、支付宝支付正在使用")
     private String orderNo;
 
     /**

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

@@ -8,17 +8,17 @@ public class XfjWhiteListVo extends XfjBaseVo {
     /**
      * 返回设备提交的序号
      */
-    private String CommID;
+    private Integer CommID;
 
     /**
      * 页数(获取那一页的数据)
      */
-    private String Page;
+    private Long Page;
 
     /**
      * 名单个数
      */
-    private String PageLen;
+    private Long PageLen;
 
     /**
      * 白名单数据(1|0000000001|1,序号|卡号|操作)