王宇：产品线管理相关接口

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

@@ -1,8 +1,11 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.service.impl.LantoneProductServiceImpl;
+import com.diagbot.util.UserUtils;
 import org.springframework.stereotype.Component;
 
 /**
@@ -62,4 +65,15 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         }
         return CommonErrorCode.OK;
     }
+
+    /**
+     * @Description: 根据用户id查询是否有开通产品
+     * @Author: wangyu
+     * @Date: 19:59 2018/9/18
+     */
+    public IPage<LantoneProduct> productLine(Page page){
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        IPage<LantoneProduct> diagLantoneProducts =productLine(page,userId);
+        return diagLantoneProducts;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.entity.OrderDetails;
+import com.diagbot.service.impl.OrderDetailsServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/9/19 20:22
+ */
+@Component
+public class OrderDetailsFacade extends OrderDetailsServiceImpl{
+    public IPage<OrderDetails> orderDetialShows(Page page,OrderDetails orderDetails){
+        IPage<OrderDetails> orderDetailsIPage =orderDetialShow(page,orderDetails);
+        return orderDetailsIPage;
+    }
+}

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

@@ -22,7 +22,7 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<LantoneProduct> productLine(Page page, @Param("userId") int userId);
+    IPage<LantoneProduct> productLine(Page page, @Param("userId") Long userId);
 
     /**
      * @Description: 用户查询所有未开通产品

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

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.OrderDetails;
 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 org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface OrderDetailsMapper extends BaseMapper<OrderDetails> {
 
+    /**
+     * @Description: 订单编号查询订单明细
+     * @Author: wangyu
+     * @Date: 20:17 2018/9/19
+     */
+    IPage<OrderDetails>  orderDetialShow(Page page, @Param("orderDetails") OrderDetails orderDetails);
 }

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

@@ -21,7 +21,7 @@ public interface LantoneProductService extends IService<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<LantoneProduct> productLine(Page<LantoneProduct> page, int userId);
+    IPage<LantoneProduct> productLine(Page<LantoneProduct> page, Long userId);
 
     /**
      * @Description: 朗通查询所有产品线

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

@@ -1,7 +1,9 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.OrderDetails;
+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;
 
 /**
  * <p>
@@ -13,4 +15,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface OrderDetailsService extends IService<OrderDetails> {
 
+    /**
+     * @Description: 订单编号查询订单明细
+     * @Author: wangyu
+     * @Date: 20:17 2018/9/19
+     */
+    IPage<OrderDetails> orderDetialShow(Page page, OrderDetails orderDetails);
 }

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

@@ -7,6 +7,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.facade.LantoneProductFacade;
+import com.diagbot.facade.OpenedProductsFacade;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +29,8 @@ import java.util.Map;
 public class DiagLantoneProductController {
     @Autowired
     private LantoneProductFacade lantoneProductFacade;
+    @Autowired
+    private OpenedProductsFacade openedProductsFacade;
 
     @ApiOperation(value = "添加产品线",
             notes = "name：产品名，必填<br>" +
@@ -51,7 +54,7 @@ public class DiagLantoneProductController {
         return RespDTO.onSuc(pages);
     }
 
-    @ApiOperation(value = "修改产品",
+    @ApiOperation(value = "修改产品(产品启用同接口)",
             notes = "id：根据产品id修改产品内容，必填<br>")
     @PostMapping("/updateProduct")
     @SysLogger("updateProduct")
@@ -86,5 +89,7 @@ public class DiagLantoneProductController {
         System.out.println(lantoneProductFacade.opendedProduct(page,map));
         return RespDTO.onSuc(lantoneProductFacade.opendedProduct(page,map));
     }
+
+
 }
 

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

@@ -0,0 +1,35 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.OrderDetails;
+import com.diagbot.facade.OrderDetailsFacade;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description: 订单明细 前端控制器
+ * @Author: wangyu
+ * @Date: 15:46 2018/9/17
+ */
+@RestController
+@RequestMapping("/diagOrderDetails")
+public class DiagOrderDetailsController {
+    @Autowired
+    private OrderDetailsFacade orderDetailsFacade;
+
+    @ApiOperation(value = "根据订单编号查询订单明细", notes = "orderNum订单编号  必填<br>")
+    @GetMapping("/orderDetialShow")
+    @SysLogger("orderDetialShow")
+    public RespDTO<OrderDetails> orderDetialShow(Page page,OrderDetails orderDetails){
+        IPage<OrderDetails> orderDetailsIPage = orderDetailsFacade.orderDetialShows(page,orderDetails);
+        return RespDTO.onSuc(orderDetailsIPage);
+    }
+}
+

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

@@ -29,9 +29,7 @@ public class MoreServiceController {
     @GetMapping("/showProductInfo")
     @SysLogger("showProductInfo")
     public RespDTO<LantoneProduct> showProductInfo(Page page){
-
-        /*int userId = Integer.parseInt(UserUtils.getCurrentPrincipleID());//获取用户id*/
-        IPage<LantoneProduct> diagLantoneProducts =lantoneProductFacade.productLine(page,1);
+        IPage<LantoneProduct> diagLantoneProducts =lantoneProductFacade.productLine(page);
         return RespDTO.onSuc(diagLantoneProducts);
     }
 }

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

@@ -19,5 +19,7 @@
         <result column="reject_type" property="rejectType" />
         <result column="reject_reason" property="rejectReason" />
     </resultMap>
-
+    <select id="orderDetialShow" resultMap="BaseResultMap">
+        SELECT * FROM diag_order_details WHERE order_num =#{orderDetails.orderNum}
+    </select>
 </mapper>