细节优化

app/admin/controller/After.php

@@ -500,7 +500,7 @@ class After extends Base
                     if (in_array($param['status'], [6, 9]) == false) throw new Exception('选项错误');
                     break;
                 case 9:
-                    if (in_array($param['status'], [2, 4]) == false) throw new Exception('选项错误');
+                    if (in_array($param['status'], [2, 4, 5]) == false) throw new Exception('选项错误');
 //                    if ($this->level != 3) throw new Exception('当前状态下只能由供应商账号操作');
                     if ($param['status'] == 4) {
                         if ($param['contactor'] == '') throw new Exception('收货人不能为空');
@@ -510,7 +510,7 @@ class After extends Base
                     }
                     break;
                 case 2:
-                    if (in_array($param['status'], [10, 4]) == false) throw new Exception('选项错误');
+                    if (in_array($param['status'], [10, 4, 5]) == false) throw new Exception('选项错误');
                     if ($param['status'] == 4) {
                         if ($param['wsm_code'] == '') throw new Exception('请填写退回仓库');
                         else {
@@ -525,7 +525,7 @@ class After extends Base
 
                     break;
                 case 10:
-                    if (in_array($param['status'], [2, 4]) == false) throw new Exception('选项错误');
+                    if (in_array($param['status'], [2, 4, 5]) == false) throw new Exception('选项错误');
                     if ($param['status'] == 4) {
                         if ($param['contactor'] == '') throw new Exception('收货人不能为空');
                         if ($param['mobile'] == '') throw new Exception('联系电话不能为空');
@@ -569,7 +569,7 @@ class After extends Base
                 $action_log_user = ['id' => $this->uid, 'nickname' => $this->uname];
 
                 //如果是小循环，增加次数
-                if ($info['status'] == 10 && $param['status'] == 2) $info['loop_total'] += 1;
+                if ($param['status'] == 10) $info['loop_total'] += 1;//只要走到节点10(业务公司修改，待供应商确认)，就增加次数
 
                 //判断 退回供应商 or 退回业务公司
                 if ($info['status'] == 9) {

app/admin/controller/Orderback.php

@@ -212,7 +212,7 @@ class Orderback extends Base
         }else {
             $goon = Db::name('good_platform')
                 ->alias('a')
-                ->leftJoin('good b', 'b.spuCode=a.spuCode', 'left')
+                ->leftJoin('good b', 'b.spuCode=a.spuCode')
                 ->where(['a.skuCode' => $orderinfo['skuCode']])
                 ->find();
             $is_stock=$goon['is_stock'];

app/admin/controller/Reorder.php

@@ -812,13 +812,14 @@ class Reorder extends Base
                 break;
             case 10:
                 if (in_array($param['status'], [4, 8]) == false) return json_show(1004, '选项错误');
-                if ($param['status'] == 8) $info['loop_total'] += 1;
                 break;
         }
 
         //当处于以下节点时，level2账号必须是供应商负责人操作，level3账号不做限制
         if(in_array($info['status'],[9,10]) && ($this->level==2) && ($this->uid!=$info['person_id'])) return json_show(1004,'您不是供应商负责人，此时无权操作');
 
+        if ($param['status'] == 10) $info['loop_total'] += 1;//只要走到节点10(业务公司修改，待供应商确认)，就增加次数
+
 //        $status =  isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
 //        if($status===""){
 //            return error_show(1004,"参数status不能为空");

app/command/HandleDataScreen.php

@@ -10,6 +10,8 @@ use think\facade\Cache;
 class HandleDataScreen extends Command
 {
 
+    private $redis_hash_key = 'data_screen_wsm';
+
     protected function configure()
     {
         $this->setName('handle_data_screen')
@@ -31,11 +33,14 @@ class HandleDataScreen extends Command
 //            'ccc'=>['item'=>9999]
 //        ];
 
+        $redis = Cache::store('redis')->handler();
 
-        $rs = Cache::store('redis')->handler()->hmset($key,['name'=>'张三','age'=>23]);
+        $rs = $redis->hmset($key,['name'=>'张三','age'=>23]);
 
+        $a = $redis->hget($key,'name');
+        $all = $redis->hgetall($key);
 
-        halt($rs);
+        halt($rs,$a,$all);
 
 
     }