暂存

app/admin/controller/Goodup.php

@@ -2229,13 +2229,12 @@ class Goodup extends Base
                         $lemp['other_fee'] = $value['other_fee'];
 
                         if ($is_gold_price == 1 && $top_cat_id == 6) {
-                           // $gold =Db::name("gold_price1")->where(["type"=>$noble_metal,"status"=>1,"is_del"=>0])
-                           // ->order("addtime desc")->find();
+                            $gold =Db::name("gold_price1")->where(["type"=>$noble_metal,"status"=>1,"is_del"=>0])->order("addtime desc")->find();
 
                             //$lemp['nake_total'] =$noble_weight*$gold['price'] + $value['cost_fee']*$noble_weight+$value['mark_fee']+$value['package_fee']+$value['cert_fee']+$value['nake_fee']+$value['delivery_fee']+$value['other_fee'];
                             //成本合计=贵金属重量*供应商采购金价 + 工艺费*贵金属重量+加标费+包装费+证书费+成本裸价+运费+其他费用
                             //成本总计启用实时金价时，采用供应商实时金价
-                            $lemp['nake_total'] =$noble_weight *$cgd_gold_price+ $value['cost_fee'] * $noble_weight +
+                            $lemp['nake_total'] =$noble_weight *$gold['price']+ $value['cost_fee'] * $noble_weight +
                                 $value['mark_fee'] + $value['package_fee'] + $value['cert_fee'] + $value['nake_fee'] + $value['delivery_fee'] + $value['other_fee'];
                         }else{
                             $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
@@ -2750,8 +2749,12 @@ class Goodup extends Base
         Db::startTrans();
         try {
 
+            $good_name = Db::name("good_basic")
+                ->where(['is_del' => 0, 'spuCode' => $param['spuCode']])
+                ->value('good_name', '');
+
             $skuCodeS = Db::name("good_platform")
-                ->where(['spuCode' => $param['spuCode'], 'is_del' => 0])//exam_status 7审核失败,8已下线
+                ->where(['spuCode' => $param['spuCode'], 'is_del' => 0, 'exam_status' => 6])//exam_status 7审核失败,8已下线
                 ->column('exam_status,skuCode', 'skuCode');
 
             if ($skuCodeS) {
@@ -2760,7 +2763,7 @@ class Goodup extends Base
 
                 //商品平台
                 Db::name("good_platform")
-                    ->where(['spuCode' => $param['spuCode'], 'is_del' => 0])
+                    ->where(['spuCode' => $param['spuCode'], 'is_del' => 0, 'exam_status' => 6])
                     ->save([
                         'exam_status' => 8,
                         'updatetime' => date('Y-m-d H:i:s'),
@@ -2770,7 +2773,7 @@ class Goodup extends Base
                 $good_offline_log_id = Db::name("good_offline_log")->insertGetId([
                     'spuCode' => $param['spuCode'],
                     'skuCodes' => implode(',', array_keys($skuCodeS)),
-                    'good_name' => Db::name("good_basic")->where('spuCode', $param['spuCode'])->value('good_name', ''),
+                    'good_name' => $good_name,
                     'offline_reason' => $param['offline_reason'],
                     'offline_remark' => $param['offline_remark'],
                     'createrid' => $createrid,
@@ -2854,10 +2857,6 @@ class Goodup extends Base
 
                 $insert_good_offline_log_youzan_data = [];
 
-                $good_name = Db::name("good_basic")
-                    ->where('spuCode', $param['spuCode'])
-                    ->value('good_name', '');
-
                 foreach ($rs as $value) {
 
                     $curl_data = [
@@ -2897,7 +2896,7 @@ class Goodup extends Base
                         'updater' => $creater,
                         'updatetime' => date('Y-m-d H:i:s')
                     ]);
-                
+
                 //下线记录表增加记录
                 if ($insert_good_offline_log_youzan_data) Db::name('good_offline_log_youzan')->insertAll($insert_good_offline_log_youzan_data);
 

app/command/ImportOrderFromCHandleData.php

@@ -201,6 +201,7 @@ class ImportOrderFromCHandleData extends Command
                         'gold_price' => $ct['cgd_gold_price'],
                         'good_createrid' => $goodinfo['createrid'],
                         'good_creater' => $goodinfo['creater'],//商品创建人
+                        'weight'=>$ct['weight']
                     ];
 
                     $send_num = $extend_data['num'];