|
|
@@ -40,8 +40,8 @@ class SplitSale extends Command
|
|
|
|
|
|
$data = Db::name('sale')
|
|
|
->alias('a')
|
|
|
- ->leftJoin('platform b','b.id=a.platform_id')
|
|
|
- ->leftJoin('good_proof c','c.id=a.proof_id')
|
|
|
+ ->leftJoin('platform b', 'b.id=a.platform_id')
|
|
|
+ ->leftJoin('good_proof c', 'c.id=a.proof_id')
|
|
|
->field('a.*,b.platform_name,c.proof_url')
|
|
|
->where([
|
|
|
['a.is_del', '=', 0],
|
|
|
@@ -249,7 +249,7 @@ class SplitSale extends Command
|
|
|
'supplier_name' => $supplier['name'] ?? '',
|
|
|
'zxNo' => $sale['zxNo'] ?? '',
|
|
|
'proof_id' => $sale['proof_id'] ?? 0,
|
|
|
- 'proof_url' => $sale['proof_url']??'',
|
|
|
+ 'proof_url' => $sale['proof_url'] ?? '',
|
|
|
'other_orderNo' => $sale['other_orderNo'],
|
|
|
'paytime' => $sale['paytime'] ?? '',
|
|
|
'workNo' => $sale['workNo'] ?? '',
|
|
|
@@ -294,8 +294,8 @@ class SplitSale extends Command
|
|
|
'send_num' => $cgd['send_num'] ?? 0,
|
|
|
'wsend_num' => $cgd['wsend_num'] ?? 0,
|
|
|
'status' => $cgd['status'] ?? '',
|
|
|
- 'order_type' => $cgd['order_type'] ?? '',
|
|
|
- 'order_source' => $cgd['order_source'] ?? '',
|
|
|
+ 'order_type' => $cgd['order_type'] ?? $sale['order_type'],
|
|
|
+ 'order_source' => $cgd['order_source'] ?? 0,
|
|
|
'good_type' => $cgd['order_source'] ?? '',
|
|
|
'last_time' => $cgd['last_time'] ?? '',
|
|
|
'send_type' => $sale['send_type'] ?? '',
|
