Merge remote-tracking branch 'origin/dev/diagbotcloud20190918_vital' into dev/diagbotcloud20190918_vital

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

@@ -73,7 +73,9 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
                     "无法操作，该产品线已停用");
         }
         QueryWrapper<OpenedProducts> openedProductsQueryWrapper = new QueryWrapper<>();
-        openedProductsQueryWrapper.eq("product_id", lantoneProduct.getId()).eq("user_id", userId);
+        openedProductsQueryWrapper
+                .eq("product_id", lantoneProduct.getId())
+                .eq("user_id", userId);
         List<OpenedProducts> openedProductsList = openedProductsFacade.list(openedProductsQueryWrapper);
         openedProductsQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         OpenedProducts openedProducts = openedProductsFacade.getOne(openedProductsQueryWrapper, false);
@@ -102,9 +104,10 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         }
 
         QueryWrapper<ProductService> qwps = new QueryWrapper<>();
-        qwps.eq("product_id", productServiceSaveVO.getProductId());
-        qwps.eq("service_id", productServiceSaveVO.getServiceId());
-        qwps.eq("is_deleted", IsDeleteEnum.N.getKey());
+        qwps
+                .eq("product_id", productServiceSaveVO.getProductId())
+                .eq("service_id", productServiceSaveVO.getServiceId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
         ProductService productService = this.getOne(qwps, false);
         if (productService == null) {
             productService = new ProductService();
@@ -136,7 +139,8 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         serviceToken.setAppKeyId(GuidUtil.App_key());
         serviceToken.setAppKeySecret(GuidUtil.App_screct());
         serviceToken.setStatus(StatusEnum.Enable.getKey());
-        if (old_serviceToken != null && old_serviceToken.getType().equals(TokenTypeEnum.Trial.getKey())) {
+        if (old_serviceToken != null
+                && old_serviceToken.getType().equals(TokenTypeEnum.Trial.getKey())) {
             //如果试用已过期，不允许再生成
             if (DateUtil.after(DateUtil.now(), old_serviceToken.getExpiringDate())) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
@@ -188,7 +192,9 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
      */
     public Boolean deleteByProductId(Long productId) {
         QueryWrapper<ProductService> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("product_id", productId).eq("is_deleted", IsDeleteEnum.N.getKey());
+        queryWrapper
+                .eq("product_id", productId)
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
         List<ProductService> productServiceList = this.list(queryWrapper);
         Map<Long, ProductService> map = EntityUtil.makeEntityMap(productServiceList, "id");
         if (map != null && map.size() > 0) {