0807-0114-h01

app/controller/api/Service.php

@@ -53,7 +53,7 @@ class Service extends Base
                 }
                 return ["content"=> str_cut_ellipsis($last['content'],12),'num' => 0,"create_at"=> formatTime($last['create_at']),'type' => $last['type']];
             },'avatar' => function(){
-                return "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png";
+                return sConf("service.logo");
             }]);
             return successTrans("success.data",pageFormat($list));
         } catch (\Throwable $throwable) {
@@ -80,7 +80,7 @@ class Service extends Base
                 if ($resp['source'] == 1) { // 用户
                     return $userAvatar??'';
                 } else {
-                    return "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png";
+                    return sConf("service.logo");
                 }
             },'time' => function($resp,$data){
                 return strtotime($data['create_at']) * 1000;
@@ -134,7 +134,7 @@ class Service extends Base
                 if ($resp['source'] == 1) {
                     return $userAvatar??'';
                 } else {
-                    return "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png";
+                    return sConf("service.logo");
                 }
             },'time' => function($resp,$data){
                 return strtotime($data['create_at']) * 1000;
@@ -183,7 +183,7 @@ class Service extends Base
                 $total = (new SaasChatMsg)->where(["poi_id" => $resp['poi_id'],"service_id" => $param['sendId'],"openid" => $resp['openid'],'is_read' => 0])->count();
                 return ["content"=> str_cut_ellipsis($last['content']),'num' => ($total),"create_at"=> formatTime($last['create_at']),"time"=> strtotime($last['create_at']),'type' => $last['type']];
             },'avatar' => function(){
-                return "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png";
+                return sConf("service.logo");
             }])->findOrEmpty();
             if (!$chatStore->isEmpty())
             {
@@ -197,7 +197,7 @@ class Service extends Base
                 "msgId" => time(),
                 "content"   => is_array($param['content'])?json_encode($param['content']):$param['content'],
                 "source" => 1,
-                "avatar"    => "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png",
+                "avatar"    => sConf("service.logo"),
                 "poi_id"    => $param['groupId'],
                 "openid"  => $request->user['openid'],
                 "service_id"  => $param['sendId'],
@@ -250,7 +250,7 @@ class Service extends Base
                 "msgId" => time(),
                 "content"   => is_array($param['content'])?json_encode($param['content']):$param['content'],
                 "source" => 1,
-                "avatar"    => "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png",
+                "avatar"    => sConf("service.logo"),
                 "poi_id"    => $param['groupId'],
                 "openid"  => $request->user['openid'],
                 "service_id"  => $param['sendId'],

app/controller/api/User.php

@@ -27,7 +27,7 @@ class User extends Base
         try {
             $data = $this->model->where("openid",$request->user['openid'])->field("openid,nickname,avatar")->findOrEmpty();
             if ($data->isEmpty()) return errorTrans("error.data");
-            if (empty($data['avatar'])) $data['avatar'] = "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png";
+            if (empty($data['avatar'])) $data['avatar'] = sConf("service.logo");
             return success("ok",$data->toArray());
         } catch (\Throwable $th) {
             return error($th->getMessage());

app/controller/service/Service.php

@@ -57,7 +57,7 @@ class Service extends Base
                 $total = (new SaasChatMsg)->where(["poi_id" => $resp['poi_id'],"service_id" => $param['service_id'],"openid" => $resp['openid'],'is_read' => 0])->count();
                 return ["content"=> str_cut_ellipsis($last['content'],12),'num' => $total,"create_at"=> formatTime($last['create_at']),"time"=> strtotime($last['create_at']),'type' => $last['type']];
             },'avatar' => function(){
-                return "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png";
+                return sConf("service.logo");
             }]);
             return successTrans(100010,pageFormat($data),200);
         } catch (\Throwable $th) {
@@ -71,7 +71,7 @@ class Service extends Base
         try {
             $param = $request->all();
             $msg = (new SaasChatMsg)->where(['openid' => $param['openid'],'poi_id' => $request->user['store_id']])->append(['avatar','time'])->withAttr(['avatar' => function(){
-                return "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png";
+                return sConf("service.logo");
             },'time' => function($resp,$data){
                 return strtotime($data['create_at']) * 1000;
             }])->with(['nick' => function ($query) {
@@ -147,7 +147,7 @@ class Service extends Base
                 "msgId" => md5($param['openid'].time()),
                 "content"   => is_array($param['content'])?json_encode($param['content']):$param['content'],
                 "source" => 2,
-                "avatar"    => "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png",
+                "avatar"    => sConf("service.logo"),
                 "poi_id"    => $param['groupId'],
                 "openid"  => $param['openid'],
                 "service_id"  => $request->user['id'],
@@ -210,7 +210,7 @@ class Service extends Base
                 "msgId" => $msgId,
                 "content"   => json_encode($msgData),
                 "source" => 2,
-                "avatar"    => "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png",
+                "avatar"    => sConf("service.logo"),
                 "poi_id"    => $param['groupId'],
                 "openid"  => $param['openid'],
                 "service_id"  => $request->user['id'],

app/queue/redis/slow/ImportOrder.php

@@ -2,9 +2,11 @@
 
 namespace app\queue\redis\slow;
 
+use app\model\saas\SaasChatMsg;
 use app\model\saas\SaasOrder;
 use app\model\saas\SaasOrderExpress;
 use app\model\system\SystemImport;
+use app\model\system\SystemUser;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use Webman\RedisQueue\Consumer;
 
@@ -53,10 +55,32 @@ class ImportOrder implements Consumer
                     $order->save();
                     $express = (new SaasOrderExpress)->where("express_sn",trim($val['C']))->findOrEmpty();
                     if ($express->isEmpty()) {
+                        // 发送一条发货消息给用户
+                        $lastMsg = (new SaasChatMsg)->where(['openid' => $order['openid'],'poi_id' => $order['poi_id']])->order("id desc")->findOrEmpty();
+                        if ($lastMsg->isEmpty()) {
+                            $serviceUser = (new SystemUser)->where(['store_id' => $order['poi_id'],"type" => 3])->order("last_msg_at","asc")->findOrEmpty();
+                            $lastServiceId = $serviceUser['id'];
+                        } else {
+                            $lastServiceId = $lastMsg['service_id'];
+                        }
+                        $expressName = "";
+                        if (isset($val['D'])) {
+                            $expressName = "({$val['D']})";
+                        }
+                        (new SaasChatMsg)->insertGetId([
+                            'openid' => $order['openid'],
+                            'poi_id' => $order['poi_id'],
+                            "source"    => 2,
+                            "service_id" => $lastServiceId,
+                            "msgId"     => md5($order['openid'].time()),
+                            "content"   => "您的订单({$val['A']})已发货，快递单号：{$val['C']} {$expressName}",
+                            "type"      => "text"
+                        ]);
                         $expressData[$key] = [
                             "order_sn"      => trim($val['A']),
                             "express_sn"    => trim($val['C']),
                             "mobile"        => trim($val['B']),
+                            "express_name"  => $val['D']?trim($val['D']):'',
                             "last_at"       => getDateFull()
                         ];
                     }