产品线管理添加产品入参优化 注释优化

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

@@ -15,6 +15,7 @@ import com.diagbot.service.impl.LantoneProductServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.AddProductsVO;
 import com.diagbot.vo.OppendedProductVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -36,13 +37,16 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
     private UserServiceClient userServiceClient;
 
     /**
-     * @Description: 添加产品业务逻辑
+     * @Description: 产品线管理添加产品
      * @Author: wangyu
-     * @Date: 19:59 2018/9/18
+     * @param addProductsVO 需要提供的参数（产品名称，产品介绍，产品url，产品计费方式）
+     * @return
      */
-    public Boolean addProducts(LantoneProduct lantoneProduct) {
+    public Boolean addProducts(AddProductsVO addProductsVO) {
+        LantoneProduct lantoneProduct =new LantoneProduct();
         lantoneProduct.setGmtCreate(DateUtil.now());
         lantoneProduct.setCreator(UserUtils.getCurrentPrincipleID());
+        BeanUtil.copyProperties(addProductsVO,lantoneProduct);
         if (!save(lantoneProduct)) {
             throw new CommonException(CommonErrorCode.FAIL);
         }

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

@@ -109,6 +109,8 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	 * @Description:  根据订单号查询订单信息
 	 * @Author: wangyu
 	 * @Date: 19:42 2018/9/20
+	 * @param productOrder
+	 * @return
 	 */
 	public ProductOrder selectByOrderNum(ProductOrder productOrder){
 		return selctOrderTimeByOrderNum(productOrder);
@@ -122,7 +124,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
     }
 
 	/**
-	 * @Description: 查询所有订单明细
+	 * @Description: 产品申请查询所有订单明细
 	 * @Author: wangyu
 	 * @Date: 16:19 2018/9/21
 	 */
@@ -138,6 +140,8 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 		}
 		BeanUtil.copyProperties(orderDetialsVO, orderDetailsIndex);
 		orderDetailsIndex.setIndex((orderDetialsVO.getCurrent().longValue()-1)*orderDetialsVO.getSize().longValue());
+
+		orderDetailsIndex.setUserId(1L);
 		List<OrderDetailsWapper> list =orderDetailsFacade.seleAllOrderDetials(orderDetailsIndex);
 		List<Long> list1 =new ArrayList<>();
 		for (OrderDetails orderDetails:list) {

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

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/9/25 16:16
+ */
+@Getter
+@Setter
+public class AddProductsVO {
+    @NotBlank(message = "请输入产品名称!")
+    private String name;
+    @NotBlank(message = "请输入产品介绍!")
+    private String decription;
+    @NotBlank(message = "请输入产品路径!")
+    private String url;
+    @NotBlank(message = "请输入计费方式!")
+    private String chargeType;
+}

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

@@ -9,6 +9,7 @@ import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.facade.LantoneProductFacade;
+import com.diagbot.vo.AddProductsVO;
 import com.diagbot.vo.OppendedProductVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,7 +34,7 @@ public class DiagLantoneProductController {
     @Autowired
     private LantoneProductFacade lantoneProductFacade;
 
-    @ApiOperation(value = "添加产品线[by:wangyu]",
+    @ApiOperation(value = "产品线管理添加产品[by:wangyu]",
             notes = "name：产品名，必填<br>" +
                     "decription：产品描述，必填<br> " +
                     "url：产品访问路径，必填<br>" +
@@ -41,8 +42,8 @@ public class DiagLantoneProductController {
     @PostMapping("/addProducts")
     @SysLogger("addProducts")
     @Transactional
-    public RespDTO<Boolean> addProducts(LantoneProduct lantoneProduct){
-        return RespDTO.onSuc(lantoneProductFacade.addProducts(lantoneProduct));
+    public RespDTO<Boolean> addProducts(AddProductsVO addProductsVO){
+        return RespDTO.onSuc(lantoneProductFacade.addProducts(addProductsVO));
     }
 
     @ApiOperation(value = "分页查询查询产品线[by:wangyu]",