修改测算逻辑

2026-09-18 17:09:43 +08:00
parent e08a36de91
commit bb240746a6
22 changed files with 435 additions and 44 deletions
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -183,7 +184,17 @@ public class PriceSetController extends BaseController
        return getDataTable(list);
    }

-    @PreAuthorize("@ss.hasPermi('price:set:edit')")
+    /**
+     * 版本明细搜索下拉选项：按版本去重后的 产品/国家/分区
+     */
+    @PreAuthorize("@ss.hasPermi('price:set:list')")
+    @GetMapping("/detail/options")
+    public AjaxResult detailOptions(@RequestParam("psvId") Long psvId)
+    {
+        return success(priceSetService.selectDetailOptions(psvId));
+    }
+
+    @PreAuthorize("@ss.hasPermi('price:set:edit') or @ss.hasPermi('price:set:forceEdit')")
    @Log(title = "套餐明细", businessType = BusinessType.INSERT)
    @PostMapping("/detail")
    public AjaxResult addDetail(@RequestBody PrcPriceSetDetail detail)
@@ -191,7 +202,7 @@ public class PriceSetController extends BaseController
        return toAjax(priceSetService.insertDetail(detail));
    }

-    @PreAuthorize("@ss.hasPermi('price:set:edit')")
+    @PreAuthorize("@ss.hasPermi('price:set:edit') or @ss.hasPermi('price:set:forceEdit')")
    @Log(title = "套餐明细", businessType = BusinessType.UPDATE)
    @PutMapping("/detail")
    public AjaxResult editDetail(@RequestBody PrcPriceSetDetail detail)
@@ -199,7 +210,7 @@ public class PriceSetController extends BaseController
        return toAjax(priceSetService.updateDetail(detail));
    }

-    @PreAuthorize("@ss.hasPermi('price:set:edit')")
+    @PreAuthorize("@ss.hasPermi('price:set:edit') or @ss.hasPermi('price:set:forceEdit')")
    @Log(title = "套餐明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/detail/{psdIds}")
    public AjaxResult removeDetail(@PathVariable Long[] psdIds)
@@ -80,6 +80,17 @@ public class ProductController extends BaseController
        return toAjax(productService.updateBmsProduct(product));
    }

+    /**
+     * 修改产品国家明细行（重量段/运费/挂号费/尺寸/尾程/时效/生效失效日期）
+     */
+    @PreAuthorize("@ss.hasPermi('price:product:edit')")
+    @Log(title = "产品国家明细", businessType = BusinessType.UPDATE)
+    @PutMapping("/country")
+    public AjaxResult editCountry(@RequestBody BmsProductCountry country)
+    {
+        return toAjax(productService.updateBmsProductCountry(country));
+    }
+
    @PreAuthorize("@ss.hasPermi('price:product:remove')")
    @Log(title = "产品列表", businessType = BusinessType.DELETE)
    @DeleteMapping("/{productIds}")
@@ -128,6 +128,7 @@ price.quote.requestBodyRequired=请求体为空
 price.quote.customerIdRequired=客户ID为空
 price.quote.customerCodeRequired=客户代码不能为空
 price.quote.customerCodeNotFound=客户代码不存在
+price.quote.customerDisabled=客户已停用，不可计费
 price.quote.productCodeRequired=产品代码为空
 price.quote.countryRequired=国家代码或国家名称为空
 price.quote.weightInvalid=重量必须大于0