elf
/
pdd-order-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tt

Browse Source
20240120-ljl-routeConfig
ljl 10 months ago
parent 8a5e9b9f8a
commit d76a73d78f
3 changed files with 24 additions and 57 deletions
Show Stats Download Patch File Download Diff File

46
app/libs/controller/order/class.PrintSettingController.php
Unescape Escape View File

@ -229,29 +229,19 @@ class PrintSettingController extends AbstractApiController {
* @param string isChildParent 是否子母单
* @param string opSenderAddressId * 发货地址id
* @param object account * 账户信息
* @param string account.tbUserId 账号id (菜鸟必填)
* @param string account.addressDto 网点地址信息(菜鸟必填)
* @param string account.addressDto.quantity * 面单余额
* @param string account.addressDto.province * 省
* @param string account.addressDto.city * 市
* @param string account.addressDto.district * 区
* @param string account.addressDto.street 街道
* @param string account.addressDto.detail * 详细地址
* @param string account.qingLongCustomerCode 青龙编码
* @param string account.jdPromiseTimeType 产品类型
* @param string account.jdTransType 运输类型
* @param string account.jdGoodsType 配送业务类型
* @param string account.jdOrderFrom 订单来源
* @param string account.jdWareHouseCode 发货仓库编码
* @param Service[] account.services 增值服务(拼多多面单)
* @param string Service.code * 增值服务编码值(拼多多面单)
* @param array Service.attributes * 增值服务属性键值对(拼多多面单)
* @param object account.branchAddress * 网点信息
* @param string account.branchAddress.quantity * 面单余额
* @param string account.branchAddress.country * 国家
* @param string account.branchAddress.province * 省
* @param string account.branchAddress.city * 市
* @param string account.branchAddress.district 区
* @param string account.branchAddress.detail * 详细地址
* @param string account.orderWaybillType 运单类型
* @param string account.expressPayMethod 运费支付方式
* @param string account.orderExpressType 快递类型
* @param string account.guaranteeType 保价（0 不保价 1 订单金额保价 2 声明价值保价）
* @param string account.guaranteeAmountCustom 保价金额
* @param string account.guaranteeAmountPercent 保价金额倍数
* @param string account.jdGuaranteeValue 保价（0 不保价 1 订单金额保价 2 声明价值保价）
* @param string account.jdGuaranteeValueAmountCustom 保价金额
* @param string account.jdGuaranteeValueAmountPercent 保价金额倍数
* @param string account.insureType 保价（0 不保价 1 订单金额保价 2 声明价值保价）
* @param string account.insureValueCustom 保价金额
* @param string account.insureValueTimes 保价金额倍数
@ -274,20 +264,16 @@ class PrintSettingController extends AbstractApiController {
* @param string tplId * 模板id
* @param object branchAddress * 网点信息
* @param string branchAddress.quantity * 面单余额
* @param string branchAddress.country * 国家
* @param string branchAddress.province * 省
* @param string branchAddress.city * 市
* @param string branchAddress.district * 区
* @param string branchAddress.street 街道
* @param string branchAddress.town 街道 - 小红书云使用
* @param string branchAddress.district 区
* @param string branchAddress.detail * 详细地址
* @param string branchAddress.netsiteCode 网点Code[快手必传]
* @param string branchAddress.netsiteName 网点名称[快手必传]
* @param string branchAddress.branchCode 网点Code[菜鸟必传]
* @param string settleAccount 客户编码
* @param string userId 账号ID
* @param [service] serviceList 增值服务
* @param string service.serviceCode * 增值服务编码值（SVC-INSURE保价，SVC-INSURE代收款）
* @param string service.serviceValue * 增值服务值
* @param string wbUserId 面单账号ID（当前店铺账号为0）
* @param Service[] services 增值服务(拼多多面单)
* @param string Service.code * 增值服务编码值(拼多多面单)
* @param array Service.attributes * 增值服务属性键值对(拼多多面单)
* @param string sendSite 网点名称（网点面单才有）
* @param string orderType * 快递类型（网点和抖店面单都有）
* @param string payType * 运费支付方式（网点和抖店面单都有）

2
app/libs/services/OrderPrint/ExpressTplService.php
Unescape Escape View File

@ -824,6 +824,8 @@ class ExpressTplService extends AbstractService {
$result['type'] = 'radio';
} elseif ($serviceCode == 'IN144' && $attributeCode == 'value') {
$result['type'] = 'input';
} elseif ($serviceCode == 'PRODUCT_TYPE' && $attributeCode == 'value') {
$result['type'] = 'select';
}
if ($result['type'] == 'number') {
if (isset($typeDesc['min'])) {

33
app/libs/services/OrderPrint/WaybillGet/PddWaybillGet.php
Unescape Escape View File

@ -281,34 +281,13 @@ class PddWaybillGet extends AbstractWaybillGet {
private function packPddWaybillLogisticsServices($printTrade) {
$services = [];
$waybillAccount = $this->expressTpl['waybillAccount'];
switch ($this->expressTpl['logisticsCode']) {
case LogisticsConst::SF:
if ($printTrade['insure']) {
$services['INSURE'] = [
'value' => number_format(max(0, $printTrade['insureMoney']), 2, '.', '')
];
if ($waybillAccount['services']) {
foreach ($this->expressTpl['services'] as $service) {
if ($printTrade['insure'] && $service['code'] == 'INSURE') {
$service['attributes']['value'] = number_format(max(0, $printTrade['insureMoney']), 2, '.', '');
}
if(!empty($waybillAccount['timedDelivery'])){
$services['TIMED-DELIVERY'] = [
'value' => $waybillAccount['timedDelivery']
];
}
$addedServices = $waybillAccount['addedServices'];
if(!empty($addedServices)){
if(!is_array($addedServices)) {
$addedServices = [$addedServices];
}
foreach ($addedServices as $addService){
$services[$addService] = ['value' => ''];
}
}
break;
case LogisticsConst::JD:
$services['PRODUCT_TYPE'] = [
'value' => $waybillAccount['productType']
];
break;
$services[$service['code']] = $service['attributes'];
}
}
return $services;
}

Write Preview
Loading…
Cancel
Save