0811-1454-h01

app/controller/api/Msg.php

@@ -44,7 +44,7 @@ class Msg extends Base
                 } else {
                     return 'friend';
                 }
-            }])->order("id","asc")->paginate([
+            }])->order("create_at","desc")->paginate([
                 "list_rows" => 10,
                 "page"      => 1
             ]);
@@ -88,11 +88,11 @@ class Msg extends Base
                 } else {
                     return 'friend';
                 }
-            }])->order("id","asc")->paginate([
+            }])->order("create_at","desc")->paginate([
                 "list_rows" => $param['size']??10,
-                "page"      => $param['page']??1,
+                "page"      => $param['page']??2,
             ]);
-            return $this->encode("ok",pageFormat($msg));
+            return $this->encode("ok",pageFormatMsg($msg));
         } catch (\Throwable $throwable) {
             return error($throwable->getMessage());
         }

app/controller/api/Solution.php

@@ -42,8 +42,8 @@ class Solution extends Base
     {
         try {
             $data = $request->all();
-//            echo getDateFull()."===扩展回调\n";
-//            print_r($data);
+            echo getDateFull()."===扩展回调\n";
+            print_r($data);
             if (isset($data['operate_type'])) {
                 if ($data['status'] == "PASS") { // 创建商品回调
                     $goods = (new SaasGoods)->where("goods_id",$data['product_id'])->findOrEmpty();

app/controller/notify/Life.php

@@ -63,8 +63,8 @@ class Life extends Base
     {
         try {
             $data = $request->all();
-//            echo getDateFull()."===自研应用回调WebHook===\n";
-//            print_r($data);
+            echo getDateFull()."===自研应用回调WebHook===\n";
+            print_r($data);
             if (isset($data['event']) && $data['event'] == "verify_webhook") {
                 return json(['challenge' => $data['content']['challenge']]);
             }

app/queue/redis/slow/ExportOrder.php

@@ -47,7 +47,7 @@ class ExportOrder implements Consumer
         try {
             if(empty($data['logId'])) return true;
             $spreadsheet = new Spreadsheet();
-            $title = ['店铺名称','下单人昵称','订单编号','订单状态','发货状态', '收件人', '手机号码', '收货地址', '创建时间'];
+            $title = ['店铺名称','下单人昵称','订单编号','订单状态','发货状态', '收件人', '手机号码', '收货地址','商品ID','商品标题', '创建时间'];
             $sheet = $spreadsheet->getActiveSheet();
             $titCol = 'A';
             foreach ($title as $key => $value) {
@@ -57,7 +57,7 @@ class ExportOrder implements Consumer
             }
             $row = 2; // 从第二行开始
             $searchKey = (new OrderService)->searchFilter($data['param']);
-            $orderData = (new SaasOrder)->where($searchKey)->with(['address','poi','user'])->select();
+            $orderData = (new SaasOrder)->where($searchKey)->with(['address','poi','user','product'])->select();
             if ($orderData->isEmpty()) {
                 (new SystemExport)->where("id",$data['logId'])->update(['status' => 2]);
                 return true;
@@ -77,6 +77,8 @@ class ExportOrder implements Consumer
                     "user"      => $item['address']['nickname']??'-',
                     "mobile"    => $item['address']['mobile']??'-',
                     "address"   => $address,
+                    "goods_id"  => $item['product']['goods_id']??'-',
+                    "goods_name" => $item['product']['product_name']??'-',
                     "create_at" => $item['create_at'],
                 ];
                 foreach ($newData as $value) {

app/queue/redis/slow/ImportOrder.php

@@ -45,6 +45,7 @@ class ImportOrder implements Consumer
                 }
             }
             if (!empty($excelData)) {
+                $successData = $errData = [];
                 foreach (array_values(array_filter($excelData)) as $key=>$val) {
                     if (!empty(trim($val['C'])) && !empty(trim($val['A']))) {
                         $order = $orderMode->where("order_sn",trim($val['A']))->findOrEmpty();
@@ -83,6 +84,9 @@ class ImportOrder implements Consumer
                                 "express_name"  => $val['D']?trim($val['D']):'',
                                 "last_at"       => getDateFull()
                             ];
+                            $successData[$key] = trim($val['A']);
+                        } else {
+                            $errData[$key] = trim($val['A']);
                         }
                     }
                 }
@@ -90,7 +94,14 @@ class ImportOrder implements Consumer
             if (!empty($expressData)) {
                 (new SaasOrderExpress)->insertAll(array_values($expressData));
             }
-            (new SystemImport)->where("id",$data['logId'])->update(['status' => 1,"last_at" => getDateFull()]);
+            (new SystemImport)->where("id",$data['logId'])->update([
+                'status'        => 1,
+                "last_at"       => getDateFull(),
+                'success_num'   => (!empty($successData)) ? count(array_values($successData)) : 0,
+                'success_data'  => (!empty($successData)) ? json_encode(array_values($successData)) : "",
+                'error_num'     => (!empty($errData)) ? count(array_values($errData)) : 0,
+                'error_data'    => (!empty($errData)) ? json_encode(array_values($errData)) : '',
+            ]);
             return true;
         } catch (\Throwable $throwable) {
             echo getDateFull()."==导入订单报错===\n";