From dfef98814b716f9cdc73656a4f7dc85af8d0f9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E4=BC=91=E5=93=A5=E5=93=A56666?=
 <xiu_tong@hotmail.com>
Date: Sun, 14 Jun 2026 16:31:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E9=85=8D=E7=89=87?=
 =?UTF-8?q?=E5=8D=95=E9=87=8D=E5=A4=8D=E6=89=93=E5=BC=80=E7=9A=84=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B7=B2=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 developer-front/src/views/order/lens-order.vue     | 14 +++++++++-----
 .../jysystem/service/SmsNotificationService.java   |  4 ++--
 .../impl/JySysTenantMessageServiceImpl.java        |  7 ++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/developer-front/src/views/order/lens-order.vue b/developer-front/src/views/order/lens-order.vue
index 1e84daa..8270fa9 100644
--- a/developer-front/src/views/order/lens-order.vue
+++ b/developer-front/src/views/order/lens-order.vue
@@ -190,6 +190,7 @@
       append-to-body
       destroy-on-close
       custom-class="lens-order-form-dialog"
+      @closed="handleFormClosed"
     >
       <div slot="title" class="lens-dialog-header">
         <div class="lens-dialog-title-wrap">
@@ -197,7 +198,7 @@
           <p class="lens-dialog-subtitle">{{ formDialogSubtitle }}</p>
         </div>
       </div>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px" class="lens-order-form">
+      <el-form :key="formDialogKey" ref="form" :model="form" :rules="rules" label-width="110px" class="lens-order-form">
         <section class="lens-form-section">
           <div class="section-head">
             <span class="section-index">01</span>
@@ -1079,6 +1080,7 @@ export default {
         reason: [{ required: true, message: '请输入换货申请原因', trigger: 'blur' }]
       },
       formMode: 'create',
+      formDialogKey: 0,
       selectedRow: null,
       title: '',
       open: false,
@@ -1237,6 +1239,7 @@ export default {
     if (!this.tenantId && this.$store.getters.token) {
       await this.$store.dispatch('GetInfo').catch(() => {})
     }
+    this.reset()
     this.initPage()
   },
   methods: {
@@ -1623,6 +1626,8 @@ export default {
     },
     cancel() {
       this.open = false
+    },
+    handleFormClosed() {
       this.reset()
     },
     handleProgressiveMultifocalChange(value) {
@@ -1680,11 +1685,9 @@ export default {
     handleAdd() {
       this.reset()
       this.formMode = 'create'
-      this.open = true
       this.title = '新增配片单'
-      this.$nextTick(() => {
-        this.resetForm('form')
-      })
+      this.formDialogKey += 1
+      this.open = true
     },
     normalizeOrderForm(form) {
       if (!form) {
@@ -1777,6 +1780,7 @@ export default {
       }
       this.formMode = mode
       this.title = title
+      this.formDialogKey += 1
       this.open = true
       this.$nextTick(() => {
         if (lensId != null && !Number.isNaN(lensId)) {
diff --git a/jy-system/src/main/java/com/ruoyi/jysystem/service/SmsNotificationService.java b/jy-system/src/main/java/com/ruoyi/jysystem/service/SmsNotificationService.java
index e04c79b..32898d7 100644
--- a/jy-system/src/main/java/com/ruoyi/jysystem/service/SmsNotificationService.java
+++ b/jy-system/src/main/java/com/ruoyi/jysystem/service/SmsNotificationService.java
@@ -14,9 +14,9 @@ public interface SmsNotificationService
     void trySendOrderAssignedNotify(String phone, String orderNo);
 
     /**
-     * 订单发货后，向收件人手机号发送通知（失败不影响主流程）
+     * 订单发货后发送通知（失败不影响主流程）
      *
-     * @param phone 手机号
+     * @param phone 手机号（品牌方租户手机号，或收货人手机号）
      * @param orderNo 订单号，对应模板变量 code
      * @param expressCompany 快递公司，对应模板变量 expressCompany
      * @param expressNo 快递单号，对应模板变量 expressNo
diff --git a/jy-system/src/main/java/com/ruoyi/jysystem/service/impl/JySysTenantMessageServiceImpl.java b/jy-system/src/main/java/com/ruoyi/jysystem/service/impl/JySysTenantMessageServiceImpl.java
index f75ea3d..88b300b 100644
--- a/jy-system/src/main/java/com/ruoyi/jysystem/service/impl/JySysTenantMessageServiceImpl.java
+++ b/jy-system/src/main/java/com/ruoyi/jysystem/service/impl/JySysTenantMessageServiceImpl.java
@@ -104,9 +104,10 @@ public class JySysTenantMessageServiceImpl implements IJySysTenantMessageService
                     JySysTenantMessage.TYPE_STATUS_CHANGE, "订单状态变更", content, orderStatus);
                 if (ORDER_STATUS_SHIPPED.equals(orderStatus))
                 {
-                    String smsPhone = StringUtils.isNotEmpty(order.getReceiverPhone())
-                        ? order.getReceiverPhone()
-                        : brandTenant.getPhone();
+                    // 模板「您的配片单…」通知配片单所属品牌方；无租户手机号时回退收货人手机号
+                    String smsPhone = StringUtils.isNotEmpty(brandTenant.getPhone())
+                        ? brandTenant.getPhone()
+                        : order.getReceiverPhone();
                     if (StringUtils.isNotEmpty(smsPhone))
                     {
                         smsNotificationService.trySendOrderShippedNotify(smsPhone, orderNo, expressCompany, expressNo);