优化代码

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

@@ -6,13 +6,17 @@ import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.dto.OpenUpOnTrialDTO;
 import com.diagbot.dto.ProductServiceDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
 import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.UserRenewals;
 import com.diagbot.enums.AccessTypeEnum;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.RenewalsEnum;
+import com.diagbot.enums.ServiceTypeEnum;
 import com.diagbot.enums.StatusEnum;
+import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.OpenedProductsServiceImpl;
@@ -43,6 +47,8 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
     private ProductServiceFacade productServiceFacade;
     @Autowired 
     private UserRenewalsFacade userRenewalsFacade;
+    @Autowired
+    private LantoneProductFacade lantoneProductFacade;
     public List<OpenedProducts> getByAppkeyAndSecretFac(Map map) {
         return this.getByAppkeyAndSecret(map);
     }
@@ -114,31 +120,36 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
      * @return 包含token
      */
     public OpenUpOnTrialDTO openUpOnTrial(OpenUpOnTrialVO openUpOnTrialVO) {
+        LantoneProduct lantoneProduct =new LantoneProduct();
+        lantoneProduct.setId(openUpOnTrialVO.getProductId());
+        LantoneProduct lantoneProducts = lantoneProductFacade.getById(lantoneProduct);
+        if (null == lantoneProducts || IsDeleteEnum.Y.getKey().equals(lantoneProducts.getIsDeleted())){
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品已删除！");
+        }
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        String userName = UserUtils.getCurrentPrinciple();
         Date now = new Date();
         ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.setType(2);
+        serviceInfo.setType(ServiceTypeEnum.Sys_Create.getKey());
         serviceInfo.setUserId(userId);
-        serviceInfo.setDescription("用户试用产品-虚拟服务");
-        serviceInfo.setName("虚拟服务");
-        serviceInfo.setCreator(userName);
+        serviceInfo.setDescription("用户试用产品-" + lantoneProducts.getDecription());
+        serviceInfo.setName("用户试用产品-" + lantoneProducts.getName());
+        serviceInfo.setCreator(userId.toString());
         serviceInfo.setGmtCreate(now);
-        serviceInfo.setIsDeleted("N");
+        serviceInfo.setIsDeleted(IsDeleteEnum.N.getKey());
         serviceInfoFacade.save(serviceInfo);
 
         ProductService productService = new ProductService();
         productService.setServiceId(serviceInfo.getId());
         productService.setProductId(openUpOnTrialVO.getProductId());
-        productService.setCreator(userName);
+        productService.setCreator(userId.toString());
         productService.setGmtCreate(now);
-        productService.setIsDeleted("N");
+        productService.setIsDeleted(IsDeleteEnum.N.getKey());
         productServiceFacade.save(productService);
 
         ProductServiceSaveVO productServiceSaveVO = new ProductServiceSaveVO();
         productServiceSaveVO.setProductId(openUpOnTrialVO.getProductId());
         productServiceSaveVO.setServiceId(serviceInfo.getId());
-        productServiceSaveVO.setType(3);
+        productServiceSaveVO.setType(TokenTypeEnum.Trial.getKey());
         ProductServiceDTO poroductServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
 
         OpenUpOnTrialDTO openUpOnTrialDTO = new OpenUpOnTrialDTO();

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

@@ -111,8 +111,8 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
         for (String s:list) {
             if(Integer.parseInt(s) ==(TokenTypeEnum.Online.getKey())){
                 serviceSaveVO =new ServiceSaveVO();
-                serviceSaveVO.setDescription(lantoneProducts.getDecription());
-                serviceSaveVO.setName(lantoneProducts.getName());
+                serviceSaveVO.setDescription("用户线上产品-" + lantoneProducts.getDecription());
+                serviceSaveVO.setName("用户线上产品-" + lantoneProducts.getName());
                 serviceSaveVO.setType(TokenTypeEnum.Online.getKey());
                 serviceSaveVO.setUserId(productOrder.getUserId());
                 ServiceInfo serviceInfo = serviceInfoFacade.createService(serviceSaveVO);