修复用户在线加入复问题

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

@@ -114,6 +114,7 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
                 serviceSaveVO.setDescription(lantoneProducts.getDecription());
                 serviceSaveVO.setName(lantoneProducts.getName());
                 serviceSaveVO.setType(TokenTypeEnum.Online.getKey());
+                serviceSaveVO.setUserId(productOrder.getUserId());
                 ServiceInfo serviceInfo = serviceInfoFacade.createService(serviceSaveVO);
                 productServiceSaveVO =new ProductServiceSaveVO();
                 productServiceSaveVO.setProductId(lantoneProducts.getId());

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

@@ -36,6 +36,9 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
      */
     public ServiceInfo createService(ServiceSaveVO serviceSaveVO) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        if (null != serviceSaveVO.getUserId()){
+            userId = serviceSaveVO.getUserId();
+        }
         QueryWrapper<ServiceInfo> qw = new QueryWrapper<>();
         qw.eq("name", serviceSaveVO.getName()).
                 eq("user_id", userId).

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

@@ -18,4 +18,5 @@ public class ServiceSaveVO {
     @NotBlank(message = "请输入产品介绍!")
     private String description;
     private Integer type;
+    private Long userId;
 }

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

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2018/10/22 19:57
+ */
+@Getter
+@Setter
+public class ServiceUserSaveVO {
+    @NotBlank(message = "请输入产品名称!")
+    private String name;
+    @NotBlank(message = "请输入产品介绍!")
+    private String description;
+    private Integer type;
+}

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

@@ -7,7 +7,9 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ServiceInfo;
 import com.diagbot.facade.ServiceInfoFacade;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.ServiceSaveVO;
+import com.diagbot.vo.ServiceUserSaveVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +52,9 @@ public class ServiceInfoController {
     @PostMapping("/createService")
     @SysLogger("createService")
     @Transactional
-    public RespDTO<ServiceInfo> createService(@RequestBody @Valid ServiceSaveVO serviceSaveVO) {
+    public RespDTO<ServiceInfo> createService(@RequestBody @Valid ServiceUserSaveVO serviceUserSaveVO) {
+        ServiceSaveVO serviceSaveVO = new ServiceSaveVO();
+        BeanUtil.copyProperties(serviceUserSaveVO, serviceSaveVO);
         ServiceInfo serviceInfo = serviceInfoFacade.createService(serviceSaveVO);
         return RespDTO.onSuc(serviceInfo);
     }