feat:下单bug

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

@@ -6,6 +6,9 @@ import lombok.Getter;
 
 import java.util.Arrays;
 
+/**
+ * 订单状态
+ */
 @AllArgsConstructor
 @Getter
 public enum HardOrderStatusEnum {

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

@@ -28,8 +28,14 @@ public enum HardOrderTypeEnum {
 
     public static final List<HardOrderTypeEnum> refundList = List.of(BELOW, RESERVE);
 
+    public static final List<HardOrderTypeEnum> payList = List.of(BELOW, RESERVE);
+
     public static boolean isRefund(HardOrderTypeEnum type) {
         return refundList.contains(type);
     }
 
+    public static boolean isPay(HardOrderTypeEnum type) {
+        return refundList.contains(type);
+    }
+
 }

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

@@ -5,4 +5,7 @@ import lombok.Data;
 
 @Data
 public class HardCarDto extends HardCarEntity {
+
+    private Long orderId;
+
 }

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

@@ -3,6 +3,14 @@ package com.bsd.pjcloud.hard.api.dto.order;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class HardOrderDto extends HardOrderEntity {
+
+    /**
+     * 用户相关
+     */
+    private List<Long> userIds;
+
 }

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

@@ -3,10 +3,11 @@ package com.bsd.pjcloud.hard.api.vo.order;
 import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
 import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
 import lombok.Data;
 
 @Data
-public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, BaseDeptInterface {
+public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, BaseDeptInterface, BaseMchInterface {
     /**
      * 用户相关
      */
@@ -20,4 +21,13 @@ public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, B
      * 部门相关
      */
     private String deptName;
+
+    private String merchantName;
+
+    /**
+     * 设备相关
+     */
+    private String hardName;
+
+    private String hardType;
 }