feat:发票添加申请人

feat:添加微信小程序的用户入口

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

@@ -7,14 +7,15 @@ import lombok.Getter;
 import java.util.Arrays;
 
 /**
- * 第三方面密类型
+ * 第三方免密支付状态
  */
 @AllArgsConstructor
 @Getter
 public enum HardThirdMiStatusEnum {
 
     CREATE_ORDER("10", "创建订单"),
-    PAY("20", "支付订单"),
+    PAY_SUCCESS("20", "支付成功"),
+    PAY_ERROR("21", "支付失败"),
     REFUND("30", "取消/退款"),
     ;
 

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

@@ -7,7 +7,7 @@ import lombok.Getter;
 import java.util.Arrays;
 
 /**
- * 第三方面密类型
+ * 第三方免密类型
  */
 @AllArgsConstructor
 @Getter

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

@@ -0,0 +1,26 @@
+package com.bsd.pjcloud.hard.api.dto;
+
+import com.bsd.pjcloud.hard.api.entity.HardThirdMiOrderEntity;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class HardThirdMiOrderDto extends HardThirdMiOrderEntity {
+
+    /**
+     * 创建订单时间
+     */
+    private LocalDateTime[] createOrderTimeList;
+
+    /**
+     * 支付时间
+     */
+    private LocalDateTime[] payOrderTimeList;
+
+    /**
+     * 退款时间
+     */
+    private LocalDateTime[] refundOrderTimeList;
+
+}

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

@@ -19,7 +19,6 @@ import java.time.LocalDateTime;
 @Schema(description = "硬件商品免密订单")
 public class HardThirdMiOrderEntity extends Model<HardThirdMiOrderEntity> {
 
-
     /**
      * 编号
      */
@@ -63,6 +62,18 @@ public class HardThirdMiOrderEntity extends Model<HardThirdMiOrderEntity> {
     @Schema(description = "订单id")
     private Long orderId;
 
+    /**
+     * 退款id
+     */
+    @Schema(description = "退款id")
+    private Long refundId;
+
+    /**
+     * 设备id
+     */
+    @Schema(description = "设备id")
+    private Long hardId;
+
     /**
      * 外部订单号
      */
@@ -117,6 +128,12 @@ public class HardThirdMiOrderEntity extends Model<HardThirdMiOrderEntity> {
     @Schema(description = "支付金额")
     private int payPrice;
 
+    /**
+     * 退款金额
+     */
+    @Schema(description = "退款金额")
+    private int refundPrice;
+
     /**
      * 原始 sign json 数据
      */

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

@@ -0,0 +1,30 @@
+package com.bsd.pjcloud.hard.api.vo;
+
+import com.bsd.pjcloud.hard.api.entity.HardThirdMiOrderEntity;
+import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HardThirdMiOrderVo extends HardThirdMiOrderEntity implements BaseHardInterface {
+
+    /**
+     * 用户相关
+     */
+    private String username;
+
+    private String userMobile;
+
+    private String userAvatar;
+
+    /**
+     * 设备相关
+     */
+    private String hardName;
+
+    private String hardType;
+
+    private List<String> hardTypeCodes;
+
+}