feat:新增配片单重复打开的缓存问题，已发货短信

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.formDialogKey += 1
-        this.resetForm('form')
+      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)) {

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

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()
+                    String smsPhone = StringUtils.isNotEmpty(brandTenant.getPhone())
-                        : brandTenant.getPhone();
+                        ? brandTenant.getPhone()
+                        : order.getReceiverPhone();
                     if (StringUtils.isNotEmpty(smsPhone))
                     {
                         smsNotificationService.trySendOrderShippedNotify(smsPhone, orderNo, expressCompany, expressNo);