Эх сурвалжийг харах

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng 2 жил өмнө
parent
commit
b818389c05

+ 2 - 2
app/command/SplitSale.php

@@ -81,7 +81,7 @@ class SplitSale extends Command
                     }
 
                     //贵金属分类转换文本
-                    $good['noble_metal'] = $this->noble_metal[$good['noble_metal']] ?? '';
+                    $good['noble_metal'] = $this->noble_metal[$good['noble_metal'] ?? 0] ?? '';
 
                     //相关数据合并
                     $sale = array_merge($sale, $good);
@@ -149,7 +149,7 @@ class SplitSale extends Command
                         }
 
                         $sale_total = $cgd_total;
-                        $cgd_total = round(bcsub($cgd_total, bcmul($cgd['total_fee'], $pay_rate['rate'], 3), 3), 2);
+                        $cgd_total = round(bcsub($cgd_total, bcmul($cgd['total_fee'] ?? 0, $pay_rate['rate'], 3), 3), 2);
 
                         //把自己覆盖到上一个记录的供应商记录中
                         if (isset($this->cgd_insert[$this->cgd_key - 1])) {