钱包、硬件权限

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

@@ -3,11 +3,19 @@ package com.bsd.pjcloud.hard.api.dto;
 import com.bsd.pjcloud.hard.api.entity.HardInvoiceEntity;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
 public class HardInvoiceDto extends HardInvoiceEntity {
+
     private List<Long> deptIds;
 
+    private List<Long> userIds;
+
     private List<Long> merchantIds;
+
+    private String hardType;
+
+    private LocalDate[] createTimeList;
 }

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

@@ -11,10 +11,15 @@ import java.util.List;
 public class HardOrderDto extends HardOrderEntity {
 
     /**
-     * 用户相关
+     * 订单部门id极其子部门id
      */
+    private Long deptIdIdDeepen;
+    private List<Long> deptIds;
+
     private List<Long> userIds;
 
+    private List<Long> userDeptIds;
+
     private List<Long> orderIds;
 
     private List<Long> hardIds;

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

@@ -1,6 +1,7 @@
 package com.bsd.pjcloud.hard.api.vo;
 
 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.HardInvoiceEntity;
 import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
 import com.bsd.pjcloud.hard.api.vo.base.BaseOrderInterface;
@@ -10,7 +11,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 @Data
-public class HardInvoiceVo extends HardInvoiceEntity implements BaseDeptInterface, BaseMchInterface, BaseOrderInterface, BaseHardInterface {
+public class HardInvoiceVo extends HardInvoiceEntity implements BaseDeptInterface, BaseMchInterface, BaseOrderInterface, BaseHardInterface, BaseUserInterface {
 
     private Long historyId;
 
@@ -33,6 +34,8 @@ public class HardInvoiceVo extends HardInvoiceEntity implements BaseDeptInterfac
      */
     private Long orderHardId;
 
+    private Long orderUserId;
+
     private Long orderMchId;
 
     private Long orderId;
@@ -58,4 +61,15 @@ public class HardInvoiceVo extends HardInvoiceEntity implements BaseDeptInterfac
 
     private String hardType;
 
+    /**
+     * 用户相关
+     */
+    private Long userId;
+
+    private String username;
+
+    private String userMobile;
+
+    private String userAvatar;
+
 }