为供应商端api服务的相关修改

app/abutment/controller/Good.php

@@ -199,6 +199,11 @@ class Good extends HomeBaseController
         if ($cat_id == '') {
             return json_show(1004, "商品分类不能为空");
         }
+        //不允许创建贵金属商品
+        $top_cat_id = made($cat_id);//获取所有分类
+        $top_cat_id = isset($top_cat_id[0]['id']) ? $top_cat_id[0]['id'] : 0;//获取顶级分类id
+        if($top_cat_id && $top_cat_id==6) return json_show(1004,'不允许创建贵金属商品');
+
         $brandid = isset($this->post['brandid']) && $this->post['brandid'] != "" ? intval($this->post['brandid']) : "";
         if ($brandid == '') {
             return json_show(1004, "商品品牌不能为空");
@@ -470,10 +475,9 @@ class Good extends HomeBaseController
                         return json_show(1004, "商品规格值创建失败");
                     }
                 }
-                $catinfo = Db::name("cat")->where(["id" => $cat_id])->find();
-                $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate'] / 100 : 0;
-                $top_cat_id = made($cat_id);//获取所有分类
-                $top_cat_id = isset($top_cat_id[0]['id']) ? $top_cat_id[0]['id'] : 0;//获取顶级分类id
+//                $catinfo = Db::name("cat")->where(["id" => $cat_id])->find();
+//                $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate'] / 100 : 0;
+
                 if ($good_ladder !== "" && !empty($good_ladder)) {
                     $temp = [];
                     foreach ($good_ladder as $value) {
@@ -1617,10 +1621,10 @@ class Good extends HomeBaseController
         if ($data == false) {
             return json_show(1004, "未找到商品数据");
         }
-        $token = isset($this->post['token']) && $this->post['token'] != '' ? trim($this->post['token']) : "";
-        if ($token == '') {
-            return json_show(105, "参数token不能为空");
-        }
+//        $token = isset($this->post['token']) && $this->post['token'] != '' ? trim($this->post['token']) : "";
+//        if ($token == '') {
+//            return json_show(105, "参数token不能为空");
+//        }
 //        $user =GetUserInfo($token);
 //        if(empty($user)||$user['code']!=0){
 //            return json_show(102,"用户数据不存在");
@@ -1721,7 +1725,7 @@ class Good extends HomeBaseController
 
     }
 
-    //商品详情
+    //上线商品详情
     public function info()
     {
 

app/abutment/controller/Order.php

@@ -385,10 +385,13 @@ class Order extends HomeBaseController
         //原始数据
         $info = Db::name("purchease_order")
             ->whereIn('cgdNo', $cgdNo)
+            ->where('status', 0)
             ->column('id,cgdNo,status', 'cgdNo');
+        if (empty($info)) return json_show(1005, '没有可供确认的订单');
 
         $upd = Db::name("purchease_order")
             ->whereIn('cgdNo', $cgdNo)
+            ->where('status', 0)
             ->save([
                 'status' => $status,
                 'remark' => $remark,

app/abutment/middleware/homeMiddleware.php

@@ -30,11 +30,33 @@ class homeMiddleware
         //判断白名单
         if (!in_array(strtolower(request()->pathinfo()), $this->white_list)) {
 
-            //获取用户信息
-            $user = $this->getUserInfo($param);
-            if (is_array($user)) $request->user = $user;
-            else return $user;//响应信息，说明报错，直接返回给请求方
-
+            //请求头部是否有相关信息
+            $header = $request->header();
+            $val_header = Validate::rule([
+                'uid' => 'require|number|gt:0',
+                'nickname' => 'require|max:255',
+                'mobile' => 'require|number|length:11|mobile',
+                'email' => 'email|max:255',
+                'supplierno' => 'require|alphaNum|length:18',
+                'suppliername' => 'require|max:255',//header自动把大写字母转换成小写的了
+            ]);
+
+            if ($val_header->check($header)) {
+                $request->user = [
+                    'uid' => $header['uid'],
+                    'nickname' => $header['nickname'],
+                    'mobile' => $header['mobile'],
+                    'email' => '',
+                    'supplierNo' => $header['supplierno'],
+                    'supplierName' => $header['suppliername']
+                ];
+
+            } else {
+                //获取用户信息
+                $user = $this->getUserInfo($param);
+                if (is_array($user)) $request->user = $user;
+                else return $user;//响应信息，说明报错，直接返回给请求方
+            }
         }
 
         //3.记录日志

app/abutment/route/app.php

@@ -38,7 +38,7 @@ route::rule('catList', 'abutment/Good/wlist');//分类列表
 route::rule('catListTitle', 'abutment/Good/title');//分类列表-全部
 route::rule('checkIsUpdate', 'abutment/Good/checkIsUpdate');//判断是否允许修改成本信息和基础信息
 route::rule('goodCopy', 'abutment/Good/copy');//上线商品复制
-route::rule('goodInfo', 'abutment/Good/info');//商品详情
+route::rule('goodInfo', 'abutment/Good/info');//上线商品详情
 
 //销售订单(采销的采购单)
 route::rule('getOrderList', 'abutment/Order/getList');//列表

app/admin/controller/Goodup.php

@@ -8,6 +8,8 @@ use app\admin\model\ProcessOrder;
 use app\youzan\model\PlatformYouzan;
 use think\App;
 use think\Exception;
+use think\facade\Cache;
+use think\facade\Config;
 use think\facade\Db;
 use think\facade\Validate;
 
@@ -1562,6 +1564,33 @@ class Goodup extends Base
                         ]);
                     }
 
+
+                    //商品上线的话，将数据包塞入到队列中
+                    if ($exam_status == 6) {
+                        //将上线成功数据塞入到队列中
+
+                        $good_info = Db::name('good_basic')
+                            ->field('id,good_name,supplierNo')
+                            ->where(['is_del' => 0, 'spuCode' => $platform['spuCode']])
+                            ->findOrEmpty();
+                        if ($good_info) {
+                            $push_data = json_encode([
+                                'supplierNo' => $good_info['supplierNo'],
+                                'type' => 2,//1销售订单(采销的采购单),2上线结果
+                                'data' => [
+                                    'spuCode' => $platform['spuCode'],
+                                    'skuCode' => $platform['skuCode'],
+                                    'good_name' => $good_info['good_name'],
+                                    'platform_id' => $platform['platform_code'],
+                                    'platform_name' => Db::name('platform')->where(['id' => $platform['platform_code']])->value('platform_name', ''),
+                                    'plat_code' => $platform['plat_code'],
+                                    'online_time' => $platform['online_time'],
+                                ],
+                            ], JSON_UNESCAPED_UNICODE);
+                            Cache::store("redis")->handler()->lPush(Config::get('app.abutment_queue'), $push_data);
+                        }
+                    }
+
                     Db::commit();
                     return app_show(0,"审核成功");
                 }else{

app/admin/controller/Resign.php

@@ -8,6 +8,8 @@ namespace app\admin\controller;
 use app\admin\model\ActionLog;
 use app\admin\model\GoodLog;
 use app\admin\model\ProcessOrder;
+use think\facade\Cache;
+use think\facade\Config;
 use think\facade\Db;
 use think\App;
 
@@ -697,6 +699,24 @@ class Resign extends Base
                         ProcessOrder::AddProcess($this->post['token'],$order);
                         $ste = ["order_code"=>$inw,"status"=>$data['status'],"action_remark"=>'',"action_type"=>"create"];
                         ActionLog::logAdd($this->post['token'],$ste,"CGD",$data['status'],$data);
+
+                        //将采购单数据塞入到队列中
+                        $push_data = json_encode([
+                            'supplierNo' => $data['supplierNo'],
+                            'type' => 1,//1销售订单(采销的采购单),2上线结果
+                            'data' => [
+                                'cgdNo' => $data['cgdNo'],
+                                'spuCode' => $feed['spuCode'],
+                                'good_name' => $data['good_name'],
+                                'good_num' => $data['good_num'],
+                                'good_price' => $data['good_price'],
+                                'total_fee' => $data['total_fee'],
+                                'weight' => $data['weight'],
+                                'addtime' => $data['addtime'],
+                            ],
+                        ], JSON_UNESCAPED_UNICODE);
+                        Cache::store("redis")->handler()->lPush(Config::get('app.abutment_queue'), $push_data);
+
                         Db::commit();
                         return app_show(0,"更新成功",['cgdNo'=>$inw]);
                     }
