修复用户在线服务加入复问题

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

@@ -120,6 +120,7 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
                 productServiceSaveVO.setProductId(lantoneProducts.getId());
                 productServiceSaveVO.setServiceId(serviceInfo.getId());
                 productServiceSaveVO.setType(TokenTypeEnum.Online.getKey());
+                productServiceSaveVO.setUserId(productOrder.getUserId());
                 productServiceFacade.genProductService(productServiceSaveVO);
                 break;
             }

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

@@ -49,6 +49,9 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
     public ProductServiceDTO genProductService(ProductServiceSaveVO productServiceSaveVO) {
         ProductServiceDTO productServiceDTO = new ProductServiceDTO();
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        if (null != productServiceSaveVO.getUserId()){
+            userId = productServiceSaveVO.getUserId();
+        }
         LantoneProduct lantoneProduct = lantoneProductFacade.getById(productServiceSaveVO.getProductId());
         if (lantoneProduct == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS,

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

@@ -19,4 +19,5 @@ public class ProductServiceSaveVO {
     @NotNull(message = "请输入服务Id!")
     private Long serviceId;
     private Integer type;
+    private Long userId;
 }

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

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: zhaops
+ * @time: 2018/9/18 18:53
+ */
+@Getter
+@Setter
+public class ProductServiceUserSaveVO {
+    @NotNull(message = "请输入产品Id!")
+    private Long productId;
+    @NotNull(message = "请输入服务Id!")
+    private Long serviceId;
+    private Integer type;
+}

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

@@ -9,7 +9,9 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.wrapper.ProductServiceWrapper;
 import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.facade.ProductServiceFacade;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.ProductServiceSaveVO;
+import com.diagbot.vo.ProductServiceUserSaveVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +41,7 @@ public class ProductServiceController {
     /**
      * 服务端关联到产品接口
      *
-     * @param productServiceSaveVO
+     * @param userSaveVO
      * @return
      */
     @ApiOperation(value = "服务端关联到产品接口[by:zhaops]",
@@ -48,8 +50,10 @@ public class ProductServiceController {
     @PostMapping("/genProductService")
     @SysLogger("genProductService")
     @Transactional
-    public RespDTO<ProductServiceDTO> genProductService(@RequestBody ProductServiceSaveVO productServiceSaveVO) {
-        productServiceSaveVO.setType(TokenTypeEnum.Manual.getKey());
+    public RespDTO<ProductServiceDTO> genProductService(@RequestBody ProductServiceUserSaveVO userSaveVO) {
+        userSaveVO.setType(TokenTypeEnum.Manual.getKey());
+        ProductServiceSaveVO productServiceSaveVO = new ProductServiceSaveVO();
+        BeanUtil.copyProperties(userSaveVO, productServiceSaveVO);
         ProductServiceDTO productServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
         return RespDTO.onSuc(productServiceDTO);
     }

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

@@ -43,7 +43,7 @@ public class ServiceInfoController {
     /**
      * 新增服务
      *
-     * @param serviceSaveVO
+     * @param serviceUserSaveVO
      * @return
      */
     @ApiOperation(value = "新增服务[by:zhaops]",

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

@@ -4,13 +4,14 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ProductServiceDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.ServiceToken;
 import com.diagbot.entity.wrapper.ServiceTokenWrapper;
 import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.facade.ProductServiceFacade;
 import com.diagbot.facade.ServiceTokenFacade;
-import com.diagbot.vo.ServiceTokenVo;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.ProductServiceSaveVO;
+import com.diagbot.vo.ProductServiceUserSaveVO;
+import com.diagbot.vo.ServiceTokenVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +55,7 @@ public class ServiceTokenController {
     /**
      * 生成令牌
      *
-     * @param productServiceSaveVO
+     * @param userSaveVO
      * @return
      */
     @ApiOperation(value = "生成令牌[by:zhaops]",
@@ -63,8 +64,10 @@ public class ServiceTokenController {
     @PostMapping("/createServiceToken")
     @SysLogger("createServiceToken")
     @Transactional
-    public RespDTO<ProductServiceDTO> createServiceToken(@RequestBody @Valid ProductServiceSaveVO productServiceSaveVO) {
-        productServiceSaveVO.setType(TokenTypeEnum.Manual.getKey());
+    public RespDTO<ProductServiceDTO> createServiceToken(@RequestBody @Valid ProductServiceUserSaveVO userSaveVO) {
+        userSaveVO.setType(TokenTypeEnum.Manual.getKey());
+        ProductServiceSaveVO productServiceSaveVO = new ProductServiceSaveVO();
+        BeanUtil.copyProperties(userSaveVO, productServiceSaveVO);
         ProductServiceDTO productServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
         return RespDTO.onSuc(productServiceDTO);
     }