diff --git a/app/Http/Controllers/Business/BusinessOrderController.php b/app/Http/Controllers/Business/BusinessOrderController.php index 18d6eed..5d41029 100644 --- a/app/Http/Controllers/Business/BusinessOrderController.php +++ b/app/Http/Controllers/Business/BusinessOrderController.php @@ -162,7 +162,11 @@ class BusinessOrderController extends Controller $ids = BusinessOrderItem::query()->whereIn('external_sku_id', $externalSkuIds)->pluck('business_order_id'); $builder->whereIn('id', $ids); } + if ($ids = $request->input('ids')) { + $builder->whereIn('id', $ids); + } $businessOrders = $builder->get(); + $waybill = new WayBillService(); $waybill->setOrders($businessOrders); $contents = $waybill->getContents(); @@ -195,7 +199,7 @@ class BusinessOrderController extends Controller ], 'width' => 560 ], - 'templateURL' => 'http://pinduoduoimg.yangkeduo.com/logistics/2019-07-14/5d7e8b5969d954539fcfba3268bbeb3a.xml' + 'templateURL' => "http://pinduoduoimg.yangkeduo.com/logistics/2019-07-14/5d7e8b5969d954539fcfba3268bbeb3a.xml" // 自定义区域模板 ]; $data = []; foreach ($documents as &$document) { @@ -210,7 +214,6 @@ class BusinessOrderController extends Controller if ($document['note']) { $documentData['data']['list'][0]['text'] .= ' 备注:' . $document['note']; } - $documentData['data']['templateURL'] = $document['templateUrl']; unset($document['documentID'], $document['items'], $document['order_id'], $document['participate_no'], $document['note']); $data[] = [ 'documentID' => $documentID, diff --git a/app/Services/Business/KuaiTuanTuan/FaceSheet.php b/app/Services/Business/KuaiTuanTuan/FaceSheet.php index 4f77b61..5258c09 100644 --- a/app/Services/Business/KuaiTuanTuan/FaceSheet.php +++ b/app/Services/Business/KuaiTuanTuan/FaceSheet.php @@ -78,10 +78,12 @@ class FaceSheet extends KuaiTuanTuan return $this->doRequest($type, $appendParams); } - public function getCustomares() + public function getCustomares($templateId = 118) { $type = 'pdd.cloudprint.customares.get'; - $appendParams = []; + $appendParams = [ + 'template_id' => $templateId + ]; return $this->doRequest($type, $appendParams); } diff --git a/app/Services/Ship/WayBillService.php b/app/Services/Ship/WayBillService.php index 188f408..b96517a 100644 --- a/app/Services/Ship/WayBillService.php +++ b/app/Services/Ship/WayBillService.php @@ -6,7 +6,6 @@ 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 { @@ -18,9 +17,6 @@ class WayBillService // 快递三联面单 public $sfThree = 'https://file-link.pinduoduo.com/sf_three'; public $sfThreeTemplate = 'sf_three1677381064344.xml'; - // 快递一联单 - public $sfOneBase = 'https://file-link.pinduoduo.com/sf_one'; - public $sfOneBaseTemplate = 'sf_one1688973997895.xml'; // 标准模板 public $sfStd = 'https://file-link.pinduoduo.com/sf_std'; public $sfStdTemplate = 'sf_std1677380804913.xml'; @@ -57,7 +53,7 @@ class WayBillService ], 'encryptedData' => $printData['encryptedData'], 'signature' => $printData['signature'], - 'templateUrl' => env('APP_URL') . '/ktt/' . $this->sfStdTemplate, + 'templateUrl' => env('APP_URL') . '/ktt/' . $this->sfOneTemplate, // 电子面单模板 'ver' => $printData['ver'], 'userid' => $waybill->user_id, 'items' => $item['items'], @@ -74,7 +70,7 @@ class WayBillService ], 'encryptedData' => $waybill->encryptedData, 'signature' => $waybill->signature, - 'templateUrl' => env('APP_URL') . '/ktt/' . $this->sfStdTemplate, + 'templateUrl' => env('APP_URL') . '/ktt/' . $this->sfOneTemplate, // 电子面单模板 'ver' => $waybill->ver, 'userid' => $waybill->user_id, 'items' => json_decode($waybill->items, true), @@ -198,7 +194,7 @@ class WayBillService 'name' => $order['recipient_name'], 'mobile' => $order['recipient_mobile'], ], - 'template_url' => $this->sfStd, + 'template_url' => $this->sfOne, 'user_id' => $shop->owner_id, ]; diff --git a/public/ktt/sf_one1688973997895.xml b/public/ktt/sf_one1688973997895.xml new file mode 100644 index 0000000..25aac00 --- /dev/null +++ b/public/ktt/sf_one1688973997895.xml @@ -0,0 +1,221 @@ + +<% 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/public/ktt/sf_std1677380804913.xml b/public/ktt/sf_std1677380804913.xml new file mode 100644 index 0000000..cc57d82 --- /dev/null +++ b/public/ktt/sf_std1677380804913.xml @@ -0,0 +1,165 @@ + +<% 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/public/ktt/sf_three1677381064344.xml b/public/ktt/sf_three1677381064344.xml new file mode 100644 index 0000000..73b7b5e --- /dev/null +++ b/public/ktt/sf_three1677381064344.xml @@ -0,0 +1,222 @@ + +<% 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