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

app/admin/controller/Consult.php

@@ -1629,7 +1629,41 @@ class Consult extends Base
             Db::rollback();
             return error_show(1004,$e->getMessage());
         }
+    }
 
+    public function bids_check_batch(){
+        $list = $this->request->param(["list"=>[]],"post");
+        $valid = Validate::rule([
+            "list|商品审核数据列表"=>"require|array",
+        ]);
+        if(!$valid->check($list)){
+            return error_show(1004,$valid->getError());
+        }
+        $temp=[];
+        $bids = ConsultBids::whereIn('bidNo',$list['list'])->column("id,infoNo,bidNo,status,tax_status,tax,tax_id,is_combind","bidNo");
+        foreach ($list['list'] as $k=>$v){
+            if (!isset($bids[$v])) return error_show(1004,"{$v}的反馈单不存在");
+            if($bids[$v]['tax_status']!=0) return error_show(1004,"{$v}的反馈单状态不正确");
+            $consult_info =ConsultInfo::where(['infoNo'=>$bids[$v]['infoNo'],'is_del'=>0])->findOrEmpty();
+            if($consult_info->isEmpty()) $this->error("未找到{$v['bidNo']}的咨询单数据");
+            if($consult_info['status']!=2&&$consult_info['status']!=3&&$consult_info['status']!=7){
+                return error_show(1004,"{$v}的咨询单招标未结束或已确认商品");
+            }
+           if ($bids[$v]['is_combind']==1)return error_show(1004,$v.'组合商品不可参与批量审核');
+            $temp[]=[
+                "id"=>$bids[$v]['id'],
+                "tax_status"=>1,
+                "out_tax_id"=>$bids[$v]['tax_id'],
+                "out_tax"=>$bids[$v]['tax']
+                ];
+        }
+        try{
+           $update= (new ConsultBids())->saveAll($temp);
+           if($update->count()<=0)throw new \Exception("商品确定失败");
+        }catch (\Exception $e){
+            return error_show(1004,$e->getMessage());
+        }
+        return app_show(0,'商品确定成功');
     }
     //选择商品
 //    public function bids_check(){
@@ -2033,14 +2067,15 @@ class Consult extends Base
         ->select()
         ->toArray();
         $data=[];
