商品上线的审核备注更新

app/admin/controller/Activity.php

@@ -528,30 +528,33 @@ class Activity extends Base
 
         if (!empty($activity_info)) {
 
-            //判断是否是启用实时金价的贵金属
-            $rs = Db::name('good_platform')
-                ->alias('a')
-                ->join('good g', 'g.spuCode=a.spuCode')
-                ->join('good_nake c', 'c.spuCode=a.spuCode')
-                ->whereIn('a.skuCode', array_column($activity_info, 'skuCode'))
-                ->column('g.cat_id,g.is_gold_price,g.demo_fee,g.open_fee,g.weight,c.cost_fee,c.package_fee,c.mark_fee,c.cert_fee,g.noble_metal,c.nake_fee,c.delivery_fee', 'a.skuCode');
+            //状态不是(0待产品部审核,1待采购定价)，才会有起订量，才可以考虑计算售价
+            if ($activity['status'] > 1) {
 
-            foreach ($activity_info as &$value) {
+                //判断是否是启用实时金价的贵金属
+                $rs = Db::name('good_platform')
+                    ->alias('a')
+                    ->join('good g', 'g.spuCode=a.spuCode')
+                    ->join('good_nake c', 'c.spuCode=a.spuCode')
+                    ->whereIn('a.skuCode', array_column($activity_info, 'skuCode'))
+                    ->column('g.cat_id,g.is_gold_price,g.demo_fee,g.open_fee,g.weight,c.cost_fee,c.package_fee,c.mark_fee,c.cert_fee,g.noble_metal,c.nake_fee,c.delivery_fee', 'a.skuCode');
 
-                //如果启用了实时金价，且是贵金属
-                if (isset($rs[$value['skuCode']])) {
-                    $top_cat = made($rs[$value['skuCode']]['cat_id']);
-                    if (isset($top_cat[0]['id']) && $top_cat[0]['id'] == 6 && $rs[$value['skuCode']]['is_gold_price'] == 1) {
+                foreach ($activity_info as &$value) {
 
-                        $gold_price = Db::name("gold_price1")->where(["type" => $rs[$value['skuCode']]['noble_metal'], "is_del" => 0, "status" => 1])->order("addtime desc")->value('price');
+                    //如果启用了实时金价，且是贵金属
+                    if (isset($rs[$value['skuCode']])) {
+                        $top_cat = made($rs[$value['skuCode']]['cat_id']);
+                        if (isset($top_cat[0]['id']) && $top_cat[0]['id'] == 6 && $rs[$value['skuCode']]['is_gold_price'] == 1) {
 
-                        $value['sale_price'] = round($rs[$value['skuCode']]['demo_fee'] / $value['moq_num'] + $rs[$value['skuCode']]['open_fee'] / $value['moq_num'] + $rs[$value['skuCode']]['weight'] * $gold_price + $rs[$value['skuCode']]['cost_fee'] * $rs[$value['skuCode']]['weight'] + $rs[$value['skuCode']]['package_fee'] + $rs[$value['skuCode']]['mark_fee'] + $rs[$value['skuCode']]['cert_fee'] + $rs[$value['skuCode']]['nake_fee'] + $rs[$value['skuCode']]['delivery_fee'], 2);
+                            $gold_price = Db::name("gold_price1")->where(["type" => $rs[$value['skuCode']]['noble_metal'], "is_del" => 0, "status" => 1])->order("addtime desc")->value('price');
 
+                            $value['sale_price'] = round($rs[$value['skuCode']]['demo_fee'] / $value['moq_num'] + $rs[$value['skuCode']]['open_fee'] / $value['moq_num'] + $rs[$value['skuCode']]['weight'] * $gold_price + $rs[$value['skuCode']]['cost_fee'] * $rs[$value['skuCode']]['weight'] + $rs[$value['skuCode']]['package_fee'] + $rs[$value['skuCode']]['mark_fee'] + $rs[$value['skuCode']]['cert_fee'] + $rs[$value['skuCode']]['nake_fee'] + $rs[$value['skuCode']]['delivery_fee'], 2);
+
+                        }
                     }
-                }
 
+                }
             }
-
             $activity['info'] = $activity_info;
         } else $activity['info'] = [];
 

app/admin/controller/Good.php

@@ -920,10 +920,11 @@ class Good extends Base
 
         $count = Db::name("good_log")
             ->alias('a')
-            ->join("good_stock b","b.id=a.id","left")
+            ->leftJoin("good_stock b","b.id=a.stock_id")
             ->leftJoin('good c','c.spuCode=b.spuCode')
             ->where($where)
             ->count();
+
         $total = ceil($count/$param['size']);
         $page = $total>=$param['page'] ? $param['page'] :$total;
         $list = Db::name("good_log")
@@ -936,7 +937,8 @@ class Good extends Base
             ->order("a.addtime desc")
             ->select()
             ->toArray();
-        $data=[];
+
+//        $data=[];
 
         $action_uids = array_column($list, 'action_uid');
         $action_uids = array_unique($action_uids);

app/admin/controller/Goodup.php

@@ -1668,13 +1668,21 @@ class Goodup extends Base
                     Db::rollback();
                     return app_show(1004,"商品凭证新建失败");
                 }
+
+                //艳蓉说，要把审核备注更新到上一个节点那儿
+                Db::name("good_exam")
+                    ->where(['code'=>$platform['skuCode'],'exam_status'=>$bifore])
+                    ->order('addtime','desc')
+                    ->limit(1)
+                    ->update(['exam_remark'=>$exam_remark]);
+
                 $data=[
                     "code"=>$platform['skuCode'],
                     "type"=>2,
                     "exam_status"=>4,
                     "exam_id"=>$createrid,
                     "exam_name"=>$creater,
-                    "exam_remark"=>$exam_remark,
+                    "exam_remark"=>'',
                     "addtime"=>date("Y-m-d H:i:s")
                 ];
                 $inr=Db::name("good_exam")->insert($data);
@@ -2675,6 +2683,8 @@ class Goodup extends Base
 
             if (empty($rs)) throw new \Exception('该记录不存在');
 
+            $old_exam_staus = $rs['exam_status'];
+
             $good_nake = Db::name("good_nake")
                 ->field('id')
                 ->where(["spuCode" => $rs['spuCode'], "is_del" => 0])
@@ -2690,13 +2700,20 @@ class Goodup extends Base
                     'updatetime' => date('Y-m-d H:i:s'),
                 ]);
 
+            //艳蓉说，要把审核备注更新到上一个节点那儿
+            Db::name("good_exam")
+                ->where(['code' => $param['skuCode'], 'exam_status' => $old_exam_staus])
+                ->order('addtime', 'desc')
+                ->limit(1)
+                ->update(['exam_remark' => $param['exam_remark']]);
+
             Db::name("good_exam")->insert([
                 'code' => $rs['skuCode'],
                 'exam_status' => $exam_status,
                 'type' => 2,
                 'exam_id' => $createrid,
                 'exam_name' => $creater,
-                'exam_remark' => $param['exam_remark'],
+                'exam_remark' => '',//$param['exam_remark'],
                 'addtime' => date('Y-m-d H:i:s')
             ]);