feat:后台打印

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

@@ -47,7 +47,7 @@ public class HardInvoiceEntity extends Model<HardInvoiceEntity> {
 	* 硬件订单id
 	*/
     @Schema(description="硬件订单id")
-    private Long hardOrderId;
+    private Long orderId;
 
 	/**
 	* 状态

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/HardUtil.java

@@ -58,6 +58,7 @@ public class HardUtil {
     public <T extends BaseOrderInterface> T convertOrder(T v, HardOrderEntity order) {
         if (ObjectUtil.isEmpty(order)) return v;
         v.setOrderHardId(order.getHardId());
+        v.setOrderMchId(order.getMerchantId());
         v.setOrderId(order.getId());
         v.setOrderDeptId(order.getDeptId());
         v.setOrderWalletId(order.getWalletId());

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

@@ -2,17 +2,60 @@ package com.bsd.pjcloud.hard.api.vo;
 
 import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
 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;
 import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
 import lombok.Data;
 
-@Data
-public class HardInvoiceVo extends HardInvoiceEntity implements BaseDeptInterface, BaseMchInterface {
+import java.time.LocalDateTime;
 
+@Data
+public class HardInvoiceVo extends HardInvoiceEntity implements BaseDeptInterface, BaseMchInterface, BaseOrderInterface, BaseHardInterface {
+
+    private Long historyId;
+
+    /**
+     * 部门相关
+     */
     private String deptName;
 
+    /**
+     * 商户相关
+     */
     private Long merchantId;
 
     private String merchantName;
 
     private String logoPic;
+
+    /**
+     * 订单相关
+     */
+    private Long orderHardId;
+
+    private Long orderMchId;
+
+    private Long orderId;
+
+    private Long orderDeptId;
+
+    private Long orderWalletId;
+
+    private Long orderParentCarId;
+
+    private Integer orderTotalPrice;
+
+    private Integer orderExtraPrice;
+
+    private Integer orderPayPrice;
+
+    private LocalDateTime orderPayTime;
+
+    /**
+     * 设备相关
+     */
+    private String hardName;
+
+    private String hardType;
+
 }

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

@@ -8,6 +8,10 @@ public interface BaseOrderInterface {
 
     void setOrderHardId(Long orderHardId);
 
+    Long getOrderMchId();
+
+    void setOrderMchId(Long orderMchId);
+
     Long getOrderId();
 
     void setOrderId(Long orderId);

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

@@ -31,6 +31,8 @@ public class HardAfterSaleVo extends HardAfterSaleEntity implements BaseUserInte
      */
     private Long orderHardId;
 
+    private Long orderMchId;
+
     private Long orderId;
 
     private Long orderDeptId;