Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/controller/After.php

@@ -513,7 +513,8 @@ class After extends Base
 
             switch ($info['status']) {
                 case 1:
-                    if (in_array($param['status'], [6, 9]) == false) throw new Exception('选项错误');
+                    if (in_array($param['status'], [6, 2, 9]) == false) throw new Exception('选项错误');
+                    if ($info['order_type'] == 1 && $param['status'] != 2) throw new Exception('选项错误');//库存品不允许供应商审核，只允许走2-11-4-12-5流程
                     break;
                 case 9:
                     if ((($info['is_receive'] == 1) && (in_array($param['status'], [2, 4]) == false) || (($info['is_receive'] == 0) && (in_array($param['status'], [2, 5]) == false)))) throw new Exception('选项错误');
@@ -530,6 +531,7 @@ class After extends Base
                 case 2:
 
                     if ((($info['is_receive'] == 1) && (in_array($param['status'], [10, 11]) == false) || (($info['is_receive'] == 0) && (in_array($param['status'], [10, 5]) == false)))) throw new Exception('选项错误');
+                    if ($info['order_type'] == 1 && $param['status'] != 11) throw new Exception('选项错误');//库存品不允许供应商审核，只允许走2-11-4-12-5流程
 
                     break;
                 case 10:

app/admin/controller/AfterChild.php

@@ -26,14 +26,16 @@ class AfterChild extends Base
             ->alias('a')
             ->leftJoin('warehouse_info b', 'b.wsm_code=a.send_wsm_code')
             ->leftJoin('warehouse_info c', 'c.wsm_code=a.return_wsm_code')
+            ->leftJoin('order_return d','d.returnCode=a.returnCode and d.is_del=0')
             ->where($where)
             ->count('a.id');
 
         $list = Db::name('order_return_child')
             ->alias('a')
-            ->field('a.id,a.returnCode,a.orderCode,a.outCode,a.order_out_child_status,a.outChildCode,b.supplierName send_supplierName,b.supplierNo send_supplierNo,b.name send_wsm_name,a.send_wsm_code,b.contactor_name send_contactor_name,a.send_num,a.return_num,c.supplierName return_supplierName,c.supplierNo return_supplierNo,c.name return_wsm_name,a.return_wsm_code,c.contactor_name return_contactor_name,a.status')
+            ->field('a.id,a.returnCode,a.orderCode,a.outCode,a.order_out_child_status,a.outChildCode,b.supplierName send_supplierName,b.supplierNo send_supplierNo,b.name send_wsm_name,a.send_wsm_code,b.contactor_name send_contactor_name,a.send_num,a.return_num,c.supplierName return_supplierName,c.supplierNo return_supplierNo,c.name return_wsm_name,a.return_wsm_code,c.contactor_name return_contactor_name,a.status,d.companyNo,d.companyName,d.customer_code,d.customer_name')
             ->leftJoin('warehouse_info b', 'b.wsm_code=a.send_wsm_code')
             ->leftJoin('warehouse_info c', 'c.wsm_code=a.return_wsm_code')
+            ->leftJoin('order_return d','d.returnCode=a.returnCode and d.is_del=0')
             ->where($where)
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
@@ -539,6 +541,10 @@ class AfterChild extends Base
 
         $info = Db::name('order_return_child')
             ->alias('a')
+            ->field('a.*,b.supplierName send_supplierName,b.supplierNo send_supplierNo,b.name send_wsm_name,c.supplierName return_supplierName,c.supplierNo return_supplierNo,c.name return_wsm_name,d.companyNo,d.companyName,d.customer_code,d.customer_name')
+            ->leftJoin('warehouse_info b', 'b.wsm_code=a.send_wsm_code')
+            ->leftJoin('warehouse_info c', 'c.wsm_code=a.return_wsm_code')
+            ->leftJoin('order_return d','d.returnCode=a.returnCode and d.is_del=0')
             ->where(['a.is_del' => 0, 'a.id' => $param['id']])
             ->findOrEmpty();
 

app/admin/controller/ReorderChild.php

@@ -129,12 +129,15 @@ class ReorderChild extends Base
 
         $count = Db::name('sale_return_child')
             ->alias('a')
-            ->where($where)
+            ->leftJoin('sale_return b','b.returnCode=a.returnCode and b.is_del=0')
+            ->leftJoin('warehouse_info c','c.wsm_code=a.return_wsm_code and c.is_del=0') ->where($where)
             ->count('a.id');
 
         $list = Db::name('sale_return_child')
             ->alias('a')
-            ->field('a.id,a.saleReturnChildCode,a.type,a.outChildCode,a.outCode,a.companyNo,a.companyName,a.customer_code,a.customerName,a.num,a.sale_price,a.total_price,a.status,a.addtime')
+            ->field('a.id,a.saleReturnChildCode,a.type,a.outChildCode,a.outCode,a.companyNo,a.companyName,a.customer_code,a.customerName,a.num,a.sale_price,a.total_price,a.status,a.addtime,b.supplierNo,b.supplierName,a.return_wsm_code,c.name return_wsm_name')
+            ->leftJoin('sale_return b','b.returnCode=a.returnCode and b.is_del=0')
+            ->leftJoin('warehouse_info c','c.wsm_code=a.return_wsm_code and c.is_del=0')
             ->where($where)
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
@@ -334,7 +337,11 @@ class ReorderChild extends Base
         if ($val->check($param) == false) return json_show(1004, $val->getError());
 
         $info = Db::name('sale_return_child')
-            ->where(['is_del' => 0, 'id' => $param['id']])
+            ->alias('a')
+            ->field('a.*,b.supplierNo,b.supplierName,c.name return_wsm_name')
+            ->leftJoin('sale_return b', 'b.returnCode=a.returnCode and b.is_del=0')
+            ->leftJoin('warehouse_info c', 'c.wsm_code=a.return_wsm_code and c.is_del=0')
+            ->where(['a.is_del' => 0, 'a.id' => $param['id']])
             ->findOrEmpty();
 
         return empty($info) ? json_show(1004, '该退货工单不存在') : json_show(0, '获取退货工单详情成功', $info);

app/youzan/controller/Index.php

@@ -38,13 +38,13 @@ class Index extends Base
     //审核并将商品推送到有赞平台
     public function checkExamstatus()
     {
-        $param = $this->request->only(['platform_youzan_id', 'exam_status', 'reject_reason', 'yz_cat_id', 'is_support_barter', 'good_ladder_id', 'final_price', 'start_sale_num', 'tags' => [], 'item_type' => 0, 'auto_listing_time' => '0', 'origin' => 0,'relaComNo','distribution'=>[1]], 'post', 'trim');
+        $param = $this->request->only(['platform_youzan_id', 'exam_status', 'reject_reason', 'yz_cat_id'=>0, 'is_support_barter', 'good_ladder_id', 'final_price', 'start_sale_num', 'tags' => [], 'item_type' => 0, 'auto_listing_time' => '0', 'origin' => 0,'relaComNo','distribution'=>[1]], 'post', 'trim');
 
         $val = Validate::rule([
             'platform_youzan_id|商品上线记录ID' => 'require|number|gt:0',
             'exam_status|审核状态' => 'require|number|in:1,2',
             'reject_reason|驳回原因' => 'requireIf:exam_status,2',
-            'yz_cat_id|有赞分类' => 'requireIf:exam_status,1|number|gt:0',
+            'yz_cat_id|有赞分类' => 'number|egt:0',
             'is_support_barter|是否可退货' => 'requireIf:exam_status,1|number|in:0,1',
             'good_ladder_id|商品阶梯记录id' => 'requireIf:exam_status,1|number|gt:0',
             'final_price|最终售价' => 'requireIf:exam_status,1|float|elt:9999999',

app/youzan/logic/Cat.php

@@ -18,13 +18,13 @@ class Cat
 
         $key = self::$cache_key . (string)$parent_cid;
 
-        $rs = Cache::get($key);
-
+//        $rs = Cache::get($key);
+        $rs=[];
         if (empty($rs)) {
 
-            $rs = YzCat::field('id,yz_cat_id,yz_cat_name,parent_cid')
+            $rs = YzCat::field('id,rule_id yz_cat_id,name yz_cat_name,parent_id parent_cid,level,has_children')//id,yz_cat_id,yz_cat_name,parent_cid
                 ->where('status', YzCat::$status_normal)
-                ->where('parent_cid', $parent_cid)
+                ->where('parent_id', $parent_cid)
                 ->order('id')
                 ->select()
                 ->toArray();

app/youzan/logic/Goodup.php

@@ -2,6 +2,7 @@
 
 namespace app\youzan\logic;
 
+use app\admin\common\User;
 use app\admin\model\ActionLog;
 use app\admin\model\ProcessOrder;
 use app\txx\model\YzGood;
@@ -352,8 +353,8 @@ class Goodup
 
             //添加审核记录
             ActionLog::logAdd([
-                'id' => isset($userinfo['data']['id']) ? $userinfo['data']['id'] : 0,
-                'nickname' => isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname'] : ''
+                'id' => $uid,//isset($userinfo['data']['id']) ? $userinfo['data']['id'] : 0,
+                'nickname' => $uname//isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname'] : ''
             ], [
                 "order_code" => $rs->skuCode,//编号
                 "status" => $old_exam_status,
@@ -362,8 +363,8 @@ class Goodup
             ], 'YZSX', $update_data['exam_status'], $update_data);
 
             ProcessOrder::AddProcess([
-                'id' => isset($userinfo['data']['id']) ? $userinfo['data']['id'] : 0,
-                'nickname' => isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname'] : ''
+                'id' => $uid,//isset($userinfo['data']['id']) ? $userinfo['data']['id'] : 0,
+                'nickname' => $uname,//isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname'] : ''
             ], [
                 "order_type" => 'YZSX',
                 "order_code" => $rs->skuCode,//咨询单详情编号
@@ -534,11 +535,14 @@ class Goodup
         $data['cat_info'] = made($data['cat_id'], []);
         $data['yz_cat_info'] = made_youzan($data['yz_cat_id'], []);
         $spec = Db::name("good_spec")->where(["spuCode" => $data['spuCode'], "is_del" => 0])->select()->toArray();
-        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo']])->find();
-        $data['supplierName'] = isset($supplier['name']) ? $supplier['name'] : "";
+//        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo']])->find();
+
+        $names = User::getIns()->handle('getCodeAndName',['code'=>[$data['supplierNo'],$data['companyNo']]]);
+
+        $data['supplierName'] = $names['data'][$data['supplierNo']]??'';
 //        $data['noble_name'] = isset($data['noble_metal']) && $data['noble_metal'] != 0 ? $this->noble[$data['noble_metal']] : "";
-        $company = Db::name("business")->where(["companyNo" => $data['companyNo']])->find();
-        $data['company'] = isset($company['company']) ? $company['company'] : "";
+//        $company = Db::name("business")->where(["companyNo" => $data['companyNo']])->find();
+        $data['company'] = $names['data'][$data['companyNo']]??'';//isset($company['company']) ? $company['company'] : "";
         if ($data['brand_id'] != 0) {
             $brand = Db::name("brand")->where(["id" => $data['brand_id']])->find();
             $data["brand_name"] = isset($brand['brand_name']) ? $brand['brand_name'] : "";
@@ -625,6 +629,9 @@ class Goodup
         $data['detail_url'] = YzGood::where(['is_del' => 0, 'item_no' => $data['skuCode']])
             ->value('detail_url', '');
 
+        //格式化配送方式
+        $data['distribution'] = explode(',', $data['distribution']);
+
         return app_show(0, "获取成功", $data);
     }
 

app/youzan/model/YzCat.php

@@ -8,7 +8,7 @@ use think\Model;
 class YzCat extends Model
 {
     protected $connection = 'mysql_yz';//切换连接参数
-    protected $table = 'yz_cat';
+    protected $table = 'yz_cat_v4';
     protected $pk = 'id';
     protected $autoWriteTimestamp = false;