@@ -930,6 +950,23 @@ class Resign extends Base
                                 'updatetime' => date('Y-m-d H:i:s'),
                             ]);
 
+                            //将采购单数据塞入到队列中
+                            $push_data = json_encode([
+                                'supplierNo' => $cg['supplierNo'],
+                                'type' => 1,//1销售订单(采销的采购单),2上线结果
+                                'data' => [
+                                    'cgdNo' => $cg['cgdNo'],
+                                    'spuCode' => $cg['spuCode'],
+                                    'good_name' => $cg['good_name'],
+                                    'good_num' => $cg['good_num'],
+                                    'good_price' => $cg['good_price'],
+                                    'total_fee' => $cg['total_fee'],
+                                    'weight' => $cg['weight'],
+                                    'addtime' => $cg['addtime'],
+                                ],
+                            ], JSON_UNESCAPED_UNICODE);
+                            Cache::store("redis")->handler()->lPush(Config::get('app.abutment_queue'), $push_data);
+
                             Db::commit();
                             return app_show(0, "采购单新建成功", ["cgdNo" => $cgdCode]);
                         }

app/admin/controller/Sale.php

@@ -461,7 +461,7 @@ class Sale extends Base
                 Db::name('standing_book')->insert(array_merge($standing_book_da, ['addtime' => date('Y-m-d H:i:s'), 'updatetime' => date('Y-m-d H:i:s'), 'standBookNo' => makeNo('IO')]));
 
                 Db::commit();
