Commit 8b4e4ce2 authored by hj's avatar hj

更新

parent 67e31c52
...@@ -54,8 +54,8 @@ class InvoiceService ...@@ -54,8 +54,8 @@ class InvoiceService
'nsrdh' => '021-57461626', 'nsrdh' => '021-57461626',
'nsryh' => '交行上海南桥支行', 'nsryh' => '交行上海南桥支行',
'nsrzh' => '310069309018800003232', 'nsrzh' => '310069309018800003232',
'key' => '4hCGzt6uETEBIDVpdxtT25lM', 'key' => '1ukNk2mvKUSrsL2FLRymekvf',
'secret' => '6x5KNgZmu9fHI2o1Ni5ecfI7y2L6JJ', 'secret' => '7KL0q28OVk12W2t4kuKemIQtUFVYzd',
'tax_rate' => '13' 'tax_rate' => '13'
], ],
'bhua' => [ 'bhua' => [
...@@ -66,8 +66,8 @@ class InvoiceService ...@@ -66,8 +66,8 @@ class InvoiceService
'nsrdh' => '021-37581181', 'nsrdh' => '021-37581181',
'nsryh' => '交行上海大场支行', 'nsryh' => '交行上海大场支行',
'nsrzh' => '310065060018010017377', 'nsrzh' => '310065060018010017377',
'key' => '4hCGzt6uETEBIDVpdxtT25lM', 'key' => '1ukNk2mvKUSrsL2FLRymekvf',
'secret' => '6x5KNgZmu9fHI2o1Ni5ecfI7y2L6JJ', 'secret' => '7KL0q28OVk12W2t4kuKemIQtUFVYzd',
'tax_rate' => '13' 'tax_rate' => '13'
] ]
], ],
......
...@@ -52,7 +52,6 @@ class ZhenkhService ...@@ -52,7 +52,6 @@ class ZhenkhService
$temp['si_price'] = $item['si_price']; $temp['si_price'] = $item['si_price'];
$temp['si_discount'] = $item['si_discount']; $temp['si_discount'] = $item['si_discount'];
$temp['si_p_tod'] = $item['si_p_tod']; $temp['si_p_tod'] = $item['si_p_tod'];
$temp['si_num'] = $item['si_num'];
$temp['si_amount'] = $item['si_amount']; $temp['si_amount'] = $item['si_amount'];
$temp['si_vamount'] = $item['si_vamount']; $temp['si_vamount'] = $item['si_vamount'];
$temp['si_note'] = $item['si_notes']; $temp['si_note'] = $item['si_notes'];
......
...@@ -412,7 +412,7 @@ class ZhenKhService ...@@ -412,7 +412,7 @@ class ZhenKhService
} }
$itemList = []; $itemList = [];
foreach($orderDelivery as $delivery){ foreach($orderDelivery as $delivery){
if($delivery->p_id == 0) continue; if($delivery->p_id == 0) continue; //跳过运费
$zkhGoods = $this->zhenKhOrderService->getZkhGoodsSku($delivery->p_id); $zkhGoods = $this->zhenKhOrderService->getZkhGoodsSku($delivery->p_id);
if(empty($zkhGoods)){ if(empty($zkhGoods)){
$noMatchGoods[] = $orderNo; $noMatchGoods[] = $orderNo;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment