朗通后台产品申请显示接口

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

@@ -0,0 +1,25 @@
+package com.diagbot.entity.wrapper;
+
+import com.diagbot.entity.OrderDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/9/21 15:04
+ */
+@Getter
+@Setter
+public class OrderDetailsWapper extends OrderDetails {
+    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

@@ -7,14 +7,18 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProductsIndex;
+import com.diagbot.entity.OrderDetails;
+import com.diagbot.entity.OrderDetailsIndex;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.LantoneProductServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.OppendedProductVO;
+import com.diagbot.vo.OrderDetialsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -35,6 +39,8 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
     private ProductOrderFacade productOrderFacade;
     @Autowired
     private UserServiceClient userServiceClient;
+    @Autowired
+    private OrderDetailsFacade orderDetailsFacade;
     /**
      * @Description: 添加产品业务逻辑
      * @Author: wangyu
@@ -159,4 +165,48 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         }
         return list;
     }
+
+    /**
+     * @Description: 查询所有订单明细
+     * @Author: wangyu
+     * @Date: 16:19 2018/9/21
+     */
+   public List<OrderDetailsWapper> getAllOrderDetials(OrderDetialsVO orderDetialsVO){
+       OrderDetailsIndex orderDetailsIndex =new OrderDetailsIndex();
+       Long curren = orderDetialsVO.getCurrent();
+       Long size =orderDetialsVO.getSize();
+       if(curren==null){
+           orderDetialsVO.setCurrent(1L);
+       }
+       if (size==null){
+           orderDetialsVO.setSize(10L);
+       }
+       BeanUtil.copyProperties(orderDetialsVO, orderDetailsIndex);
+       orderDetailsIndex.setIndex((orderDetialsVO.getCurrent().longValue()-1)*orderDetialsVO.getSize().longValue());
+       List<OrderDetailsWapper> list =orderDetailsFacade.seleAllOrderDetials(orderDetailsIndex);
+       List<Long> list1 =new ArrayList<>();
+       for (OrderDetails orderDetails:list) {
+           Long longs = orderDetails.getUserId();
+           list1.add(longs);
+       }
+       RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(list1);
+       if(mapRespDTO == null || !"0".equals(mapRespDTO.code) ) {
+           throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                   "获取用户和机构信息失败");
+       }
+       Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
+       for(OrderDetailsWapper bean : list) {
+           UserOrgDTO uo = dataMap.get(bean.getUserId());
+           if(uo != null) {
+               bean.setUsername(uo.getUsername());
+               bean.setLinkman(uo.getLinkman());
+               bean.setEmail(uo.getEmail());
+               bean.setOrgId(uo.getOrgId());
+               bean.setOrgName(uo.getOrgName());
+               bean.setIsReject(uo.getIsReject());
+               bean.setAuStatus(uo.getAuStatus());
+           }
+       }
+       return list;
+   }
 }

diagbotman-service/src/main/java/com/diagbot/mapper/OrderDetailsMapper.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.OrderDetails;
+import com.diagbot.entity.OrderDetailsIndex;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 订单明细表 Mapper 接口
@@ -22,4 +26,11 @@ public interface OrderDetailsMapper extends BaseMapper<OrderDetails> {
      * @Date: 20:17 2018/9/19
      */
     IPage<OrderDetails>  orderDetialShow(Page page, @Param("orderDetails") OrderDetails orderDetails);
+
+    /**
+     * @Description: 查询所有待审核产品
+     * @Author: wangyu
+     * @Date: 15:06 2018/9/21
+     */
+    public List<OrderDetailsWapper> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex);
 }

diagbotman-service/src/main/java/com/diagbot/service/OrderDetailsService.java

@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.entity.OrderDetails;
+import com.diagbot.entity.OrderDetailsIndex;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
+
+import java.util.List;
 
 /**
  * <p>
@@ -21,4 +25,11 @@ public interface OrderDetailsService extends IService<OrderDetails> {
      * @Date: 20:17 2018/9/19
      */
     IPage<OrderDetails> orderDetialShow(Page page, OrderDetails orderDetails);
+
+    /**
+     * @Description: 查询所有待审核产品
+     * @Author: wangyu
+     * @Date: 15:06 2018/9/21
+     */
+    public List<OrderDetailsWapper> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex);
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/OrderDetailsServiceImpl.java

@@ -3,11 +3,15 @@ package com.diagbot.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.OrderDetails;
+import com.diagbot.entity.OrderDetailsIndex;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.mapper.OrderDetailsMapper;
 import com.diagbot.service.OrderDetailsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 订单明细表 服务实现类
@@ -26,6 +30,16 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
      */
     @Override
     public IPage<OrderDetails> orderDetialShow(Page page, OrderDetails orderDetails){
-        return null;
+        return baseMapper.orderDetialShow(page,orderDetails);
+    }
+
+    /**
+     * @Description: （审核）查询订单明细相关信息
+     * @Author: wangyu
+     * @Date: 15:25 2018/9/21
+     */
+    @Override
+    public List<OrderDetailsWapper> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex) {
+        return baseMapper.seleAllOrderDetials(orderDetailsIndex);
     }
 }

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

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/9/21 15:33
+ */
+@Getter
+@Setter
+public class OrderDetialsVO {
+    @NotBlank(message = "请输入页数!")
+    private Long current;
+    @NotBlank(message = "请输入每页显示条数!")
+    private Long size;
+    @NotBlank(message = "请输入订单状态（0.未付款1.已付款）!")
+    private Integer status;
+}

diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java

@@ -7,9 +7,11 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.vo.OppendedProductVO;
+import com.diagbot.vo.OrderDetialsVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -99,5 +101,17 @@ public class DiagLantoneProductController {
         List<LantoneProductWrapper> list = lantoneProductFacade.opendedProductByCurrentUser();
         return RespDTO.onSuc(list);
     }
+
+    @ApiOperation(value = "查询所有订单明细",
+            notes =
+                    "current:页数<br>"+
+                    "size:每页显示条数<br>"+
+                    "status:订单状态（0.未付款1.已付款）")
+    @PostMapping("/getAllOrderDetials")
+    @SysLogger("getAllOrderDetials")
+    public RespDTO getAllOrderDetials(OrderDetialsVO orderDetialsVO) {
+        List<OrderDetailsWapper> list = lantoneProductFacade.getAllOrderDetials(orderDetialsVO);
+        return RespDTO.onSuc(list);
+    }
 }
 

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

@@ -19,7 +19,39 @@
         <result column="reject_type" property="rejectType" />
         <result column="reject_reason" property="rejectReason" />
     </resultMap>
+
+    <resultMap id="BaseResultWrapper" type="com.diagbot.entity.wrapper.OrderDetailsWapper">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="order_num" property="orderNum" />
+        <result column="product_id" property="productId" />
+        <result column="user_id" property="userId" />
+        <result column="audit_status" property="auditStatus" />
+        <result column="unit_price" property="unitPrice" />
+        <result column="status" property="status" />
+        <result column="reject_type" property="rejectType" />
+        <result column="reject_reason" property="rejectReason" />
+        <result column="order_time" property="orderTime" />
+    </resultMap>
     <select id="orderDetialShow" resultMap="BaseResultMap">
         SELECT * FROM diag_order_details WHERE order_num =#{orderDetails.orderNum}
     </select>
+
+    <select id="seleAllOrderDetials" resultMap="BaseResultWrapper" parameterType="com.diagbot.entity.wrapper.OrderDetailsWapper">
+        SELECT
+	      a.*, b.time order_time
+        FROM
+	      diag_order_details a
+        LEFT JOIN diag_product_order b ON a.order_num = b.num
+        WHERE
+	      1=1
+	      <if test="status !=null and status !=''">
+             AND status = #{status}
+          </if>
+        LIMIT #{index},#{size}
+    </select>
 </mapper>