From 8d1abf0eb1c5c89d74db01f9afe4d20db7e44394 Mon Sep 17 00:00:00 2001
From: wuweihua <88888888>
Date: Sun, 20 Sep 2026 10:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A5=97=E9=A4=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BmsCustomerPriceSetServiceImpl.java       |  4 ----
 .../mapper/customer/BmsCustomerPriceSetMapper.xml  | 11 +++--------
 .../customerinfo/customeredit/index.vue            | 14 ++++++--------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java
index 4c1910dd..1d0347e9 100644
--- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java
+++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java
@@ -69,10 +69,6 @@ public class BmsCustomerPriceSetServiceImpl implements IBmsCustomerPriceSetServi
             throw new ServiceException("仅生效中的套餐允许绑定，当前套餐状态不可用");
         }
         if (bind.getPrBegindate() == null)
-        {
-            bind.setPrBegindate(set.getEffectiveDate());
-        }
-        if (bind.getPrBegindate() == null)
         {
             throw new ServiceException("绑定生效日期不能为空");
         }
diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml
index e16b8d51..32898fe2 100644
--- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml
+++ b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml
@@ -22,8 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="priceSetName"        column="price_set_name"        />
         <result property="setType"             column="set_type"              />
         <result property="priceSetStatus"      column="price_set_status"      />
-        <result property="setEffectiveDate"    column="set_effective_date"    />
-        <result property="setExpireDate"       column="set_expire_date"       />
     </resultMap>
 
     <resultMap type="com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption" id="BmsPriceSetOptionResult">
@@ -32,8 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="priceSetName"  column="price_set_name"  />
         <result property="setType"       column="set_type"        />
         <result property="status"        column="status"          />
-        <result property="effectiveDate" column="effective_date"  />
-        <result property="expireDate"    column="expire_date"     />
     </resultMap>
 
     <sql id="bindVo">
@@ -41,8 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                c.bind_priority, c.pr_begindate, c.pr_enddate, c.price_set_note,
                c.created_by, c.create_time, c.updated_by, c.update_time,
                s.price_set_code, s.price_set_name, s.set_type,
-               s.status as price_set_status,
-               s.effective_date as set_effective_date, s.expire_date as set_expire_date
+               s.status as price_set_status
         from prc_customer_price_set c
         left join prc_price_set s on s.price_set_id = c.price_set_id
     </sql>
@@ -104,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPriceSetOptionList"
             parameterType="com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption"
             resultMap="BmsPriceSetOptionResult">
-        select price_set_id, price_set_code, price_set_name, set_type, status, effective_date, expire_date
+        select price_set_id, price_set_code, price_set_name, set_type, status
         from prc_price_set
         <where>
             status = 'E'
@@ -120,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectPriceSetOptionById" resultMap="BmsPriceSetOptionResult">
-        select price_set_id, price_set_code, price_set_name, set_type, status, effective_date, expire_date
+        select price_set_id, price_set_code, price_set_name, set_type, status
         from prc_price_set
         where price_set_id = #{priceSetId}
     </select>
diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue
index 6962c1a8..8a12e077 100644
--- a/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue
+++ b/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue
@@ -666,9 +666,9 @@
             <el-tag size="small" :type="selectedPriceSet.setType === 'DISCOUNT' ? 'warning' : 'primary'">
               {{ setTypeMap[selectedPriceSet.setType] || selectedPriceSet.setType }}
             </el-tag>
-            <span class="ps-readonly__range">
-              套餐有效期：{{ selectedPriceSet.effectiveDate || '-' }} 至 {{ selectedPriceSet.expireDate || '长期' }}
-            </span>
+            <el-tag size="small" :type="priceSetStatusTagType[selectedPriceSet.status] || 'info'" class="ps-readonly__status">
+              {{ priceSetStatusMap[selectedPriceSet.status] || selectedPriceSet.status || '-' }}
+            </el-tag>
           </div>
         </el-form-item>
         <el-form-item label="优先级" prop="bindPriority">
@@ -855,12 +855,10 @@ function openPriceSetDialog(row) {
   nextTick(() => proxy.$refs['priceSetRef'] && proxy.$refs['priceSetRef'].clearValidate())
 }
 
-/** 选择套餐后，生效日期未填时默认带出套餐生效日期 */
+/** 选择套餐后，生效日期未填时默认今天 */
 function onPriceSetChange(priceSetId) {
-  const opt = priceSetOptions.value.find(o => o.priceSetId === priceSetId)
-  if (opt && !priceSetForm.value.prBegindate) {
-    priceSetForm.value.prBegindate = opt.effectiveDate || null
-  }
+  if (!priceSetId || priceSetForm.value.prBegindate) return
+  priceSetForm.value.prBegindate = proxy.parseTime(new Date(), '{y}-{m}-{d}')
 }
 
 function submitPriceSetForm() {