|
|
@@ -127,7 +127,6 @@ class WorkClass extends BaseClass
|
|
|
$sh = $data['sh'] ?? 0;
|
|
|
$manyType = $data['manyType'] ?? 0;
|
|
|
$sendNum = $data['sendNum'] ?? '';
|
|
|
- $hasWork = 0;
|
|
|
|
|
|
$ids = array_column($goods, 'productId');
|
|
|
$info = GoodsClass::getByIds($ids, null, 'id');
|
|
|
@@ -209,12 +208,8 @@ class WorkClass extends BaseClass
|
|
|
'kindId' => $kindId,
|
|
|
'kindName' => $kindName,
|
|
|
];
|
|
|
- $work = self::createFinish($current, $main);
|
|
|
- if (!empty($work)) {
|
|
|
- $hasWork = 1;
|
|
|
- }
|
|
|
+ self::createFinish($current, $main);
|
|
|
}
|
|
|
- return ['hasWork' => $hasWork];
|
|
|
}
|
|
|
|
|
|
public static function createFinish($data, $main)
|
|
|
@@ -447,7 +442,6 @@ class WorkClass extends BaseClass
|
|
|
$manyType = $order->manyType ?? 0;
|
|
|
$sendNum = $order->sendNum ?? '';
|
|
|
$hasReachTime = 0;
|
|
|
- $hasWork = 0;
|
|
|
$reachDate = $order->reachDate ?? '';
|
|
|
if (!empty($reachDate) && $reachDate != '0000-00-00') {
|
|
|
$hasReachTime = 1;
|
|
|
@@ -487,11 +481,9 @@ class WorkClass extends BaseClass
|
|
|
'manyType' => $manyType,
|
|
|
'sendNum' => $sendNum,
|
|
|
];
|
|
|
- $ret = WorkClass::goodsCreateFinish($params, $main);
|
|
|
- $hasWork = $ret['hasWork'] ?? 0;
|
|
|
+ WorkClass::goodsCreateFinish($params, $main);
|
|
|
}
|
|
|
}
|
|
|
- return ['hasWork' => $hasWork];
|
|
|
}
|
|
|
|
|
|
}
|