hr~ 2 days ago
parent
commit
f606e7f5b5

+ 5 - 4
product-web/src/main/java/com/poyee/facade/impl/ProductInfoFacade.java

@@ -82,7 +82,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
                 .collect(Collectors.toMap(ProductFastSale::getSku, Function.identity()));
         List<ProductListRes> productListResList = productInfos.stream()
                 .map(productInfo -> {
-                     ProductListBO productBO = productInfoMapstruct.productDo2Bo(productInfo);
+                    ProductListBO productBO = productInfoMapstruct.productDo2Bo(productInfo);
                     ProductListRes productListRes = productInfoMapstruct.productBO2Res(productBO);
                     if (Objects.nonNull(productInfo.getFastSaleFlag()) && productInfo.getFastSaleFlag() == StatusEnum.TRUE.getCode() && Objects.nonNull(fastSaleMap.get(productInfo.getSku()))) {
                         productListRes.setSaleTime(fastSaleMap.get(productInfo.getSku()).getSaleTime());
@@ -90,7 +90,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
                     }
                     return productListRes;
                 })
-                 .collect(Collectors.toList());
+                .collect(Collectors.toList());
         return PageInfo.of(productListResList);
     }
 
@@ -347,9 +347,10 @@ public class ProductInfoFacade implements IProductInfoFacade {
             throw new BusinessException("review_status_cannot_be_null");
         }
         if (targetStatus.equals(ReviewStatusEnum.LISTED.getCode())) {
-            if (!currentStatus.equals(ReviewStatusEnum.DOWN.getCode()) &&
+            if (!currentStatus.equals(ReviewStatusEnum.PENDING.getCode()) &&
+                    !currentStatus.equals(ReviewStatusEnum.DOWN.getCode()) &&
                     !currentStatus.equals(ReviewStatusEnum.REJECTED.getCode())) {
-                throw new BusinessException("can_only_list_down_or_rejected_product");
+                throw new BusinessException("can_only_list_pending_down_or_rejected_product");
             }
         } else if (targetStatus.equals(ReviewStatusEnum.DOWN.getCode())) {
             if (!currentStatus.equals(ReviewStatusEnum.LISTED.getCode())) {