虚拟账号

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByInitiatorVo.java

@@ -61,4 +61,15 @@ public class UserPageEntrustServiceOrderByInitiatorVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    @ApiModelProperty("接单截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime acceptanceDeadline;
+
+    @ApiModelProperty("完成截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime finishDeadline;
+
+    @ApiModelProperty("是否结算")
+    private Boolean isSettlement;
+
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByMatchmakerVo.java

@@ -72,4 +72,27 @@ public class UserPageEntrustServiceOrderByMatchmakerVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    @ApiModelProperty("接单截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime acceptanceDeadline;
+
+    @ApiModelProperty("接收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime acceptedTime;
+
+    @ApiModelProperty("完成截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime finishDeadline;
+
+    @ApiModelProperty("完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime finishedTime;
+
+    @ApiModelProperty("结算截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime settlementDeadline;
+
+    @ApiModelProperty("是否结算")
+    private Boolean isSettlement;
+
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderVo.java

@@ -72,4 +72,33 @@ public class UserPageEntrustServiceOrderVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    @ApiModelProperty("接受截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime acceptanceDeadline;
+
+    @ApiModelProperty("接收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime acceptedTime;
+
+    @ApiModelProperty("完成截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime finishDeadline;
+
+    @ApiModelProperty("完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime finishedTime;
+
+    @ApiModelProperty("结算截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime settlementDeadline;
+
+    @ApiModelProperty("是否结算")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Boolean isSettlement;
+
+    @ApiModelProperty("退款原因")
+    private String refundReason;
+
+    @ApiModelProperty("备注")
+    private String remark;
 }

dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml

@@ -5,19 +5,22 @@
     <select id="pageOrderByInitiator"
             resultType="com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo">
         SELECT
-            daeso.id,
-            daeso.target_user_id,
-            daeso.target_mi_id,
-            daeso.matchmaker_id,
-            daeso.reward_amount,
-            daeso.associate_order_id,
-            dao.order_code as associateOrderCode,
-            daeso.paid_amount,
-            daeso.`status`,
-            daeso.payment_status,
-            daeso.create_time
+        daeso.id,
+        daeso.target_user_id,
+        daeso.target_mi_id,
+        daeso.matchmaker_id,
+        daeso.reward_amount,
+        daeso.associate_order_id,
+        dao.order_code as associateOrderCode,
+        daeso.paid_amount,
+        daeso.`status`,
+        daeso.payment_status,
+        daeso.create_time,
+        daeso.acceptance_deadline,
+        daeso.finish_deadline,
+        daeso.is_settlement
         from da_entrust_service_order as daeso
-                 LEFT JOIN da_order as dao on dao.id=daeso.associate_order_id
+        LEFT JOIN da_order as dao on dao.id=daeso.associate_order_id
         where daeso.is_delete=0 and daeso.`status` !=0
         <if test="queryParams.queryInitiatorUserId != null">
             and daeso.initiator_user_id = #{queryParams.queryInitiatorUserId}
@@ -46,7 +49,13 @@
         daeso.paid_amount,
         daeso.`status`,
         daeso.payment_status,
-        daeso.create_time
+        daeso.create_time,
+        daeso.acceptance_deadline,
+        daeso.accepted_time,
+        daeso.finished_time,
+        daeso.finish_deadline,
+        daeso.settlement_deadline,
+        daeso.is_settlement
         from da_entrust_service_order as daeso
         LEFT JOIN da_order as dao on dao.id=daeso.associate_order_id
         where daeso.is_delete=0 and daeso.`status` !=0
@@ -63,8 +72,7 @@
     </select>
 
     <select id="pageOrder"
-            resultType="com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo">
-        SELECT
+            resultType="com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo">SELECT
         daeso.id,
         daeso.initiator_mi_id,
         daeso.initiator_user_id,
@@ -77,7 +85,15 @@
         daeso.paid_amount,
         daeso.`status`,
         daeso.payment_status,
-        daeso.create_time
+        daeso.create_time,
+        daeso.accepted_time,
+        daeso.acceptance_deadline,
+        daeso.finished_time,
+        daeso.finish_deadline,
+        daeso.settlement_deadline,
+        daeso.is_settlement,
+        daeso.refund_reason,
+        daeso.remark
         from da_entrust_service_order as daeso
         LEFT JOIN da_order as dao on dao.id=daeso.associate_order_id
         LEFT JOIN da_marriage_information as dami on dami.id=daeso.initiator_mi_id