0731-1840-c01

app/controller/api/Solution.php

@@ -3,6 +3,7 @@
 namespace app\controller\api;
 
 use app\extra\basic\Base;
+use app\extra\dyLife\data\OrderData;
 use app\extra\dyLife\Token;
 use app\extra\dyMini\Relation;
 use app\extra\tools\CodeExtend;
@@ -166,16 +167,28 @@ class Solution extends Base
     {
         try {
 //            $data = (new Relation)->config($this->getDyConfig())->token()->createOrderFirst(['1865253598118939']);
-            $data = (new SaasOrderVerify)->where("status",0)->with(['orders'])->select();
+            $data = (new SaasOrder)->where('status',2)->whereNull("douyin_uid")->select();
+//            $data = (new SaasOrderVerify)->where("status",0)->with(['orders'])->select();
             if ($data->isEmpty()) return error("err");
-            $upData = array_map(function ($val) {
-                return [
-                    "id" => $val['id'],
-                    "money" => $val['orders']['price'] / $val['orders']['number']
-                ];
-            }, $data->toArray());
-            (new SaasOrderVerify)->saveAll($upData);
-            return success("ok",$upData);
+            $upData = [];
+            foreach ($data as $key=>$item) {
+                // 查询订单详情
+                $orderData = (new OrderData)->config([
+                    "appid"     => sConf("wechat.appid"),
+                    "secret"    => sConf("wechat.secret"),
+                    "account"   => sConf("wechat.shop_id"),
+                ])->token()->getOrderData($item['order_sn']);
+                if (isset($orderData['orders'][0]['anchor_id'])) {
+                    $upData[$key] = [
+                        "douyin_uid"    => $orderData['orders'][0]['anchor_id'],
+                        "id"            => $item['id']
+                    ];
+                }
+            }
+            if (!empty($upData)) {
+                (new SaasOrder)->saveAll(array_values($upData));
+            }
+            return success("ok",array_values($upData));
         } catch (\Throwable $throwable) {
             return error($throwable->getMessage());
         }

app/controller/merchant/Star.php

@@ -91,7 +91,7 @@ class Star extends Base
             if (!is_array($param)) return error($param);
             $data = $this->model->where("id",$param["id"])->findOrEmpty();
             if ($data->isEmpty()) return errorTrans("empty.data");
-            if ($data['poi_id'] <> $request->user['store_id']) return errorTrans("empty.data");
+            if ($data['poi_id'] <> $request->user['store_id'] && $request->user['is_super'] == 0) return errorTrans("empty.data");
             [$state,$starData] = $this->getStarForLife($data['unique_id']);
             if (!$state) return error($starData);
             $state = $data->save([

app/controller/merchant/Tasks.php

@@ -78,7 +78,7 @@ class Tasks extends Base
                 "poi_id"    => $request->user['store_id'],
                 "path"      => $resp[0]['url'],
             ]);
-            return success("导入成功，请耐心等待系统完成，",[],200);
+            return success("导入成功，请耐心等待系统完成，可在【发货记录】中查看状态",[],200);
         } catch (\Throwable $throwable) {
             return error($throwable->getMessage());
         }

app/queue/redis/slow/ImportOrder.php

@@ -42,6 +42,7 @@ class ImportOrder implements Consumer
                     $excelData[$rowIndex] = $row;
                 }
             }
+            print_r($excelData);
             if (!empty($excelData)) {
                 foreach (array_values(array_filter($excelData)) as $key=>$val) {
                     $order = $orderMode->where("order_sn",trim($val['A']))->findOrEmpty();