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

app/command/ImportOrderFromCAnalysisData.php

@@ -131,11 +131,18 @@ class ImportOrderFromCAnalysisData extends Command
                 if ($rs['price'] > 0) {
                     //活动
                     if ($rs['activity_name']) {
-                        $activity_info = Db::name('good_activity')
-                            ->alias('ga')
-                            ->field('ga.id,ga.activity_name,ga.activity_code,a.moq_num,a.activity_price')
-                            ->where(['ga.activity_name' => $rs['activity_name'], 'ga.is_del' => 0])
-                            ->leftJoin('activity_info a', 'a.activity_code=ga.activity_code AND a.is_del=0')
+//                        $activity_info = Db::name('good_activity')
+//                            ->alias('ga')
+//                            ->field('ga.id,ga.activity_name,ga.activity_code,a.moq_num,a.activity_price')
+//                            ->where(['ga.activity_name' => $rs['activity_name'], 'ga.is_del' => 0])
+//                            ->leftJoin('activity_info a', 'a.activity_code=ga.activity_code AND a.is_del=0')
+//                            ->find();
+                        //同一个活动会有多个商品
+                        $activity_info = Db::name('activity_info')
+                            ->alias('ai')
+                            ->field('ai.id,ga.activity_name,ga.activity_code,ai.moq_num,ai.activity_price')
+                            ->where(['ai.skuCode' => $extend_insert_data['skuCode'], 'ga.activity_name' => $rs['activity_name'], 'ai.is_del' => 0])
+                            ->leftJoin('good_activity ga', 'ga.activity_code=ai.activity_code AND ga.is_del=0')
                             ->find();
                         if (empty($activity_info)) {
                             $update_c_data['status'] = OIFCModel::$status_wait_confirm;
@@ -189,7 +196,7 @@ class ImportOrderFromCAnalysisData extends Command
                     }
 
                     //判断总价是否计算正确
-                    if (($rs['num'] * $rs['price']) != $rs['before_discount_all_price']) {
+                    if (bccomp($rs['num'] * $rs['price'], $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;