朗通产品申请审核显示接口出参（修改）

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/OrderDetailsWapper.java

@@ -1,6 +1,5 @@
 package com.diagbot.entity.wrapper;
 
-import com.diagbot.entity.OrderDetails;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,13 +12,43 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class OrderDetailsWapper extends OrderDetails {
-    private Date orderTime;
+public class OrderDetailsWapper {
+    /**
+     * 订单明细id
+     */
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 审核状态（0.不通过1.通过）
+     */
+    private Integer auditStatus;
+
+    /**
+     * 订单状态（0.未付款1.已付款）
+     */
+    private Integer status;
+
+    /**
+     * 不通过类型
+     */
+    private Integer rejectType;
+
+    /**
+     * 不通过原因
+     */
+    private String rejectReason;
+
+    private Date startTime;//开始时间
+
+    private Date endTime;//结束时间
+
+    private Date orderTime; //下单时间
     private String username;// 用户名
-    private String linkman;//联系人
-    private String email;// 邮箱
     private Long orgId;//机构ID
     private String orgName;//机构名称
-    private Integer isReject; //是否通过认证
-    private Integer auStatus;  //认证状态（0：未认证，1：已认证，2：认证中）
 }

diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -130,7 +130,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
 
         return RespDTO.onSuc(this.productLine(list));
     }
-    
+
     /**
      * 根据产品id查询当条产品线下所有订单信息
      *

diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -139,7 +140,7 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
         orderDetailsIndex.setIndex((orderDetialsVO.getCurrent().longValue()-1)*orderDetialsVO.getSize().longValue());
         List<OrderDetailsWapper> list =this.seleAllOrderDetials(orderDetailsIndex);
         List<Long> list1 =new ArrayList<>();
-        for (OrderDetails orderDetails:list) {
+        for (OrderDetailsWapper orderDetails:list) {
             Long longs = orderDetails.getUserId();
             list1.add(longs);
         }
@@ -154,6 +155,13 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
             if(uo != null) {
                 BeanUtil.copyProperties(uo,bean);
             }
+            if(bean.getAuditStatus()==AuditStatusEnum.Adopt.getKey()){
+                Collection<OpenedProducts> openedProductTime =openedProductsFacade.listByIds(list1);
+                for (OpenedProducts openedProducts:openedProductTime) {
+                    bean.setStartTime(openedProducts.getStartTime());
+                    bean.setEndTime(openedProducts.getEndTime());
+                }
+            }
         }
         return list;
     }

diagbotman-service/src/main/java/com/diagbot/vo/OrderDetialsVO.java

@@ -19,8 +19,9 @@ public class OrderDetialsVO {
     private Long size;
     @NotBlank(message = "请输入订单状态（0.未付款1.已付款）!")
     private Integer status;
+
     /**
-     * 用户id
+     * 订单编号
      */
-    private Long userId;
+    private String orderNum;
 }

diagbotman-service/src/main/resources/mapper/OrderDetailsMapper.xml

@@ -41,14 +41,14 @@
     <select id="seleAllOrderDetials" resultMap="BaseResultWrapper"
             parameterType="com.diagbot.entity.wrapper.OrderDetailsWapper">
         SELECT
-        a.*, b.time order_time,c.`name` product_name
+        a.id,a.user_id,a.audit_status,a.`status`,a.reject_type,a.reject_reason , b.time order_time,c.`name` product_name
         FROM
         diag_order_details a
         LEFT JOIN diag_product_order b ON a.order_num = b.num
         LEFT JOIN diag_lantone_product c ON a.product_id =c.id
-        WHERE 1=1
-        <if test="status !=null and status !=''">
-            AND status = #{status}
+        WHERE a.is_deleted = 'N'
+        <if test="orderNum !=null and orderNum !=''">
+            AND a.order_num = #{orderNum}
         </if>
         <if test="productId !=null and productId !=''">
             AND product_id = #{productId}