|
|
@@ -279,7 +279,7 @@ class SplitSale extends Command
|
|
|
{
|
|
|
|
|
|
$tmp_cgd = [
|
|
|
- 'good_price' => isset($cgd['good_num']) ? ($cgd['good_num'] > 0 ? round(bcdiv($cgd_total, $cgd['good_num'], 5), 4) : 0) : 0,
|
|
|
+ 'good_price' => $sale['good_num'] > 0 ? round(bcdiv($cgd_total, $sale['good_num'], 5), 4) : 0,
|
|
|
'total_fee' => $cgd_total,
|
|
|
'pakage_fee' => $cgd['pakge_fee'] ?? 0,
|
|
|
'open_fee' => $cgd['open_fee'] ?? 0,
|
|
|
@@ -290,15 +290,15 @@ class SplitSale extends Command
|
|
|
'nake_fee' => $cgd['nake_fee'] ?? 0,
|
|
|
'demo_fee' => $cgd['demo_fee'] ?? 0,
|
|
|
'weight' => $cgd['weight'] ?? 0,
|
|
|
- 'diff_weight' => $cgd['diff_weight'] ?? 0,
|
|
|
- 'diff_fee' => $cgd['diff_fee'] ?? 0,
|
|
|
- 'gold_price' => $cgd['gold_price'] ?? 0,
|
|
|
- 'send_num' => $cgd['send_num'] ?? 0,
|
|
|
- 'wsend_num' => $cgd['wsend_num'] ?? 0,
|
|
|
+ 'diff_weight' => $sale['diff_weight'] ?? 0,
|
|
|
+ 'diff_fee' => $sale['diff_fee'] ?? 0,
|
|
|
+ 'gold_price' => $sale['gold_price'] ?? 0,
|
|
|
+ 'send_num' => $sale['send_num'] ?? 0,
|
|
|
+ 'wsend_num' => $sale['wsend_num'] ?? 0,
|
|
|
'status' => $cgd['status'] ?? '',
|
|
|
- 'order_type' => $cgd['order_type'] ?? $sale['order_type'],
|
|
|
- 'order_source' => $cgd['order_source'] ?? 0,
|
|
|
- 'good_type' => $cgd['order_source'] ?? '',
|
|
|
+ 'order_type' => $sale['order_type'],
|
|
|
+ 'order_source' => $sale['order_source'] ?? 0,
|
|
|
+ 'good_type' => $sale['order_source'] ?? '',
|
|
|
'last_time' => $cgd['last_time'] ?? '',
|
|
|
'send_type' => $sale['send_type'] ?? '',
|
|
|
'send_status' => $sale['send_status'] ?? '',
|
|
|
@@ -326,9 +326,9 @@ class SplitSale extends Command
|
|
|
'depart' => get_company_name_by_uid($cgd['cgder_id'] ?? 0) ?? '',
|
|
|
'qrdNo' => $orderCode,
|
|
|
'spuCode' => $cgd['spuCode'] ?? $sale['good_code'],
|
|
|
- 'good_name' => $cgd['good_name'] ?? $sale['good_name'],
|
|
|
+ 'good_name' => $sale['good_name'],
|
|
|
'skuCode' => $cgd['skuCode'] ?? '',
|
|
|
- 'good_num' => $cgd['good_num'] ?? 0,
|
|
|
+ 'good_num' => $sale['good_num'] ?? 0,
|
|
|
'cat_name' => json_encode($this->_get_cat_list($sale['cat_id']), JSON_UNESCAPED_UNICODE),
|
|
|
'companyNo' => $pay_rate['companyNo'],
|
|
|
'companyName' => $pay_rate['companyName'],
|
