From 1083c2876f60da3dab853a4313e266f447d7c780 Mon Sep 17 00:00:00 2001 From: luojiaquan <1583622118@qq.com> Date: Mon, 28 Sep 2026 15:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=B1=E6=95=88=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customermoney/domain/CustomerCreditApply.java | 2 +- .../service/impl/CustomerMoneyServiceImpl.java | 8 ++++---- .../customerinfo/customermoney/index.vue | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditApply.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditApply.java index 3d7f5ae8..ba3ac62b 100644 --- a/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditApply.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditApply.java @@ -53,7 +53,7 @@ public class CustomerCreditApply extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date effectiveDate; - /** 临时额度失效日期（空=长期） */ + /** 额度失效日期（信用/临时均必填，到期次日自动清零） */ @JsonFormat(pattern = "yyyy-MM-dd") private Date expireDate; diff --git a/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java index 43caeb1e..39636f2d 100644 --- a/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java @@ -411,7 +411,7 @@ public class CustomerMoneyServiceImpl implements ICustomerMoneyService } after = after.setScale(MONEY_SCALE, RoundingMode.HALF_UP); - // 3. 有效期处理：信用/临时同口径——不允许预约未来生效；信用额度失效日期必填，临时额度空=长期 + // 3. 有效期处理：信用/临时同口径——不允许预约未来生效；失效日期均必填（validateAdjustCommand 已强校验） Date effectiveDate = null; Date expireDate = null; LocalDate today = LocalDate.now(); @@ -724,10 +724,10 @@ public class CustomerMoneyServiceImpl implements ICustomerMoneyService throw new ServiceException("额度未发生变化，无需调整"); } - if (!isTemp && cmd.getExpireDate() == null) + if (cmd.getExpireDate() == null) { - // 信用额度必须设置失效日期（到期自动清零）；临时额度不填=长期 - throw new ServiceException("请选择信用额度失效日期"); + // 信用额度、临时（额外）额度都必须设置失效日期（到期次日自动清零） + throw new ServiceException(isTemp ? "请选择临时额度失效日期" : "请选择信用额度失效日期"); } LocalDate today = LocalDate.now(); LocalDate eff = cmd.getEffectiveDate() != null ? toLocalDate(cmd.getEffectiveDate()) : today; diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue index 5ffa12d6..ad4aad79 100644 --- a/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue +++ b/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue @@ -836,17 +836,17 @@ - +
{{ creditDialog.form.creditType === 'TEMP' - ? '失效日当天仍有效，次日访问账户时自动清零并记到期流水' + ? '临时额度失效日期必填；失效日当天仍有效，次日访问账户时自动清零并记到期流水' : '信用额度失效日期必填；失效日当天仍有效，次日自动清零；额度失效后可用额度相应减少，若账户余额为负将形成欠费（可继续计费，请及时催收回款）' }}
@@ -1172,8 +1172,8 @@ const creditRules = computed(() => ({ reason: [{ required: true, message: '请填写调整原因', trigger: 'blur' }], expireDate: [{ validator: (rule, value, callback) => { - if (creditDialog.form.creditType === 'CREDIT' && !value) { - callback(new Error('请选择信用额度失效日期')) + if ( !value) { + callback(new Error('请选择额度失效日期')) } else { callback() } @@ -1256,8 +1256,8 @@ function submitAdjustCredit() { proxy.$modal.msgError('调整金额必须大于0') return } - if (f.creditType === 'CREDIT' && !f.expireDate) { - proxy.$modal.msgError('请选择信用额度失效日期') + if (!f.expireDate) { + proxy.$modal.msgError(f.creditType === 'TEMP' ? '请选择临时额度失效日期' : '请选择信用额度失效日期') return } if (f.expireDate && f.effectiveDate && f.expireDate <= f.effectiveDate) {