checked

product-common/src/main/java/com/poyee/domain/ProductPermission.java

@@ -43,7 +43,7 @@ public class ProductPermission implements Serializable {
     /**
      * 创建时间
      */
-    private LocalDateTime createTme;
+    private LocalDateTime createTime;
 
     /**
      * 修改时间
@@ -67,7 +67,7 @@ public class ProductPermission implements Serializable {
                 ", id = " + id +
                 ", relationSku = " + relationSku +
                 ", permission = " + permission +
-                ", createTme = " + createTme +
+                ", createTime = " + createTime +
                 ", updateTime = " + updateTime +
                 ", deleteFlag = " + deleteFlag +
                 ", version = " + version +

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

@@ -165,7 +165,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
         if (Objects.isNull(productPermission)) {
             productPermission = ProductPermission.builder()
                     .permission(idleAttributeReq.getPermission())
-                    .createTme(LocaleTimeZoneUtil.nowUtc())
+                    .createTime(LocaleTimeZoneUtil.nowUtc())
                     .relationSku(productInfo.getSku()).build();
             productPermissionService.save(productPermission);
         } else {
@@ -180,12 +180,13 @@ public class ProductInfoFacade implements IProductInfoFacade {
     public ProductFastSaleRes fastSale(String sku) {
         ProductInfo productInfo = productInfo(sku);
         ProductFastSale productFastSale = productFastSaleService.lambdaQuery().eq(ProductFastSale::getSku, sku).one();
+        ProductPermission productPermission = productPermissionService.lambdaQuery().eq(ProductPermission::getRelationSku, sku).one();
         if (Objects.nonNull(productFastSale)) {
             return ProductFastSaleRes.builder()
                     .recycleFlag(productInfo.getFastSaleFlag() == StatusEnum.TRUE.getCode() ? Boolean.TRUE : Boolean.FALSE)
                     .recycleInventory(productFastSale.getRecycleInventory())
                     .saleTime(productFastSale.getSaleTime())
-                    .permission(productPermissionService.lambdaQuery().eq(ProductPermission::getRelationSku, sku).one().getPermission())
+                    .permission(Objects.nonNull(productPermission) ? productPermission.getPermission() : null)
                     .build();
         }
         return ProductFastSaleRes.builder().build();
@@ -202,7 +203,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
         sysDictDataService.validateOptions(ProductConstant.DICT_KEY_WHETHER, fastSaleReq.getRecycleFlag() ? StrUtil.toString(WhetherEnum.YES.getCode()) : StrUtil.toString(WhetherEnum.NO.getCode()));
         sysDictDataService.validateOptions(ProductConstant.DICT_KEY_PERMISSION, StrUtil.toString(fastSaleReq.getPermission()));
         LocalDateTime saleTimeUtc = LocaleTimeZoneUtil.toUtc(fastSaleReq.getSaleTime());
-        int saleType = Objects.nonNull(saleTimeUtc) ? SaleTypeEnum.PRE_SALE.getCode() : SaleTypeEnum.SPOT.getCode();
+        int saleType = Objects.nonNull(saleTimeUtc) ? SaleTypeEnum.SPOT.getCode() : SaleTypeEnum.PRE_SALE.getCode();
         if (Objects.isNull(existingFastSale)) {
             ProductFastSale newFastSale = ProductFastSale.builder()
                     .saleType(saleType)