Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/GoodOfflineLog.php

@@ -13,28 +13,16 @@ class GoodOfflineLog extends Base
     public function getList()
     {
 
-        $param = $this->request->only(['start_date' => '','companyNo' => '','supplierNo' => '','relaComNo' => '', "spuCode"=>'',"good_name"=>'','end_date' => '', 'creater' => '', 'page' => 1,'size' => 15], 'post', 'trim');
+        $param = $this->request->only(['start_date' => '',"type"=>1,'companyNo' => '','supplierNo' => '','relaComNo' =>
+         '', "spuCode"=>'',"good_name"=>'','end_date' => '', 'creater' => '', 'page' => 1,'size' => 15], 'post', 'trim');
 
-        $where = [];
+        $where = [["a.type","=",$param["type"]]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['a.addtime', 'between', [$param['start_date'], $param['end_date']]];
         if ($param['creater'] != '') $where[] = ['a.creater', 'like', '%' . $param['creater'] . '%'];
 		if ($param['spuCode'] != '') $where[] = ['a.spuCode', 'like', '%' . $param['spuCode'] . '%'];
         if ($param['good_name'] != '') $where[] = ['a.good_name', 'like', '%' . $param['good_name'] . '%'];
         if ($param['companyNo'] != '') $where[] = ['b.companyNo', 'like', '%' . $param['companyNo'] . '%'];
         if ($param['supplierNo'] != '') $where[] = ['b.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
-//        if ($param['relaComNo'] != '') $where[] = ['b.companyNo|b.supplierNo', 'like', '%' . $param['relaComNo'] . '%'];
-//        $role = $this->checkDataShare();
-//        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ["createrid", "in", $role[DataGroupModel::$type_全部]];
-
-        //只有level2的账号过滤数据权限
-//        if ($this->level == 2) {
-//            $role = $this->checkDataShare();
-//            $hand = resign_hand_user($this->uid, 0);
-//            if (!empty($role[DataGroupModel::$type_全部])) {
-//                $arr = array_unique(array_merge($hand, $role[DataGroupModel::$type_全部]));
-//                $where[] = ['a.createrid', 'in', $arr];
-//            }
-//        }
 
         $count = Db::name('good_offline_log')
             ->alias("a")
@@ -48,11 +36,6 @@ class GoodOfflineLog extends Base
             ->where($where)
             ->order('a.addtime', 'desc')
             ->page($param['page'], $param['size'])
-//            ->append(['is_allow_update'])
-//            ->withAttr('is_allow_update', function ($val, $data) use ($role) {
-//                if ($this->level == 2) return (in_array($this->roleid, [1, 33]) || in_array($data['createrid'], $role[DataGroupModel::$type_可编辑])) ? 1 : 0; //是否具有编辑权限
-//                
-//            })
             ->select()
             ->toArray();
         $userCommon=\app\admin\common\User::getIns();

app/admin/model/GoodOffineLog.php → app/admin/model/GoodOfflineLog.php

@@ -8,7 +8,7 @@ use think\Model;
 /**
  * @mixin \think\Model
  */
-class GoodOffineLog extends Model
+class GoodOfflineLog extends Model
 {
     //
 }

app/bbc/controller/Good.php

@@ -110,9 +110,9 @@ class Good extends Base
     		'offline_remark|下线备注'=>'requireIf:exam_status,5|max:255',
     		'plat_code|平台商品编码'=>'requireIf:exam_status,3|max:255',
     		'exam_remark|审核备注'=>'max:255',
-    		'good_ladder|售价阶梯'=>'requireIf:exam_status,3|array',
-    		'proof_type|售价凭证类型'=>'requireIf:exam_status,3|number|gt:0',
-    		'proof_url|售价凭证'=>'requireIf:exam_status,3|max:255',
+    		'good_ladder|售价阶梯'=>'requireIf:exam_status,6|array',
+    		'proof_type|售价凭证类型'=>'requireIf:exam_status,6|number|gt:0',
+    		'proof_url|售价凭证'=>'requireIf:exam_status,6|max:255',
     		]);
 		if($valide->check($post)==false) $this->error($valide->getError());
 		$goodPlat = new GoodPlatform();
@@ -124,7 +124,7 @@ class Good extends Base
         	//使用实时金价
         	 $nake=$goodNake->where(['spuCode'=> $platform->spuCode,'is_del'=>0,'nake_fee'=>0])
         	 ->findOrEmpty();
-        	 if($nake->isEmpty()) $this->error('一口价商品请先完善商品成本单价');
+        	 if($nake->isEmpty()==false) $this->error('一口价商品请先完善商品成本单价');
         }
         if($post['exam_status']==3){
             $is_exit = $goodPlat
@@ -158,7 +158,7 @@ class Good extends Base
                 ];
                 $inr=(new GoodExam())->save($data);
                 if($inr){
-                    if ($post['exam_status'] == 3) {
+                    if ($post['exam_status'] == 6) {
                     	//todo::需要去掉；
                     	if($post['proof_url']!=''){
                     		$proof=[
@@ -199,7 +199,7 @@ class Good extends Base
             }else throw new Exception('商品审核失败');
                     $platform->commit();
                     //流程记录
-                    $event=[ 'order_type' => 'SPSX',
+                    $event=[ 'order_type' => 'BBCSX',
                         'order_code' =>$platform->skuCode,//咨询单详情编号
                         'order_id' => $platform->id,
                         'order_status' => 2,
@@ -214,13 +214,14 @@ class Good extends Base
                    	$enevt=[
                    		    'spuCode' => $platform->spuCode,
                             'skuCodes' => $platform->skuCode,
+                            'type' => 2,
                             'good_name' => (new GoodBasic())->where('spuCode',$platform->spuCode)->value('good_name', ''),
                             'offline_reason' => $post['offline_reason'],
                             'offline_remark' => $post['offline_remark'],
                             'createrid' => $createrid,
                             'creater' => $creater,
 						];
-                   	event('goodOff',$enevt);
+                   	event('GoodOff',$enevt);
                    }
                    $this->success('商品审核成功');
         }catch (Exception $e){

app/bbc/listener/GoodOffine.php

@@ -3,7 +3,7 @@ declare (strict_types = 1);
 
 namespace app\bbc\listener;
 
-use app\admin\model\GoodOffineLog;
+use app\admin\model\GoodOfflineLog;
 class GoodOffine
 {
     /**
@@ -13,6 +13,6 @@ class GoodOffine
      */
     public function handle($event)
     {
-       GoodOffineLog::create($event);
+       GoodOfflineLog::create($event);
     }
 }