modify param

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

@@ -32,7 +32,7 @@ public class FastSaleReq {
     private String sku;
 
     @NotNull(message = "sale_type_can_not_be_empty")
-    private Boolean saleType;
+    private Integer saleType;
 
     public static void checkParam(FastSaleReq fastSaleReq) {
         if (fastSaleReq.getRecycleFlag() && Objects.isNull(fastSaleReq.getRecycleInventory())) {

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.getSaleType() ? StrUtil.toString(SaleTypeEnum.SPOT.getCode()) : StrUtil.toString(SaleTypeEnum.PRE_SALE.getCode()));
+        sysDictDataService.validateOptions(ProductConstant.DICT_KEY_SALES_TYPE, Objects.nonNull(fastSaleReq.getSaleType()) ? StrUtil.toString(fastSaleReq.getSaleType()) : null);
         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.getSaleType() ? SaleTypeEnum.SPOT.getCode() : SaleTypeEnum.PRE_SALE.getCode())
+                    .saleType(fastSaleReq.getSaleType())
                     .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.getSaleType() ? SaleTypeEnum.SPOT.getCode() : SaleTypeEnum.PRE_SALE.getCode());
+            existingFastSale.setSaleType(fastSaleReq.getSaleType());
             existingFastSale.setRecycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode());
             existingFastSale.setRecycleInventory(fastSaleReq.getRecycleInventory());
             existingFastSale.setSaleTime(saleTimeUtc);

product-web/src/main/resources/i18n/messages.properties

@@ -28,4 +28,4 @@ failed_to_retrieve_checkList_basic_database_data=\u83B7\u53D6checkList\u57FA\u78
 id_cannot_be_empty=ID\u4E0D\u80FD\u4E3A\u7A7A
 not_found_value_for_current_dict=\u5F53\u524D\u5B57\u5178\u6CA1\u6709\u5BF9\u5E94\u7684\u503C
 product_type_error=\u5546\u54C1\u7C7B\u578B\u9519\u8BEF
-spot_flag_can_not_be_empty=\u9500\u552E\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
+sale_type_can_not_be_empty=\u9500\u552E\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A

product-web/src/main/resources/i18n/messages_en_US.properties

@@ -28,4 +28,4 @@ failed_to_retrieve_checkList_basic_database_data=failed to retrieve checkList ba
 id_cannot_be_empty=id cannot be empty
 not_found_value_for_current_dict=no found value for current dict
 product_type_error=product type error
-spot_flag_can_not_be_empty=spot flag can not be empty
+sale_type_can_not_be_empty=spot flag can not be empty

product-web/src/main/resources/i18n/messages_zh_TW.properties

@@ -28,4 +28,4 @@ failed_to_retrieve_checkList_basic_database_data=\u7372\u53D6checkList\u57FA\u79
 id_cannot_be_empty=ID\u4E0D\u80FD\u70BA\u7A7A
 not_found_value_for_current_dict=\u7576\u524D\u5B57\u5178\u6C92\u6709\u5C0D\u61C9\u7684\u503C
 product_type_error=\u5546\u54C1\u985E\u578B\u932F\u8AA4
-spot_flag_can_not_be_empty=\u92B7\u552E\u985E\u578B\u4E0D\u80FD\u70BA\u7A7A
+sale_type_can_not_be_empty=\u92B7\u552E\u985E\u578B\u4E0D\u80FD\u70BA\u7A7A