-        $user= \app\admin\common\User::getIns();
-        $supplier_temp =$user->handle("getCodeAndName",["code"=>array_column($list,"supplierNo")]);
-		$supplier=$supplier_temp['data']??[];
+        $supplier = \app\model\Supplier::where(["code"=>array_column($list,"supplierNo"),"is_del"=>0])->column("name,legaler_type","code");
+        $company = \app\model\Business::where(["companyNo"=>array_column($list,"companyNo"),"is_del"=>0])->column("legaler_type","companyNo");
         foreach ($list as $value){
             $value['can']= isset($value['cat_id']) && $value['cat_id'] !=0 ? made($value['cat_id']):[];
             $unit =Db::name("unit")->where(["id"=>$value['unit_id']])->find();
             $value['unit'] = isset($unit['unit'])?$unit['unit']:'';
-            $value['supplierName'] = isset($supplier[$value['supplierNo']])?$supplier[$value['supplierNo']]:"";
+            $value['supplierName'] = isset($supplier[$value['supplierNo']])?$supplier[$value['supplierNo']]['name']:"";
+            $value['supplier_legaler_type'] = isset($supplier[$value['supplierNo']])?$supplier[$value['supplierNo']]['legaler_type']:"";
+            $value['company_legaler_type'] = isset($company[$value['companyNo']])?$company[$value['companyNo']]:'';
             if($value['brand_id']!=0){
                 $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
                 $value["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";

app/admin/controller/Goodup.php

@@ -3375,7 +3375,7 @@ class Goodup extends Base
                     $curl_data = [
                         'item_no' => $value['skuCode'],//商品自定义编码 skuCode
                         'uid' => $createrid,
-                        'nickname' => $creater,
+                        'uname' => $creater,
                     ];
 
                     //已上线的要调用有赞接口下线

app/admin/controller/Group.php

@@ -1,8 +1,5 @@
 <?php
 namespace app\admin\controller;
-
-use app\admin\model\ActionLog;
-use app\BaseController;
 use think\facade\Db;
 use think\App;
 
@@ -47,7 +44,6 @@ class Group extends Base
             $val['userlist']= $userlist;
             $data[] = $val;
         }
-
         return  app_show(0,"获取成功",['list'=>$data,"count"=>$count]);
     }
 

app/admin/controller/InterOrder.php

@@ -9,7 +9,9 @@ use think\facade\Db;
 
 class InterOrder extends Base
 {
-	public function __construct(App $app) {parent::__construct($app);}
+	public function __construct(App $app) {
+	    parent::__construct($app);
+	}
     /**
      * 显示资源列表
      *

app/admin/controller/Purch.php

@@ -287,15 +287,14 @@ class Purch extends Base
          $taxInfo=OrderTax::where(['code'=>$data['cgdNo']])->findOrEmpty();
          $data['tax_name'] = $taxInfo['tax_name']??'';
          $data['tax_code'] =$taxInfo['tax_code']??'';
-          $data['tax_short_name'] =$taxInfo['tax_short_name']??'';
+         $data['tax_short_name'] =$taxInfo['tax_short_name']??'';
          $data['tax']=$taxInfo['inv_tax']??'';
          $data['inv_good_name']=$taxInfo['inv_good_name']??'';
-
-            $goon['exclusive'] = isset($goon['is_exclusive']) ? makeExcluse($goon['is_exclusive']) : "";
-            $unit = Db::name("unit")->where(["id" => $goon['good_unit']])->find();
-            $goon['unit'] = isset($unit['unit']) ? $unit['unit'] : '';
-            $spec = Db::name("good_spec")->where(["spuCode" => $goon['spuCode'], "is_del" => 0])->select()->toArray();
-            $speclist = [];
+        $goon['exclusive'] = isset($goon['is_exclusive']) ? makeExcluse($goon['is_exclusive']) : "";
+        $unit = Db::name("unit")->where(["id" => $goon['good_unit']])->find();
+        $goon['unit'] = isset($unit['unit']) ? $unit['unit'] : '';
+        $spec = Db::name("good_spec")->where(["spuCode" => $goon['spuCode'], "is_del" => 0])->select()->toArray();
+        $speclist = [];
             if (!empty($spec)) {
                 foreach ($spec as $value) {
                     $temp = [];
@@ -389,7 +388,6 @@ class Purch extends Base
             $data['wsm_supplierNo'] = isset($wsmcode['data'][$data['wsm_code']]) ? $wsmcode['data'][$data['wsm_code']] : "";
             $data['wsm_contactor'] = isset($wsmcode['wsm_contactor']) ? $wsmcode['wsm_contactor'] : "";
             $data['wsm_mobile'] = isset($wsmcode['wsm_mobile']) ? $wsmcode['wsm_mobile'] : "";
-            // $data['wsm_addr'] =isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
             $data['addr_code'] = isset($wsmcode['addr_code']) ? $wsmcode['addr_code'] : "";
             $data['wsm_addr'] = isset($wsmcode['addr_code']) ? GetAddr($wsmcode['addr_code']) : "";
             $data['wsm_addr'] .= isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr'] : "";

app/admin/model/GoodTax.php

@@ -73,4 +73,14 @@ class GoodTax extends Model
 
         return $temp;
     }
+
+    public function SetTaxAttr($v){
+       return str_replace('%','',$v);
+    }
+    public function SetOutTaxAttr($v){
+          return str_replace('%','',$v);
+    }
+    public function SetCgdTaxAttr($v){
+        return str_replace('%','',$v);
+    }
 }

app/admin/model/OrderTax.php

@@ -3,7 +3,6 @@
 
 namespace app\admin\model;
 
-
 use think\Model;
 class OrderTax extends Model {
     protected $createTime = 'createTime';

app/admin/route/app.php

@@ -263,7 +263,7 @@ Route::rule('catwlist', "admin/Cat/wlist");
 Route::rule('backlist', 'admin/Purchin/returnList');
 //Route::rule('backstatus', 'admin/Purchback/status');
 //Route::rule('backfe', 'admin/Purchback/backfe');
-//Route::rule('backinfo', 'admin/Purchback/info');
+Route::rule('backinfo', 'admin/Purchback/info');
 //Route::rule('backdel', 'admin/Purchback/delete');
 
 Route::rule('aftercreate', 'admin/After/create');

app/model/Base.php

@@ -8,7 +8,7 @@ use think\Model;
 /**
  * @mixin \think\Model
  */
-class Base extends Model
+abstract class Base extends Model
 {
     protected $connection='mysql_sys';
 }

app/model/Business.php

@@ -0,0 +1,9 @@
+<?php
+
+
+namespace app\model;
+
+
+class Business extends Base{
+
+}

app/youzan/logic/Goodup.php

@@ -659,7 +659,7 @@ class Goodup
             $curl_data = [
                 'item_no' => $rs->skuCode,//商品自定义编码 skuCode
                 'uid' => isset($userinfo['data']['id']) ? $userinfo['data']['id'] : 0,
-                'nickname' => isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname'] : '',
+                'uname' => isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname'] : '',
             ];
 
             if ($rs->exam_status == $db::$exam_status_6) {
@@ -703,10 +703,10 @@ class Goodup
                 ]);
 
             $stn = ["order_code" => $rs->skuCode, "status" => $old_status, "action_remark" => '', "action_type" => "status"];
-            ActionLog::logAdd(['id' => $curl_data['uid'], ['nickname' => $curl_data['nickname']]], $stn, "YZSX", $db::$exam_status_8, $data);
+            ActionLog::logAdd(['id' => $curl_data['uid'], ['nickname' => $curl_data['uname']]], $stn, "YZSX", $db::$exam_status_8, $data);
 
             $process = ["order_code" => $rs->skuCode, "order_id" => $rs->id, "order_status" => $db::$exam_status_8, "order_type" => 'YZSX', "before_status" => $old_status, 'holder_id' => $curl_data['uid']];
-            ProcessOrder::AddProcess(['id' => $curl_data['uid'], ['nickname' => $curl_data['nickname']]], $process);
+            ProcessOrder::AddProcess(['id' => $curl_data['uid'], ['nickname' => $curl_data['uname']]], $process);
 
             Db::commit();