-                return error_show(0, "咨询订单创建成功", ["order_code" => $orderCode]);
+                return app_show(0, "咨询订单创建成功", ["order_code" => $orderCode]);
             }
             Db::rollback();
             return error_show(1002, "咨询订单创建失败");

app/admin/controller/Salezx.php

@@ -5,10 +5,13 @@ namespace app\admin\controller;
 use app\admin\model\GoodLog;
 use app\admin\model\ProcessOrder;
 use think\App;
+use think\facade\Cache;
+use think\facade\Config;
 use think\facade\Db;
 use app\admin\model\ActionLog;
 class Salezx extends \app\BaseController
 {
+    private $cgd_data = [];//存储采购单的数据，目前是为了做供应商api推送而准备的
     public $post="";
     public function __construct(App $app)
     {
@@ -255,6 +258,25 @@ class Salezx extends \app\BaseController
                 if (empty($infoNo)) Db::name('standing_book')->insert(array_merge($standing_bood_data, ['addtime' => date('Y-m-d H:i:s'), 'standBookNo' => makeNo("IO")]));
                 else Db::name('standing_book')->where('infoNo', $infoNo)->update($standing_bood_data);
 
+                //将采购单数据塞入到队列中
+                if ($this->cgd_data) {
+                    $push_data = json_encode([
+                        'supplierNo' => $this->cgd_data['supplierNo'],
+                        'type' => 1,//1销售订单(采销的采购单),2上线结果
+                        'data' => [
+                            'cgdNo' => $this->cgd_data['cgdNo'],
+                            'spuCode' => $this->cgd_data['spuCode'],
+                            'good_name' => $this->cgd_data['good_name'],
+                            'good_num' => $this->cgd_data['good_num'],
+                            'good_price' => $this->cgd_data['good_price'],
+                            'total_fee' => $this->cgd_data['total_fee'],
+                            'weight' => $this->cgd_data['weight'],
+                            'addtime' => $this->cgd_data['addtime'],
+                        ],
+                    ], JSON_UNESCAPED_UNICODE);
+                    Cache::store("redis")->handler()->lPush(Config::get('app.abutment_queue'), $push_data);
+                }
+
                     Db::commit();
                     return error_show(0,"咨询订单创建成功");
             }
@@ -356,6 +378,8 @@ class Salezx extends \app\BaseController
 
                         $standing_bood_data['cgdNo']=$cgdCode;
 
+                        $this->cgd_data = $cg;
+
                         return true;
                     }else{
                         return false;

app/command/ImportOrderFromCHandleData.php

@@ -15,11 +15,15 @@ use think\console\input\Option;
 use think\console\Output;
 use think\Exception;
 use think\facade\Cache;
+use think\facade\Config;
 use think\facade\Db;
 
 //C端订单导入-处理
 class ImportOrderFromCHandleData extends Command
 {
+
+    private $cgd_data = [];//存储采购单的数据，目前是为了做供应商api推送而准备的
+
     protected function configure()
     {
         // 指令配置
@@ -201,7 +205,7 @@ class ImportOrderFromCHandleData extends Command
                         'gold_price' => $ct['cgd_gold_price'],
                         'good_createrid' => $goodinfo['createrid'],
                         'good_creater' => $goodinfo['creater'],//商品创建人
-                        'weight'=>$ct['weight']
+                        'weight' => $ct['weight']
                     ];
 
                     $send_num = $extend_data['num'];
@@ -211,7 +215,7 @@ class ImportOrderFromCHandleData extends Command
 
                     $supplier_temp_info = Db::name('supplier')
                         ->field('id,person,personid')
-                        ->where('code',$ct['supplierNo'])
+                        ->where('code', $ct['supplierNo'])
                         ->findOrEmpty();
 
                     $data = [
@@ -293,7 +297,7 @@ class ImportOrderFromCHandleData extends Command
 
                         } else {
                             //库存品
-                            $bol = $this->RelaCgd(['orderCode' => $orderCode, "good_num" => $good_num, "spuCode" => $spuCode, "companyNo" => $supplierNo, 'order_type' => $order_type, 'order_source' => $order_source,'good_createrid'=>$ct['createrid'],'good_creater'=>$ct['creater']], $standing_book_data);
+                            $bol = $this->RelaCgd(['orderCode' => $orderCode, "good_num" => $good_num, "spuCode" => $spuCode, "companyNo" => $supplierNo, 'order_type' => $order_type, 'order_source' => $order_source, 'good_createrid' => $ct['createrid'], 'good_creater' => $ct['creater']], $standing_book_data);
                             if ($bol == false) throw new Exception('库存商品关联采购单失败');
 
                             if (isset($stock)) {
@@ -422,6 +426,25 @@ class ImportOrderFromCHandleData extends Command
                     //维护台账记录
                     Db::name('standing_book')->insert(array_merge($standing_book_data, ['addtime' => date('Y-m-d H:i:s'), 'updatetime' => date('Y-m-d H:i:s'), 'standBookNo' => makeNo("IO")]));
 
+                    //将采购单数据塞入到队列中
+                    if ($this->cgd_data) {
+                        $push_data = json_encode([
+                            'supplierNo' => $this->cgd_data['supplierNo'],
+                            'type' => 1,//1销售订单(采销的采购单),2上线结果
+                            'data' => [
+                                'cgdNo' => $this->cgd_data['cgdNo'],
+                                'spuCode' => $this->cgd_data['spuCode'],
+                                'good_name' => $this->cgd_data['good_name'],
+                                'good_num' => $this->cgd_data['good_num'],
+                                'good_price' => $this->cgd_data['good_price'],
+                                'total_fee' => $this->cgd_data['total_fee'],
+                                'weight' => $this->cgd_data['weight'],
+                                'addtime' => $this->cgd_data['addtime'],
+                            ],
+                        ], JSON_UNESCAPED_UNICODE);
+                        Cache::store("redis")->handler()->lPush(Config::get('app.abutment_queue'), $push_data);
+                    }
+
                     Db::commit();
 
                     $output->writeln(date('Y-m-d H:i:s') . '|处理成功');
@@ -502,7 +525,7 @@ class ImportOrderFromCHandleData extends Command
             "demo_fee" => $data['demo_fee'],
             "nake_fee" => $data['nake_fee'],
             "delivery_fee" => $data['delivery_fee'],
-            "weight"=>$data['weight'],
+            "weight" => $data['weight'],
             "diff_weight" => "0",
             "diff_fee" => "0",
             "gold_price" => $data['gold_price'],
@@ -586,6 +609,8 @@ class ImportOrderFromCHandleData extends Command
                 $good_data[] = ['good_log_code' => $cgdCode, "stock_id" => isset($stoc['id']) ? $stoc['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $data['good_num'], "stock_name" => "wait_in_stock"];
                 GoodLog::LogAdd(['id' => 0, 'nickname' => 'system'], $good_data, "CGD");
 
+                $this->cgd_data = $cg;
+
                 return true;
             }
         } else return false;
@@ -689,6 +714,7 @@ class ImportOrderFromCHandleData extends Command
         $order = Db::name("order_num")->save($data);
         if ($order == false) return false;
 
+        $this->cgd_data = $QrdCgd;
         return true;
     }
 

app/command/handleYzOrderData.php

@@ -16,6 +16,8 @@ use think\facade\Db;
 //处理有赞订单数据
 class handleYzOrderData extends Command
 {
+    private $cgd_data = [];//存储采购单的数据，目前是为了做供应商api推送而准备的
+
     protected function configure()
     {
         // 指令配置
@@ -237,7 +239,7 @@ class handleYzOrderData extends Command
 
                 $supplier_temp_info = Db::name('supplier')
                     ->field('id,person,personid')
-                    ->where('code',$ct['supplierNo'])
+                    ->where('code', $ct['supplierNo'])
                     ->findOrEmpty();
 
                 $data = [
@@ -503,6 +505,25 @@ class handleYzOrderData extends Command
                 $callback_rs = $this->callbackYz(['status' => 6, 'id' => $c_data['id'], 'orderCode' => $orderCode]);
                 if ($callback_rs['code'] != 0) throw new Exception($callback_rs['message']);
 
+                //将采购单数据塞入到队列中
+                if ($this->cgd_data) {
+                    $push_data = json_encode([
+                        'supplierNo' => $this->cgd_data['supplierNo'],
+                        'type' => 1,//1销售订单(采销的采购单),2上线结果
+                        'data' => [
+                            'cgdNo' => $this->cgd_data['cgdNo'],
+                            'spuCode' => $this->cgd_data['spuCode'],
+                            'good_name' => $this->cgd_data['good_name'],
+                            'good_num' => $this->cgd_data['good_num'],
+                            'good_price' => $this->cgd_data['good_price'],
+                            'total_fee' => $this->cgd_data['total_fee'],
+                            'weight' => $this->cgd_data['weight'],
+                            'addtime' => $this->cgd_data['addtime'],
+                        ],
+                    ], JSON_UNESCAPED_UNICODE);
+                    Cache::store("redis")->handler()->lPush(Config::get('app.abutment_queue'), $push_data);
+                }
+
                 Db::commit();
 
                 $output->writeln(date('Y-m-d H:i:s') . '|处理成功,orderCode:' . $orderCode);
@@ -665,6 +686,8 @@ class handleYzOrderData extends Command
                 $good_data[] = ['good_log_code' => $cgdCode, "stock_id" => isset($stoc['id']) ? $stoc['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $data['good_num'], "stock_name" => "wait_in_stock"];
                 GoodLog::LogAdd(['id' => 0, 'nickname' => 'system'], $good_data, "CGD");
 
+                $this->cgd_data = $cg;
+
                 return true;
             }
         } else return false;
@@ -766,6 +789,8 @@ class handleYzOrderData extends Command
         $order = Db::name("order_num")->save($data);
         if ($order == false) return false;
 
+        $this->cgd_data = $QrdCgd;
+
         return true;
     }
 

app/youzan/logic/Goodup.php

@@ -180,7 +180,7 @@ class Goodup
                         $value['id'] = $iso['id'];
                         $value['updatetime'] = date("Y-m-d H:i:s");
                     }
-                    $up = Db::name("good")->save($value);
+                    $up = Db::name("good")->strict(false)->save($value);
                     if (!$up) {
                         Db::rollback();
                         return error_show(1004, "提交失败");
@@ -255,7 +255,7 @@ class Goodup
                     ->where('id', $data['good_ladder_id'])
                     ->findOrEmpty();
 
-                $post_fee = isset($nake_info['delivery_fee'])?$nake_info['delivery_fee']:0;
+                $post_fee = isset($nake_info['delivery_fee']) ? $nake_info['delivery_fee'] : 0;
 
 
                 $desc = explode(',', $rs->good_info_img);
@@ -275,7 +275,7 @@ class Goodup
                     'yz_cat_id' => $data['yz_cat_id'],
                     'is_support_barter' => $data['is_support_barter'],
                     'sale_price' => $sale_price,
-                    'cost_fee' => $nake_info['cost_fee']??0,
+                    'cost_fee' => $nake_info['cost_fee'] ?? 0,
                     'final_price' => $data['final_price'],
                     'start_sale_num' => $data['start_sale_num'],
                     'reject_reason' => '',