修改产品套餐

2026-09-29 23:07:38 +08:00
parent 38f371742a
commit 52d0a13d83
25 changed files with 1229 additions and 351 deletions
@@ -1,5 +1,6 @@
 package com.bms.web.controller.price;

+import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,6 +19,8 @@ import com.bms.common.core.controller.BaseController;
 import com.bms.common.core.domain.AjaxResult;
 import com.bms.common.core.page.TableDataInfo;
 import com.bms.common.enums.BusinessType;
+import com.bms.common.utils.DateUtils;
+import com.bms.common.utils.StringUtils;
 import com.bms.price.domain.PrcOrderBill;
 import com.bms.price.domain.PrcQuote;
 import com.bms.price.domain.vo.AddIncomeBillFeeRequest;
@@ -55,6 +58,22 @@ public class BillingController extends BaseController
        return getDataTable(list);
    }

+    /**
+     * Products of the customer's bound effective package version (trial product dropdown).
+     */
+    @PreAuthorize("@ss.hasPermi('price:billing:quote')")
+    @GetMapping("/quote/products")
+    public AjaxResult boundProducts(@RequestParam("customerCode") String customerCode,
+        @RequestParam(value = "bizDate", required = false) String bizDate)
+    {
+        Date asOf = null;
+        if (StringUtils.isNotEmpty(bizDate))
+        {
+            asOf = DateUtils.parseDate(bizDate);
+        }
+        return success(tmsPriceQuoteService.listBoundPackageProducts(customerCode, asOf));
+    }
+
    /**
     * Historical quote detail with fee lines.
     */
@@ -193,6 +193,15 @@ public class PriceSetController extends BaseController
        return getDataTable(list);
    }

+    /** All detail rows for one product (no page); used by edit-price drawer. */
+    @PreAuthorize("@ss.hasPermi('price:set:list')")
+    @GetMapping("/detail/byProduct")
+    public AjaxResult detailByProduct(@RequestParam("psvId") Long psvId,
+        @RequestParam("productCode") String productCode)
+    {
+        return success(priceSetService.selectDetailListByProduct(psvId, productCode));
+    }
+
    /**
     * 版本明细搜索下拉选项：按版本去重后的 产品/国家/分区
     */
@@ -232,6 +241,22 @@ public class PriceSetController extends BaseController
        return success(payload);
    }

+    /**
+     * Async pull product library into version details. Returns taskId; poll /save/task/{taskId}.
+     */
+    @PreAuthorize("@ss.hasPermi('price:set:edit') or @ss.hasPermi('price:set:forceEdit')")
+    @Log(title = "\u5957\u9910\u62c9\u53d6\u4ea7\u54c1", businessType = BusinessType.IMPORT)
+    @PostMapping("/detail/pullFromLibrary")
+    public AjaxResult pullFromLibrary(@RequestParam("priceSetId") Long priceSetId,
+        @RequestParam(value = "psvId", required = false) Long psvId,
+        @RequestParam(value = "force", required = false, defaultValue = "false") boolean force)
+    {
+        String taskId = priceSetService.submitPullFromLibraryAsync(priceSetId, psvId, force, getUsername());
+        Map<String, Object> payload = new HashMap<String, Object>();
+        payload.put("taskId", taskId);
+        return success(payload);
+    }
+
    /**
     * Async batch write of detail surcharge snapshots. Returns taskId; poll /save/task/{taskId}.
     */
@@ -78,6 +78,8 @@ price.set.import.fixedOnly=\u4ec5\u56fa\u5b9a\u4ef7\u5957\u9910\u652f\u6301\u5bf
 price.set.import.noDetails=\u5957\u9910\u6682\u65e0\u4ef7\u683c\u660e\u7ec6\uff0c\u8bf7\u5148\u62c9\u53d6\u4ea7\u54c1\u4ef7
 price.set.import.noPriceRows=\u4ef7\u8868\u672a\u89e3\u6790\u5230\u6709\u6548\u4ef7\u683c\u884c
 price.set.import.success=\u5bfc\u5165\u5b8c\u6210\uff1a\u66f4\u65b0 {0} \u6761\uff0c\u672a\u5339\u914d {1} \u6761\uff0c\u5957\u9910\u65e0\u5bf9\u5e94\u4ea7\u54c1 {2} \u4e2a
+price.set.import.upsertSuccess=\u5bfc\u5165\u5b8c\u6210\uff1a\u65b0\u589e {0} \u6761\uff0c\u66f4\u65b0 {1} \u6761\uff0c\u8df3\u8fc7\u7a7a\u8fd0\u8d39/\u6302\u53f7\u8d39 {2} \u6761
+price.set.pull.success=\u62c9\u53d6\u5b8c\u6210\uff1a\u5df2\u5199\u5165 {0} \u6761\u5957\u9910\u660e\u7ec6
 price.set.customer.notExists=客户绑定不存在
 price.set.customer.unbindAudit=审核中的套餐不允许解绑客户
 price.set.customer.customerId.empty=客户ID不能为空