代码参数添加

nightFragrance-massage/src/main/java/com/ylx/order/domain/vo/OrderDateQueryVo.java

@@ -83,4 +83,7 @@ public class OrderDateQueryVo<T> implements IAfterSaleDisplay {
 
     @ApiModelProperty("售后状态文案")
     private String afterSalesServiceStatus;
+
+    @ApiModelProperty("退款金额")
+    private BigDecimal actualRefundAmount;
 }

nightFragrance-massage/src/main/java/com/ylx/order/domain/vo/OrderDetailVO.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -146,4 +145,7 @@ public class OrderDetailVO<T> implements IAfterSaleDisplay {
 
     @ApiModelProperty("售后状态文案")
     private String afterSalesServiceStatus;
+
+    @ApiModelProperty("退款金额")
+    private BigDecimal actualRefundAmount;
 }

nightFragrance-massage/src/main/java/com/ylx/order/domain/vo/merchant/MerchantOrderDetailVO.java

@@ -94,4 +94,14 @@ public class MerchantOrderDetailVO<T> implements IAfterSaleDisplay, IGeoRiskInfo
 
     @ApiModelProperty("售后状态文案")
     private String afterSalesServiceStatus;
+
+    @ApiModelProperty("退款金额")
+    private BigDecimal actualRefundAmount;
+
+    @ApiModelProperty("项目封面图")
+    private String projectCover;
+
+    @ApiModelProperty("履约状态：0=待出发/待签到，1=已出发，2=已到达/已签到")
+    private Integer execStatus;
+
 }

nightFragrance-massage/src/main/java/com/ylx/order/domain/vo/merchant/OrderPageVO.java

@@ -26,6 +26,9 @@ public class OrderPageVO<T> implements IAfterSaleDisplay, IGeoRiskInfo {
     @ApiModelProperty("售后状态文案")
     private String afterSalesServiceStatus;
 
+    @ApiModelProperty("退款金额")
+    private BigDecimal actualRefundAmount;
+
     @ApiModelProperty("项目名称")
     private String projectName;
 

nightFragrance-massage/src/main/java/com/ylx/order/service/IAfterSaleDisplay.java

@@ -1,7 +1,11 @@
 package com.ylx.order.service;
 
+import java.math.BigDecimal;
+
 public interface IAfterSaleDisplay {
 
     void setAfterSalesServiceId(Long afterSalesServiceId);
     void setAfterSalesServiceStatus(String afterSalesServiceStatus);
+
+    void setActualRefundAmount(BigDecimal actualRefundAmount);
 }

nightFragrance-massage/src/main/java/com/ylx/order/service/impl/TOrderServiceImpl.java

@@ -1221,6 +1221,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         } else {
             vo.setAfterSalesServiceStatus("未知状态");
         }
+        vo.setActualRefundAmount(afterSalesService.getActualRefundAmount());
 
     }
 

nightFragrance-massage/src/main/java/com/ylx/project/domain/vo/ProjectDetailVo.java

@@ -21,7 +21,7 @@ public class ProjectDetailVo implements Serializable {
      * 主键ID。
      */
     @ApiModelProperty("id")
-    private Long id;
+    private String id;
 
     /**
      * 项目标题。
@@ -33,7 +33,7 @@ public class ProjectDetailVo implements Serializable {
      * 项目分类ID。
      */
     @ApiModelProperty("项目分类ID")
-    private Long categoryId;
+    private String categoryId;
 
     /**
      * 项目分类名称。