修改套餐规则

bms-back/bms-admin/src/main/java/com/bms/web/controller/price/ProductController.java

@@ -139,8 +139,8 @@ public class ProductController extends BaseController
         return success();
     }
 
-    /** Persist create-page preview details into draft/pending version. */
-    @PreAuthorize("@ss.hasPermi('price:product:add')")
+    /** Persist create-page preview details into draft/pending/effect version. */
+    @PreAuthorize("@ss.hasPermi('price:product:add') or @ss.hasPermi('price:product:edit')")
     @Log(title = "product preview apply", businessType = BusinessType.UPDATE)
     @PostMapping("/version/applyPreview")
     public AjaxResult applyPreview(@RequestBody CatalogPreviewApplyRequest body)
@@ -149,7 +149,7 @@ public class ProductController extends BaseController
     }
 
     /** Async parallel save of create-page preview. Returns taskId; poll /import/task/{taskId}. */
-    @PreAuthorize("@ss.hasPermi('price:product:add')")
+    @PreAuthorize("@ss.hasPermi('price:product:add') or @ss.hasPermi('price:product:edit')")
     @Log(title = "product preview apply", businessType = BusinessType.UPDATE)
     @PostMapping("/version/applyPreviewAsync")
     public AjaxResult applyPreviewAsync(@RequestBody CatalogPreviewApplyRequest body)
@@ -160,7 +160,7 @@ public class ProductController extends BaseController
         return success(payload);
     }
 
-    /** Save import Excel attachment onto a draft/pending version (prc_price_excel_file). */
+    /** Save import Excel attachment onto a draft/pending/effect version (prc_price_excel_file). */
     @PreAuthorize("@ss.hasPermi('price:product:import')")
     @Log(title = "product version excel", businessType = BusinessType.IMPORT)
     @PostMapping("/version/{psvId}/excel")

bms-back/bms-admin/src/main/java/com/bms/web/controller/price/RedlineProductController.java

@@ -139,8 +139,8 @@ public class RedlineProductController extends BaseController
         return success();
     }
 
-    /** Persist create-page preview details into draft/pending version. */
-    @PreAuthorize("@ss.hasPermi('price:redline:add')")
+    /** Persist create-page preview details into draft/pending/effect version. */
+    @PreAuthorize("@ss.hasPermi('price:redline:add') or @ss.hasPermi('price:redline:edit')")
     @Log(title = "redline preview apply", businessType = BusinessType.UPDATE)
     @PostMapping("/version/applyPreview")
     public AjaxResult applyPreview(@RequestBody RedlineCatalogPreviewApplyRequest body)
@@ -149,7 +149,7 @@ public class RedlineProductController extends BaseController
     }
 
     /** Async parallel save of create-page preview. Returns taskId; poll /import/task/{taskId}. */
-    @PreAuthorize("@ss.hasPermi('price:redline:add')")
+    @PreAuthorize("@ss.hasPermi('price:redline:add') or @ss.hasPermi('price:redline:edit')")
     @Log(title = "redline preview apply", businessType = BusinessType.UPDATE)
     @PostMapping("/version/applyPreviewAsync")
     public AjaxResult applyPreviewAsync(@RequestBody RedlineCatalogPreviewApplyRequest body)
@@ -160,7 +160,7 @@ public class RedlineProductController extends BaseController
         return success(payload);
     }
 
-    /** Save import Excel attachment onto a draft/pending version (prc_price_excel_file). */
+    /** Save import Excel attachment onto a draft/pending/effect version (prc_price_excel_file). */
     @PreAuthorize("@ss.hasPermi('price:redline:import')")
     @Log(title = "redline version excel", businessType = BusinessType.IMPORT)
     @PostMapping("/version/{psvId}/excel")

bms-back/bms-admin/src/main/resources/i18n/messages.properties

@@ -207,7 +207,7 @@ price.set.version.effectiveTime.empty=版本生效时间不能为空
 price.set.version.effectiveTime.beforePrev=生效时间不能早于上一版本的生效时间
 price.set.version.notExists=套餐版本不存在
 price.set.version.activate.statusNotAllowed=仅草稿或待生效版本可设置生效时间
-price.set.version.delete.statusNotAllowed=仅草稿或待生效版本可删除
+price.set.version.delete.statusNotAllowed=仅草稿、待生效或已生效版本可删除
 price.set.version.copy.draftExists=已有草稿版本，请先启动或删除后再复制
 price.set.version.create.draftExists=已有草稿版本，请先启动或删除后再新建
 price.set.save.task.notExists=保存任务不存在或已过期