租赁订单

src/main/java/com/mmc/oms/entity/lease/LeaseOrderDO.java

@@ -159,11 +159,12 @@ public class LeaseOrderDO implements Serializable {
     private BigDecimal salaryCashPledge;
 
     public LeaseOrderDTO buildLeaseOrderDTO() {
-        return LeaseOrderDTO.builder().id(id).orderNo(orderNo).statusCode(statusCode).userAccountId(userAccountId)
+        return LeaseOrderDTO.builder().id(id).orderNo(orderNo).orderName(orderName).statusCode(statusCode).userAccountId(userAccountId)
                 .thirdBackUserAccountId(thirdBackUserAccountId).companyName(companyName).orderTotalAmount(orderTotalAmount)
                 .salaryAmount(salaryAmount).shareAmount(shareAmount).otherAmount(otherAmount).payType(payType).payTime(payTime)
                 .startDate(startDate).endDate(endDate).userRemark(userRemark).sellerRemark(sellerRemark).createTime(createTime)
-                .confirmReceiptTime(confirmReceiptTime).remarkStatus(remarkStatus).modeOfDeliveryInfo(modeOfDeliveryInfo).sku(sku).skuImg(skuImg).build();
+                .confirmReceiptTime(confirmReceiptTime).remarkStatus(remarkStatus).modeOfDeliveryInfo(modeOfDeliveryInfo)
+                .unitPrice(unitPrice).deposit(deposit).wareNum(wareNum).sku(sku).skuImg(skuImg).build();
     }
 }
 

src/main/java/com/mmc/oms/model/dto/lease/LeaseOrderDTO.java

@@ -29,6 +29,8 @@ public class LeaseOrderDTO implements Serializable {
     private Integer id;
     @ApiModelProperty("订单编号")
     private String orderNo;
+    @ApiModelProperty("订单名称")
+    private String orderName;
     @ApiModelProperty("订单状态")
     private Integer statusCode;
     @ApiModelProperty("买家id")
@@ -85,6 +87,14 @@ public class LeaseOrderDTO implements Serializable {
     private UavOrderExpressDTO uavOrderExpressDTO;
     @ApiModelProperty("快递信息")
     private KdnExpDTO kdnExpDTO;
+    @ApiModelProperty("购买数量")
+    private Integer wareNum;
+    @ApiModelProperty(value = "单价", hidden = true)
+    private BigDecimal unitPrice;
+    @ApiModelProperty(value = "押金", hidden = true)
+    private BigDecimal deposit;
+    @ApiModelProperty("租赁商品id")
+    private Integer leaseGoodsId;
     @ApiModelProperty("订单规格列表")
     private String sku;
     @ApiModelProperty("sku图片")