Browse Source

统一格式

hr~ 12 hours ago
parent
commit
45afc997d7

+ 2 - 2
product-common/src/main/java/com/poyee/res/ProductListRes.java

@@ -24,11 +24,11 @@ public class ProductListRes {
     @ApiModelProperty("审核状态")
     @ApiModelProperty("审核状态")
     private Integer status;
     private Integer status;
     @ApiModelProperty("闪购权限")
     @ApiModelProperty("闪购权限")
-    private Integer fastSaleFlag;
+    private Boolean fastSaleFlag;
     @ApiModelProperty("可回收库存")
     @ApiModelProperty("可回收库存")
     private Integer recycleInventory;
     private Integer recycleInventory;
     @ApiModelProperty("闲置权限")
     @ApiModelProperty("闲置权限")
-    private Integer idleFlag;
+    private Boolean idleFlag;
     @ApiModelProperty("官方发售时间")
     @ApiModelProperty("官方发售时间")
     private LocalDateTime saleTime;
     private LocalDateTime saleTime;
     @ApiModelProperty("发售类型")
     @ApiModelProperty("发售类型")

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

@@ -85,6 +85,8 @@ public class ProductInfoFacade implements IProductInfoFacade {
                 .map(productInfo -> {
                 .map(productInfo -> {
                     ProductListBO productBO = productInfoMapstruct.productDo2Bo(productInfo);
                     ProductListBO productBO = productInfoMapstruct.productDo2Bo(productInfo);
                     ProductListRes productListRes = productInfoMapstruct.productBO2Res(productBO);
                     ProductListRes productListRes = productInfoMapstruct.productBO2Res(productBO);
+                    productListRes.setIdleFlag(Objects.equals(productBO.getIdleFlag(), WhetherEnum.YES.getCode()));
+                    productListRes.setFastSaleFlag(Objects.equals(productBO.getFastSaleFlag(), WhetherEnum.YES.getCode()));
                     if (Objects.nonNull(productInfo.getFastSaleFlag()) && productInfo.getFastSaleFlag() == StatusEnum.TRUE.getCode() && Objects.nonNull(fastSaleMap.get(productInfo.getSku()))) {
                     if (Objects.nonNull(productInfo.getFastSaleFlag()) && productInfo.getFastSaleFlag() == StatusEnum.TRUE.getCode() && Objects.nonNull(fastSaleMap.get(productInfo.getSku()))) {
                         productListRes.setSaleTime(fastSaleMap.get(productInfo.getSku()).getSaleTime());
                         productListRes.setSaleTime(fastSaleMap.get(productInfo.getSku()).getSaleTime());
                         productListRes.setRecycleInventory(fastSaleMap.get(productInfo.getSku()).getRecycleInventory());
                         productListRes.setRecycleInventory(fastSaleMap.get(productInfo.getSku()).getRecycleInventory());
@@ -153,7 +155,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
                 .eq(ProductPermission::getPermissionType, PermissionType.IDLE.getCode()).one();
                 .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()
         return IdleAttributeRes.builder()
-                .idleFlag(Objects.equals(productInfo.getIdleFlag(), WhetherEnum.YES.getCode()) ? Boolean.TRUE : Boolean.FALSE)
+                .idleFlag(Objects.equals(productInfo.getIdleFlag(), WhetherEnum.YES.getCode()))
                 .permission(productPermission.getPermission())
                 .permission(productPermission.getPermission())
                 .build();
                 .build();
     }
     }
@@ -191,7 +193,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
                 .eq(ProductPermission::getPermissionType, PermissionType.FAST_SALE.getCode()).one();
                 .eq(ProductPermission::getPermissionType, PermissionType.FAST_SALE.getCode()).one();
         Assert.notNull(productFastSale, "the_product_fast_sale_does_not_exist");
         Assert.notNull(productFastSale, "the_product_fast_sale_does_not_exist");
         return ProductFastSaleRes.builder()
         return ProductFastSaleRes.builder()
-                .recycleFlag(productFastSale.getRecycleFlag() == StatusEnum.TRUE.getCode() ? Boolean.TRUE : Boolean.FALSE)
+                .recycleFlag(productFastSale.getRecycleFlag() == StatusEnum.TRUE.getCode())
                 .recycleInventory(productFastSale.getRecycleInventory())
                 .recycleInventory(productFastSale.getRecycleInventory())
                 .saleTime(productFastSale.getSaleTime())
                 .saleTime(productFastSale.getSaleTime())
                 .saleType(productFastSale.getSaleType())
                 .saleType(productFastSale.getSaleType())