|
|
@ -479,18 +479,7 @@ class ExpressTplService extends AbstractService {
|
|
|
|
|
|
|
|
|
|
|
|
public function getAllExpressTplList($mallId) {
|
|
|
|
public function getAllExpressTplList($mallId) {
|
|
|
|
$filter = ['status' => StatusConst::normal];
|
|
|
|
$filter = ['status' => StatusConst::normal];
|
|
|
|
$expressTplList = $this->expressTplRepository->getUserExpressTplList($mallId, $filter);
|
|
|
|
return $this->expressTplRepository->getUserExpressTplList($mallId, $filter);
|
|
|
|
$ptmdExpressList = array_filter($expressTplList, function ($value) {
|
|
|
|
|
|
|
|
return $value['expressType'] == OrderPrintConst::expressTypePtmd;
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
$dzmdExpressList = array_filter($expressTplList, function ($value) {
|
|
|
|
|
|
|
|
return $value['expressType'] == OrderPrintConst::expressTypeDzmd;
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return [
|
|
|
|
|
|
|
|
OrderPrintConst::expressTypePtmd => array_values($ptmdExpressList),
|
|
|
|
|
|
|
|
OrderPrintConst::expressTypeDzmd => array_values($dzmdExpressList),
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public function getNormalSysExpressTplMap($expressType, $waybillTypes = null, $sort = null, $allColumns = false) {
|
|
|
|
public function getNormalSysExpressTplMap($expressType, $waybillTypes = null, $sort = null, $allColumns = false) {
|
|
|
|