From d10d924e4f4532e39232ac0ad18bb191d7164194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com> Date: Wed, 16 Aug 2023 15:41:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20#100000=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/Ship/WayBillService.php | 5 +- resources/templates/sf_one1688973997895.xml | 221 ----------------- resources/templates/sf_std1677380804913.xml | 165 ------------- resources/templates/sf_three1677381064344.xml | 222 ------------------ 4 files changed, 3 insertions(+), 610 deletions(-) delete mode 100644 resources/templates/sf_one1688973997895.xml delete mode 100644 resources/templates/sf_std1677380804913.xml delete mode 100644 resources/templates/sf_three1677381064344.xml diff --git a/app/Services/Ship/WayBillService.php b/app/Services/Ship/WayBillService.php index a823202..188f408 100644 --- a/app/Services/Ship/WayBillService.php +++ b/app/Services/Ship/WayBillService.php @@ -6,6 +6,7 @@ use App\Models\GoodsSku; use App\Models\ShopShip; use App\Models\Waybill; use App\Services\Business\KuaiTuanTuan\FaceSheet; +use Illuminate\Support\Facades\Storage; class WayBillService { @@ -56,7 +57,7 @@ class WayBillService ], 'encryptedData' => $printData['encryptedData'], 'signature' => $printData['signature'], - 'templateUrl' => resource_path('templates/' . $this->sfStdTemplate), + 'templateUrl' => env('APP_URL') . '/ktt/' . $this->sfStdTemplate, 'ver' => $printData['ver'], 'userid' => $waybill->user_id, 'items' => $item['items'], @@ -73,7 +74,7 @@ class WayBillService ], 'encryptedData' => $waybill->encryptedData, 'signature' => $waybill->signature, - 'templateUrl' => resource_path('templates/' . $this->sfStdTemplate), + 'templateUrl' => env('APP_URL') . '/ktt/' . $this->sfStdTemplate, 'ver' => $waybill->ver, 'userid' => $waybill->user_id, 'items' => json_decode($waybill->items, true), diff --git a/resources/templates/sf_one1688973997895.xml b/resources/templates/sf_one1688973997895.xml deleted file mode 100644 index 25aac00..0000000 --- a/resources/templates/sf_one1688973997895.xml +++ /dev/null @@ -1,221 +0,0 @@ - -<% function GetTel(tel){ %> - <% if(tel.length == 11){ %> - <% var str = ""; %> - <% for (var i = 0; i < tel.length; i++) { %> - <% if(i<7 && i>2){ %> - <% str += "*"; %> - <% }else { %> - <% str += tel.substring(i,i+1); %> - <%} } return str; %> - <% }else if(tel.length >4){ %> - <% var str = ""; %> - <% for (var i = 0; i < tel.length; i++) { %> - <% if(i - <% str += "*"; %> - <% }else { %> - <% str += tel.substring(i,i+1); %> - <%} } return str; %> - <% }else %> - <% return tel;%> -<%} %> - -<% function GetRecipientTel(){ %> -<%var recipient_mobile = data.recipient ? (data.recipient.mobile || '') : '' %> -<%var recipient_phone = data.recipient ? (data.recipient.phone || '') : '' %> -<%var recipient_maskMobile = data.recipient ? (data.recipient.maskMobile || '') : '' %> - <% if(recipient_maskMobile.length ){ %> - <% return recipient_maskMobile; %> - <% }else if(recipient_mobile == recipient_phone) {%> - <% return GetTel(recipient_mobile);%> - <% }else %> - <% return GetTel(recipient_mobile) + " " + GetTel(recipient_phone);%> - <%} %> -<%var recipient_virtualNumber = data.recipient ? (data.recipient.virtualNumber || '') : '' %> -<%var recipient_identifyNumber = data.recipient ? (data.recipient.identifyNumber || '') : '' %> - -<%var sender_name = data.sender ? (data.sender.name || '') : '' %> -<%var sender_mobile = data.sender ? (data.sender.mobile || '') : '' %> -<%var sender_phone = data.sender ? (data.sender.phone || '') : '' %> -<%var sender_telephone_number = (sender_mobile == sender_phone) ? GetTel(sender_mobile) : ( GetTel(sender_mobile) +' '+ GetTel(sender_phone)) %> -<%var sender_address =(data.sender && data.sender.address)? ((data.sender.address.province || '') +(data.sender.address.city || '') +(data.sender.address.district || '') +(data.sender.address.town || '') +(data.sender.address.detail || '')) : ''%> - -<%var recipient_telephone_number = GetRecipientTel() %> -<%var recipient_name = data.recipient ? ( data.recipient.originalName ? data.recipient.originalName : (data.recipient.name || '')) : '' %> -<%var recipient_address =(data.recipient && data.recipient.address)? ((data.recipient.address.province || '') +(data.recipient.address.city || '') +(data.recipient.address.district || '') +(data.recipient.address.town || '') +(data.recipient.address.originalDetail ? data.recipient.address.originalDetail:data.recipient.address.detail || '')) : ''%> - -<%var _threeSegmentCode = data.routingInfo ? (data.routingInfo.threeSegmentCode || '') : '' %> - - - - - - - <% if(context.topLogo) {%> - - - <% } %> - - - - - - - - - - - - - - <%var _YunDanBarCode = (data.waybillSequence==1 && data.totalPackagesCount >1 ) ? (data.parentWaybillCode || '') : (data.waybillCode || '') %> - - - <% if(data.totalPackagesCount >1 && data.waybillSequence > 1) {%> - - - - - - <% }else if(data.waybillSequence ==1 && data.totalPackagesCount >1){ %> - - - - - <% }else { %> - - - - - <% } %> - - - - - <%var _waybillCode = data.waybillCode || '' %> - <%var _waybillFontSize = _waybillCode.length > 12 ? (200/_waybillCode.length):22 %> - - - - - - - - - - - - - - - <%var _fontSize = (608*2)/(_threeSegmentCode.length+1) %> - - <% if(_fontSize <15){ %> - <% _fontSize = 15; %> - <% }else if(_fontSize >80){ %> - <% _fontSize = 70; %> - <%} %> - - - - - - - <% if(recipient_virtualNumber.length) {%> - - - <% } %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%var _IN41 = (data.logisticsServices && data.logisticsServices.IN41 ) ? "先" : '' %> - <% if(_IN41.length != 0) {%> - - <% } %> - - <%var _INSURE = (data.logisticsServices && data.logisticsServices.INSURE && data.logisticsServices.INSURE.desc) ? "保价 " : '' %> - <%var _IN144 = (data.logisticsServices && data.logisticsServices.IN144 ) ? "到齐派 " : ' ' %> - <%var _abFlag = data.commonPrintDto ? (data.commonPrintDto.abFlag || '') : '' %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%if (context.adControl && data.ad) {%> - - <%if (data.ad.type == 2) {%> - - <%if( data.ad.image && data.ad.image != ''){%> - - - - <%}%> - - - - - <%} else {%> - - <%if( data.ad.pic && data.ad.pic != ''){%> - - - - - <%}%> - - - - - <%}%> - - <%}%> - - - \ No newline at end of file diff --git a/resources/templates/sf_std1677380804913.xml b/resources/templates/sf_std1677380804913.xml deleted file mode 100644 index cc57d82..0000000 --- a/resources/templates/sf_std1677380804913.xml +++ /dev/null @@ -1,165 +0,0 @@ - -<% function GetTel(tel){ %> - <% if(tel.length == 11){ %> - <% var str = ""; %> - <% for (var i = 0; i < tel.length; i++) { %> - <% if(i<7 && i>2){ %> - <% str += "*"; %> - <% }else { %> - <% str += tel.substring(i,i+1); %> - <%} } return str; %> - <% }else if(tel.length >4){ %> - <% var str = ""; %> - <% for (var i = 0; i < tel.length; i++) { %> - <% if(i - <% str += "*"; %> - <% }else { %> - <% str += tel.substring(i,i+1); %> - <%} } return str; %> - <% }else %> - <% return tel;%> -<%} %> - -<% function GetRecipientTel(){ %> -<%var recipient_mobile = data.recipient ? (data.recipient.mobile || '') : '' %> -<%var recipient_phone = data.recipient ? (data.recipient.phone || '') : '' %> -<%var recipient_maskMobile = data.recipient ? (data.recipient.maskMobile || '') : '' %> - <% if(recipient_maskMobile.length ){ %> - <% return recipient_maskMobile; %> - <% }else if(recipient_mobile == recipient_phone) {%> - <% return GetTel(recipient_mobile);%> - <% }else %> - <% return GetTel(recipient_mobile) + " " + GetTel(recipient_phone);%> - <%} %> -<%var recipient_virtualNumber = data.recipient ? (data.recipient.virtualNumber || '') : '' %> -<%var recipient_identifyNumber = data.recipient ? (data.recipient.identifyNumber || '') : '' %> - -<%var sender_name = data.sender ? (data.sender.name || '') : '' %> -<%var sender_mobile = data.sender ? (data.sender.mobile || '') : '' %> -<%var sender_phone = data.sender ? (data.sender.phone || '') : '' %> -<%var sender_telephone_number = (sender_mobile == sender_phone) ? GetTel(sender_mobile) : ( GetTel(sender_mobile) +' '+ GetTel(sender_phone)) %> -<%var sender_address =(data.sender && data.sender.address)? ((data.sender.address.province || '') +(data.sender.address.city || '') +(data.sender.address.district || '') +(data.sender.address.town || '') +(data.sender.address.detail || '')) : ''%> - -<%var recipient_telephone_number = GetRecipientTel() %> -<%var recipient_name = data.recipient ? ( data.recipient.originalName ? data.recipient.originalName : (data.recipient.name || '')) : '' %> -<%var recipient_address =(data.recipient && data.recipient.address)? ((data.recipient.address.province || '') +(data.recipient.address.city || '') +(data.recipient.address.district || '') +(data.recipient.address.town || '') +(data.recipient.address.originalDetail ? data.recipient.address.originalDetail:data.recipient.address.detail || '')) : ''%> - - - - - - <% if(context.topLogo) {%> - - <% } %> - - - - - - - - - - - - <%var _YunDanBarCode = (data.waybillSequence==1 && data.totalPackagesCount >1 ) ? (data.parentWaybillCode || '') : (data.waybillCode || '') %> - <% if(data.totalPackagesCount >1 && data.waybillSequence > 1) {%> - - - - - - - <% }else if(data.waybillSequence ==1 && data.totalPackagesCount >1){ %> - - - - - - <% }else { %> - - - - - <% } %> - - - - - - - - - - - <% if(recipient_virtualNumber.length) {%> - - - <% } %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%var _INSURE = (data.logisticsServices && data.logisticsServices.INSURE && data.logisticsServices.INSURE.desc) ? "保价" : '' %> - <%var _IN144 = (data.logisticsServices && data.logisticsServices.IN144 ) ? "到齐派 " : '' %> - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/templates/sf_three1677381064344.xml b/resources/templates/sf_three1677381064344.xml deleted file mode 100644 index 73b7b5e..0000000 --- a/resources/templates/sf_three1677381064344.xml +++ /dev/null @@ -1,222 +0,0 @@ - -<% function GetTel(tel){ %> - <% if(tel.length == 11){ %> - <% var str = ""; %> - <% for (var i = 0; i < tel.length; i++) { %> - <% if(i<7 && i>2){ %> - <% str += "*"; %> - <% }else { %> - <% str += tel.substring(i,i+1); %> - <%} } return str; %> - <% }else if(tel.length >4){ %> - <% var str = ""; %> - <% for (var i = 0; i < tel.length; i++) { %> - <% if(i - <% str += "*"; %> - <% }else { %> - <% str += tel.substring(i,i+1); %> - <%} } return str; %> - <% }else %> - <% return tel;%> -<%} %> - -<% function GetRecipientTel(){ %> -<%var recipient_mobile = data.recipient ? (data.recipient.mobile || '') : '' %> -<%var recipient_phone = data.recipient ? (data.recipient.phone || '') : '' %> -<%var recipient_maskMobile = data.recipient ? (data.recipient.maskMobile || '') : '' %> - <% if(recipient_maskMobile.length ){ %> - <% return recipient_maskMobile; %> - <% }else if(recipient_mobile == recipient_phone) {%> - <% return GetTel(recipient_mobile);%> - <% }else %> - <% return GetTel(recipient_mobile) + " " + GetTel(recipient_phone);%> - <%} %> -<%var recipient_virtualNumber = data.recipient ? (data.recipient.virtualNumber || '') : '' %> -<%var recipient_identifyNumber = data.recipient ? (data.recipient.identifyNumber || '') : '' %> - -<%var sender_name = data.sender ? (data.sender.name || '') : '' %> -<%var sender_mobile = data.sender ? (data.sender.mobile || '') : '' %> -<%var sender_phone = data.sender ? (data.sender.phone || '') : '' %> -<%var sender_telephone_number = (sender_mobile == sender_phone) ? GetTel(sender_mobile) : ( GetTel(sender_mobile) +' '+ GetTel(sender_phone)) %> -<%var sender_address =(data.sender && data.sender.address)? ((data.sender.address.province || '') +(data.sender.address.city || '') +(data.sender.address.district || '') +(data.sender.address.town || '') +(data.sender.address.detail || '')) : ''%> - -<%var recipient_telephone_number = GetRecipientTel() %> -<%var recipient_name = data.recipient ? ( data.recipient.originalName ? data.recipient.originalName : (data.recipient.name || '')) : '' %> -<%var recipient_address =(data.recipient && data.recipient.address)? ((data.recipient.address.province || '') +(data.recipient.address.city || '') +(data.recipient.address.district || '') +(data.recipient.address.town || '') +(data.recipient.address.originalDetail ? data.recipient.address.originalDetail:data.recipient.address.detail || '')) : ''%> - - - - - - - <% if(context.topLogo) {%> - - <% } %> - - - - - - - - - - - - <%var _YunDanBarCode = (data.waybillSequence==1 && data.totalPackagesCount >1 ) ? (data.parentWaybillCode || '') : (data.waybillCode || '') %> - - <% if(data.totalPackagesCount >1 && data.waybillSequence > 1) {%> - - - - - - - <% }else if(data.waybillSequence ==1 && data.totalPackagesCount >1){ %> - - - - - - <% }else { %> - - - - - <% } %> - - - - - - - - - - - <% if(recipient_virtualNumber.length) {%> - - - <% } %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%var _INSURE = (data.logisticsServices && data.logisticsServices.INSURE && data.logisticsServices.INSURE.desc) ? "保价" : '' %> - <%var _IN144 = (data.logisticsServices && data.logisticsServices.IN144 ) ? "到齐派 " : '' %> - - - - - - - - - - - - - - - - - - - - - - - - <% if(context.bottomLogo) {%> - - <% } %> - - - - - - - - - - - <% if(data.totalPackagesCount >1 && data.waybillSequence) {%> - - <% }else { %> - - <% } %> - - - - - - - - - - - - - - - - - - - - - - - - - - - " height="33" left="40" align="left" valign="center" fontSize="30"/> - - - - - - - \ No newline at end of file