spotFlag

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

@@ -31,6 +31,9 @@ public class FastSaleReq {
     @NotBlank(message = "sku_can_not_be_empty")
     private String sku;
 
+    @NotNull(message = "spot_flag_can_not_be_empty")
+    private Boolean spotFlag;
+
     public static void checkParam(FastSaleReq fastSaleReq) {
         if (fastSaleReq.getRecycleFlag() && Objects.isNull(fastSaleReq.getRecycleInventory())) {
             throw new RuntimeException("product.recycleInventory.notNull");

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

@@ -202,11 +202,11 @@ 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_PERMISSION, fastSaleReq.getSpotFlag() ? StrUtil.toString(SaleTypeEnum.SPOT.getCode()) : StrUtil.toString(SaleTypeEnum.PRE_SALE.getCode()));
         LocalDateTime saleTimeUtc = LocaleTimeZoneUtil.toUtc(fastSaleReq.getSaleTime());
-        int saleType = Objects.nonNull(saleTimeUtc) ? SaleTypeEnum.SPOT.getCode() : SaleTypeEnum.PRE_SALE.getCode();
         if (Objects.isNull(existingFastSale)) {
             ProductFastSale newFastSale = ProductFastSale.builder()
-                    .saleType(saleType)
+                    .saleType(fastSaleReq.getSpotFlag() ? SaleTypeEnum.SPOT.getCode() : SaleTypeEnum.PRE_SALE.getCode())
                     .sku(fastSaleReq.getSku())
                     .recycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode())
                     .recycleInventory(fastSaleReq.getRecycleInventory())
@@ -218,7 +218,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
             productInfo.setFastSaleFlag(StatusEnum.TRUE.getCode());
             return this.productInfoService.updateById(productInfo);
         } else {
-            existingFastSale.setSaleType(saleType);
+            existingFastSale.setSaleType(fastSaleReq.getSpotFlag() ? 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);

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

@@ -28,3 +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=\u92B7\u552E\u985E\u578B\u4E0D\u80FD\u70BA\u7A7A

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

@@ -27,4 +27,5 @@ failed_to_call_dictionary_table_api=failed to call dictionary table api
 failed_to_retrieve_checkList_basic_database_data=failed to retrieve checkList basic database data
 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
+product_type_error=product type error
+spot_flag_can_not_be_empty=spot flag can not be empty

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

@@ -27,4 +27,5 @@ failed_to_call_dictionary_table_api=\u8ABF\u7528\u5B57\u5178\u9336\u4ECB\u9762\u
 failed_to_retrieve_checkList_basic_database_data=\u7372\u53D6checkList\u57FA\u790E\u5EAB\u6578\u64DA\u5931\u6557
 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
+product_type_error=\u5546\u54C1\u985E\u578B\u932F\u8AA4
+spot_flag_can_not_be_empty=