hr~ 5 timmar sedan
förälder
incheckning
9a4d064e61

+ 1 - 1
product-web/src/main/java/com/poyee/facade/IProductInfoFacade.java

@@ -38,7 +38,7 @@ public interface IProductInfoFacade {
      * 查看当前sku详情信息
      *
      * @param sku sku
-     * @return
+     * @return IdleAttributeRes
      */
     IdleAttributeRes idleAttribute(String sku);
 

+ 7 - 10
product-web/src/main/java/com/poyee/facade/impl/ProductInfoFacade.java

@@ -153,13 +153,12 @@ public class ProductInfoFacade implements IProductInfoFacade {
 
         ProductPermission productPermission = this.productPermissionService.lambdaQuery().eq(ProductPermission::getRelationSku, productInfo.getSku())
                 .eq(ProductPermission::getPermissionType, PermissionType.IDLE.getCode()).one();
-        Assert.notNull(productPermission, "the_product_permission_does_not_exist");
+//        Assert.notNull(productPermission, "the_product_permission_does_not_exist");
         return IdleAttributeRes.builder()
-                .idleFlag(Objects.equals(productInfo.getIdleFlag(), WhetherEnum.YES.getCode()))
-                .permission(productPermission.getPermission())
+                .idleFlag(Objects.nonNull(productInfo.getIdleFlag()) ? Objects.equals(productInfo.getIdleFlag(), WhetherEnum.YES.getCode()) : null)
+                .permission(Objects.nonNull(productPermission) ? productPermission.getPermission() : null)
                 .build();
     }
-
     @Transactional
     @Override
     public Boolean idleAttribute(IdleAttributeReq idleAttributeReq) {
@@ -191,16 +190,14 @@ public class ProductInfoFacade implements IProductInfoFacade {
         ProductFastSale productFastSale = productFastSaleService.lambdaQuery().eq(ProductFastSale::getSku, sku).one();
         ProductPermission productPermission = productPermissionService.lambdaQuery().eq(ProductPermission::getRelationSku, sku)
                 .eq(ProductPermission::getPermissionType, PermissionType.FAST_SALE.getCode()).one();
-        Assert.notNull(productFastSale, "the_product_fast_sale_does_not_exist");
         return ProductFastSaleRes.builder()
-                .recycleFlag(productFastSale.getRecycleFlag() == StatusEnum.TRUE.getCode())
-                .recycleInventory(productFastSale.getRecycleInventory())
-                .saleTime(productFastSale.getSaleTime())
-                .saleType(productFastSale.getSaleType())
+                .recycleFlag(Objects.nonNull(productFastSale) ? productFastSale.getRecycleFlag() == StatusEnum.TRUE.getCode() : null)
+                .recycleInventory(Objects.nonNull(productFastSale) ? productFastSale.getRecycleInventory() : null)
+                .saleTime(Objects.nonNull(productFastSale) ? productFastSale.getSaleTime() : null)
+                .saleType(Objects.nonNull(productFastSale) ? productFastSale.getSaleType() : null)
                 .permission(Objects.nonNull(productPermission) ? productPermission.getPermission() : null)
                 .build();
     }
-
     @Transactional
     @Override
     public Boolean fastSale(FastSaleReq fastSaleReq) {