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

app/command/ImportOrderFromCAnalysisData.php

@@ -196,7 +196,7 @@ class ImportOrderFromCAnalysisData extends Command
                     }
 
                     //判断总价是否计算正确
-                    if (bccomp($rs['num'] * $rs['price'], $rs['before_discount_all_price']) != 0) {
+                    if (bccomp((string)($rs['num'] * $rs['price']), (string)$rs['before_discount_all_price']) != 0) {
                         $update_c_data['status'] = OIFCModel::$status_wait_confirm;
                         $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',导入总价错误' : '导入总价错误';
                         $extend_insert_data['before_discount_all_price'] = 0;