试用产品token修改

diagbotman-service/src/main/java/com/diagbot/dto/OpenUpOnTrialDTO.java

@@ -2,6 +2,8 @@ package com.diagbot.dto;
 
 import java.io.Serializable;
 
+import com.diagbot.entity.ServiceToken;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,5 +16,7 @@ public class OpenUpOnTrialDTO implements Serializable{
 	 */
 	private static final long serialVersionUID = 1L;
 	
-
+	
+	private ServiceToken serviceToken;
+	
 }

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

@@ -1,5 +1,12 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
@@ -8,7 +15,6 @@ 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;
@@ -19,12 +25,6 @@ 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;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:产品业务层

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

@@ -11,6 +11,7 @@ import com.diagbot.dto.EnShowOptionDTO;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.dto.OpenUpOnTrialDTO;
+import com.diagbot.dto.ProductServiceDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
 import com.diagbot.entity.ServiceInfo;
@@ -72,9 +73,10 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
     	productServiceSaveVO.setProductId(openUpOnTrialVO.getProductId());
     	productServiceSaveVO.setServiceId(serviceInfo.getId());
     	productServiceSaveVO.setType(3);
-    	productServiceFacade.genProductService(productServiceSaveVO);
+    	ProductServiceDTO poroductServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
     	
     	OpenUpOnTrialDTO openUpOnTrialDTO = new OpenUpOnTrialDTO();
+    	openUpOnTrialDTO.setServiceToken(poroductServiceDTO.getServiceToken());
     	
     	return openUpOnTrialDTO;	
     }