tj

brg-user-center/app/base/service/impl/order/orderDeliverySve.js

@@ -184,6 +184,15 @@ class OrderDeliveryService extends ServiceBase {
               smsMessageBody = smsMessageBody.replace(/{timeRemaining}/g,days);
               smsMessageBody = smsMessageBody.replace(/{timeRemaining}/g,days);
             }
             }
           }
           }
+          if(orderdetail.user_id){//用户账号
+            smsMessageBody = smsMessageBody.replace(/{userId}/g,orderdetail.user_id);
+          }
+          if(orderdetail.user_name){//用户昵称
+            smsMessageBody = smsMessageBody.replace(/{userName}/g,orderdetail.user_name);
+          }
+          if(orderdetail.region_name){//地区
+            smsMessageBody = smsMessageBody.replace(/{area}/g,orderdetail.region_name);
+          }
           var deliverContent = orderdetail.deliver_content;
           var deliverContent = orderdetail.deliver_content;
           if(deliverContent){
           if(deliverContent){
             //注册园区
             //注册园区
@@ -215,6 +224,15 @@ class OrderDeliveryService extends ServiceBase {
           if(productTypeOne){//产品一类名称
           if(productTypeOne){//产品一类名称
             smsMessageBody = smsMessageBody.replace(/{productType}/g,productTypeOne);
             smsMessageBody = smsMessageBody.replace(/{productType}/g,productTypeOne);
           }
           }
+          if(orderdetail.end_time){//过期时间
+            smsMessageBody = smsMessageBody.replace(/{expirationDate}/g,orderdetail.end_time);
+            var m1 = moment(new Date());
+            var m2 = moment(new Date(orderdetail.end_time));
+            var days = m2.diff(m1,'day');
+            if(days && days>=0){//剩余天数
+              smsMessageBody = smsMessageBody.replace(/{timeRemaining}/g,days);
+            }
+          }
           var deliverContent = orderdetail.deliver_content;
           var deliverContent = orderdetail.deliver_content;
           if(deliverContent){
           if(deliverContent){
             //邮寄信息
             //邮寄信息
@@ -274,6 +292,15 @@ class OrderDeliveryService extends ServiceBase {
               webinfoMessageBody = webinfoMessageBody.replace(/{timeRemaining}/g,days);
               webinfoMessageBody = webinfoMessageBody.replace(/{timeRemaining}/g,days);
             }
             }
           }
           }
+          if(orderdetail.user_id){//用户账号
+            webinfoMessageBody = webinfoMessageBody.replace(/{userId}/g,orderdetail.user_id);
+          }
+          if(orderdetail.user_name){//用户昵称
+            webinfoMessageBody = webinfoMessageBody.replace(/{userName}/g,orderdetail.user_name);
+          }
+          if(orderdetail.region_name){//地区
+            webinfoMessageBody = webinfoMessageBody.replace(/{area}/g,orderdetail.region_name);
+          }
           var deliverContent = orderdetail.deliver_content;
           var deliverContent = orderdetail.deliver_content;
           if(deliverContent){
           if(deliverContent){
             //注册园区
             //注册园区
@@ -298,6 +325,15 @@ class OrderDeliveryService extends ServiceBase {
         }
         }
         if(webinfoMessageBody){
         if(webinfoMessageBody){
           webinfoMessageBody = webinfoMessageBody.replace(/{productName}/g,productTypeName);
           webinfoMessageBody = webinfoMessageBody.replace(/{productName}/g,productTypeName);
+          if(orderdetail.end_time){//过期时间
+            webinfoMessageBody = webinfoMessageBody.replace(/{expirationDate}/g,orderdetail.end_time);
+            var m1 = moment(new Date());
+            var m2 = moment(new Date(orderdetail.end_time));
+            var days = m2.diff(m1,'day');
+            if(days && days>=0){//剩余天数
+              webinfoMessageBody = webinfoMessageBody.replace(/{timeRemaining}/g,days);
+            }
+          }
           if(orderdetail.user_id){//用户账号
           if(orderdetail.user_id){//用户账号
             webinfoMessageBody = webinfoMessageBody.replace(/{userId}/g,orderdetail.user_id);
             webinfoMessageBody = webinfoMessageBody.replace(/{userId}/g,orderdetail.user_id);
           }
           }
@@ -364,7 +400,9 @@ class OrderDeliveryService extends ServiceBase {
         var smsParams = await this.packageSmsTemplates(orderdetail,status,productType,product_type_name,product_type_one_name);
         var smsParams = await this.packageSmsTemplates(orderdetail,status,productType,product_type_name,product_type_one_name);
         var webinfoParams = await this.packageWebinfoTemplates(orderdetail,status,productType,product_type_name,product_type_one_name);
         var webinfoParams = await this.packageWebinfoTemplates(orderdetail,status,productType,product_type_name,product_type_one_name);
         if(smsParams && webinfoParams){
         if(smsParams && webinfoParams){
-          await this.utilsMsgSendSve.sendMessageVerify({phoneList:[smsParams],subAccountList:[webinfoParams]});//发送消息通知
+          console.log(JSON.stringify(smsParams),"smsParams++++++++++++++++++++++++++++++");
+          console.log(JSON.stringify(webinfoParams),"webinfoParams------------------------");
+          // await this.utilsMsgSendSve.sendMessageVerify({phoneList:[smsParams],subAccountList:[webinfoParams]});//发送消息通知
         }
         }
         return;
         return;
      } 
      }