hr~ 11 часов назад
Родитель
Сommit
07322d5be9

+ 2 - 2
product-common/src/main/java/com/poyee/req/FastSaleReq.java

@@ -31,8 +31,8 @@ public class FastSaleReq {
     @NotBlank(message = "sku_can_not_be_empty")
     private String sku;
 
-    @NotNull(message = "spot_flag_can_not_be_empty")
-    private Boolean spotFlag;
+    @NotNull(message = "sale_type_can_not_be_empty")
+    private Boolean saleType;
 
     public static void checkParam(FastSaleReq fastSaleReq) {
         if (fastSaleReq.getRecycleFlag() && Objects.isNull(fastSaleReq.getRecycleInventory())) {

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

@@ -204,7 +204,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()));
-        sysDictDataService.validateOptions(ProductConstant.DICT_KEY_SALES_TYPE, fastSaleReq.getSpotFlag() ? StrUtil.toString(SaleTypeEnum.SPOT.getCode()) : StrUtil.toString(SaleTypeEnum.PRE_SALE.getCode()));
+        sysDictDataService.validateOptions(ProductConstant.DICT_KEY_SALES_TYPE, fastSaleReq.getSaleType() ? StrUtil.toString(SaleTypeEnum.SPOT.getCode()) : StrUtil.toString(SaleTypeEnum.PRE_SALE.getCode()));
         LocalDateTime saleTimeUtc = LocaleTimeZoneUtil.toUtc(fastSaleReq.getSaleTime());
         ProductPermission productPermission = productPermissionService.lambdaQuery().eq(ProductPermission::getRelationSku, fastSaleReq.getSku()).one();
         if (Objects.isNull(productPermission)) {
@@ -220,7 +220,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
         }
         if (Objects.isNull(existingFastSale)) {
             ProductFastSale newFastSale = ProductFastSale.builder()
-                    .saleType(fastSaleReq.getSpotFlag() ? SaleTypeEnum.SPOT.getCode() : SaleTypeEnum.PRE_SALE.getCode())
+                    .saleType(fastSaleReq.getSaleType() ? SaleTypeEnum.SPOT.getCode() : SaleTypeEnum.PRE_SALE.getCode())
                     .sku(fastSaleReq.getSku())
                     .recycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode())
                     .recycleInventory(fastSaleReq.getRecycleInventory())
@@ -232,7 +232,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
             productInfo.setFastSaleFlag(StatusEnum.TRUE.getCode());
             return this.productInfoService.updateById(productInfo);
         } else {
-            existingFastSale.setSaleType(fastSaleReq.getSpotFlag() ? SaleTypeEnum.SPOT.getCode() : SaleTypeEnum.PRE_SALE.getCode());
+            existingFastSale.setSaleType(fastSaleReq.getSaleType() ? SaleTypeEnum.SPOT.getCode() : SaleTypeEnum.PRE_SALE.getCode());
             existingFastSale.setRecycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode());
             existingFastSale.setRecycleInventory(fastSaleReq.getRecycleInventory());
             existingFastSale.setSaleTime(saleTimeUtc);