1

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Expedite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Expedite.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Mall.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Mall.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/runtime/log/single.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/runtime/log/single_sql.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single_sql.log" afterDir="false" />
@@ -481,6 +482,7 @@
       <workItem from="1700440204810" duration="14773000" />
       <workItem from="1700526499424" duration="11662000" />
       <workItem from="1700613253175" duration="10732000" />
+      <workItem from="1700699350870" duration="621000" />
     </task>
     <servers />
   </component>

application/api/controller/Expedite.php

@@ -1209,7 +1209,8 @@ class Expedite extends Base
         $trolley_num = ShoppingTrolley::where(['user_id'=>$this->user_id])->sum('num');
         $no_pay_num = GoodsOrder::where(['user_id'=>$this->user_id,'is_deleted'=>0,'pay_state'=>0,'cancel_state'=>0])->count();
         $no_express_num = GoodsOrder::where(['user_id'=>$this->user_id,'is_deleted'=>0,'pay_state'=>1,'express_state'=>0,'cancel_state'=>0])
-            ->where('refund_state','in','0,1,2')
+            ->where('status',1)
+            ->where('refund_state','in','0')
             ->count();
         $express_num = GoodsOrder::where(['user_id'=>$this->user_id,'is_deleted'=>0,'pay_state'=>1,'express_state'=>1,'cancel_state'=>0])
             ->where('refund_state','in','0,1,2')

application/api/controller/Mall.php

@@ -417,6 +417,7 @@ class Mall extends Base
             ->where('status',1)
             ->count();
         $express_num = GoodsOrder::where(['user_id'=>$this->user_id,'is_deleted'=>0,'pay_state'=>1,'express_state'=>1,'cancel_state'=>0])
+            ->where('status',1)
             ->where('refund_state','in','0')
             ->count();
 //        $finish_num = GoodsOrder::where(['user_id'=>$this->user_id,'is_deleted'=>0,'pay_state'=>1,'express_state'=>2,'cancel_state'=>0])

runtime/log/single.log

@@ -43171,3 +43171,51 @@
 [ info ] [ PARAM ] array (
 )
 [ info ] [ DB ] INIT mysql
+---------------------------------------------------------------
+
+[2023-11-23T08:36:41+08:00] 127.0.0.1 POST gaoyx.com/api/Mall/getMarkNum
+[运行时间：1.864540s] [吞吐率：0.54req/s] [内存消耗：5,829.30kb] [文件加载：161]
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\vendor\zoujingli\think-library\src/lang/zh-cn.php
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\vendor\zoujingli\think-library\src/lang/en-us.php
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\thinkphp\lang\zh-cn.php
+[ info ] [ ROUTE ] array (
+)
+[ info ] [ HEADER ] array (
+  'content-length' => '0',
+  'host' => 'gaoyx.com',
+  'connection' => 'keep-alive',
+  'accept-encoding' => 'gzip, deflate, br',
+  'accept' => '*/*',
+  'authorization' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOjg4LCJpc3MiOiJodHRwczpcL1wvemFpbi5jb20iLCJhdWQiOiJodHRwczpcL1wvemFpbi5jb20iLCJpYXQiOjE3MDA2NDMyODksIm5iZiI6MTcwMDY0MzI4OSwiZXhwIjoxNzAyMDgzMjg5LCJmYWNpbGl0eV9jb2RlIjoiZG1sMmIxWXlNVEU0UVRNeE1UST0iLCJsb2dpbl90eXBlIjoiMSJ9.W8EjEeCIBLqrVpkttVTnKJdMkf4iXGEqBPKUtEtywo0',
+  'cache-control' => 'no-cache',
+  'user-agent' => 'PostmanRuntime-ApipostRuntime/1.1.0',
+  'content-type' => '',
+)
+[ info ] [ PARAM ] array (
+)
+[ info ] [ DB ] INIT mysql
+---------------------------------------------------------------
+
+[2023-11-23T08:37:04+08:00] 127.0.0.1 POST gaoyx.com/api/Order/getOrderList?status=1&apply_refund=0
+[运行时间：3.121810s] [吞吐率：0.32req/s] [内存消耗：6,573.77kb] [文件加载：174]
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\vendor\zoujingli\think-library\src/lang/zh-cn.php
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\vendor\zoujingli\think-library\src/lang/en-us.php
+[ info ] [ LANG ] D:\project\gyx\gaoyixia\thinkphp\lang\zh-cn.php
+[ info ] [ ROUTE ] array (
+)
+[ info ] [ HEADER ] array (
+  'content-length' => '274',
+  'content-type' => 'multipart/form-data; boundary=--------------------------911783090373641294571125',
+  'host' => 'gaoyx.com',
+  'connection' => 'keep-alive',
+  'accept-encoding' => 'gzip, deflate, br',
+  'accept' => '*/*',
+  'authorization' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOjg4LCJpc3MiOiJodHRwczpcL1wvemFpbi5jb20iLCJhdWQiOiJodHRwczpcL1wvemFpbi5jb20iLCJpYXQiOjE3MDA2NDMyODksIm5iZiI6MTcwMDY0MzI4OSwiZXhwIjoxNzAyMDgzMjg5LCJmYWNpbGl0eV9jb2RlIjoiZG1sMmIxWXlNVEU0UVRNeE1UST0iLCJsb2dpbl90eXBlIjoiMSJ9.W8EjEeCIBLqrVpkttVTnKJdMkf4iXGEqBPKUtEtywo0',
+  'cache-control' => 'no-cache',
+  'user-agent' => 'PostmanRuntime-ApipostRuntime/1.1.0',
+)
+[ info ] [ PARAM ] array (
+  'status' => '1',
+  'apply_refund' => '0',
+)
+[ info ] [ DB ] INIT mysql

runtime/log/single_sql.log

@@ -12538,3 +12538,44 @@
 [ sql ] [ SQL ] SELECT COUNT(*) AS tp_count FROM `dd_store_order` WHERE  `user_id` = 88  AND `is_deleted` = 0  AND `pay_state` = 1  AND `express_state` = 0  AND `cancel_state` = 0  AND `refund_state` IN (0,1,2)  AND `status` = 1 [ RunTime:0.122183s ]
 [ sql ] [ SQL ] SELECT COUNT(*) AS tp_count FROM `dd_store_order` WHERE  `user_id` = 88  AND `is_deleted` = 0  AND `pay_state` = 1  AND `express_state` = 1  AND `cancel_state` = 0  AND `refund_state` = 0 [ RunTime:0.118793s ]
 [ sql ] [ SQL ] SELECT COUNT(*) AS tp_count FROM `dd_store_order` WHERE  `user_id` = 88  AND `is_deleted` = 0  AND `pay_state` = 1  AND `cancel_state` = 0  AND `refund_state` IN (1,2,3) [ RunTime:0.119147s ]
+---------------------------------------------------------------
+
+[2023-11-23T08:36:41+08:00] 127.0.0.1 POST gaoyx.com/api/Mall/getMarkNum
+[ sql ] [ DB ] CONNECT:[ UseTime:0.163716s ] mysql:host=120.79.86.50;port=3306;dbname=gaoyixia_hdlkeji;charset=utf8mb4
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_system_config` [ RunTime:0.106640s ]
+[ sql ] [ SQL ] SELECT `name`,`value` FROM `dd_system_config` [ RunTime:0.440579s ]
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_store_member` [ RunTime:0.105182s ]
+[ sql ] [ SQL ] SELECT * FROM `dd_store_member` WHERE  `id` = 88 LIMIT 1 [ RunTime:0.115402s ]
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_shopping_trolley` [ RunTime:0.102075s ]
+[ sql ] [ SQL ] SELECT SUM(`num`) AS tp_sum FROM `dd_shopping_trolley` WHERE  `user_id` = 88 [ RunTime:0.103279s ]
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_store_order` [ RunTime:0.102187s ]
+[ sql ] [ SQL ] SELECT COUNT(*) AS tp_count FROM `dd_store_order` WHERE  `user_id` = 88  AND `is_deleted` = 0  AND `pay_state` = 0  AND `cancel_state` = 0  AND `status` = 0 [ RunTime:0.104689s ]
+[ sql ] [ SQL ] SELECT COUNT(*) AS tp_count FROM `dd_store_order` WHERE  `user_id` = 88  AND `is_deleted` = 0  AND `pay_state` = 1  AND `express_state` = 0  AND `cancel_state` = 0  AND `refund_state` IN (0,1,2)  AND `status` = 1 [ RunTime:0.102266s ]
+[ sql ] [ SQL ] SELECT COUNT(*) AS tp_count FROM `dd_store_order` WHERE  `user_id` = 88  AND `is_deleted` = 0  AND `pay_state` = 1  AND `express_state` = 1  AND `cancel_state` = 0  AND `refund_state` = 0 [ RunTime:0.102064s ]
+[ sql ] [ SQL ] SELECT COUNT(*) AS tp_count FROM `dd_store_order` WHERE  `user_id` = 88  AND `is_deleted` = 0  AND `pay_state` = 1  AND `cancel_state` = 0  AND `refund_state` IN (1,2,3) [ RunTime:0.122955s ]
+---------------------------------------------------------------
+
+[2023-11-23T08:37:04+08:00] 127.0.0.1 POST gaoyx.com/api/Order/getOrderList?status=1&apply_refund=0
+[ sql ] [ DB ] CONNECT:[ UseTime:0.174170s ] mysql:host=120.79.86.50;port=3306;dbname=gaoyixia_hdlkeji;charset=utf8mb4
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_user_facility` [ RunTime:0.112948s ]
+[ sql ] [ SQL ] SELECT `id` FROM `dd_user_facility` WHERE  `user_id` = 88  AND `type` = 1  AND `facility` = 'dml2b1YyMTE4QTMxMTI=' LIMIT 1 [ RunTime:0.114920s ]
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_store_member` [ RunTime:0.121705s ]
+[ sql ] [ SQL ] SELECT * FROM `dd_store_member` WHERE  `id` = 88 LIMIT 1 [ RunTime:0.115531s ]
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_user_vitality` [ RunTime:0.119207s ]
+[ sql ] [ SQL ] INSERT INTO `dd_user_vitality` (`user_id` , `year` , `month` , `day` , `day_time` , `create_at` , `type`) VALUES (88 , '2023' , '11' , '23' , '2023-11-23' , '2023-11-23 08:37:02' , 2) [ RunTime:0.113241s ]
+[ sql ] [ SQL ] SELECT * FROM `dd_store_member` WHERE  `id` = 88 LIMIT 1 [ RunTime:0.120358s ]
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_store_order` [ RunTime:0.134573s ]
+[ sql ] [ SQL ] SELECT `id`,`order_no`,`price_total`,`take_time`,`price_goods`,`price_express`,`create_at`,`pay_at`,`status`,`pay_type`,`goods_num`,`remark`,`pro_name`,`city_name`,`county_name`,`add_detail`,`pay_state`,`user_name`,`phone`,`cancel_state`,`cancel_at`,`refund_state`,`express_state`,`express_company_title`,`express_send_no`,`express_send_at` FROM `dd_store_order` WHERE  `user_id` = 88  AND `is_deleted` = 0  AND `status` = 1  AND `refund_state` = 0 ORDER BY `id` DESC LIMIT 0,20 [ RunTime:0.114900s ]
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_store_order_item` [ RunTime:0.124739s ]
+[ sql ] [ SQL ] SELECT `id`,`user_id`,`order_id`,`goods_id`,`goods_spec`,`goods_name`,`spec_id`,`cover`,`pay_price`,`num` FROM `dd_store_order_item` WHERE  `order_id` IN (589,588,587,586,585,437,413) [ RunTime:0.123136s ]
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_store_order_refund` [ RunTime:0.145622s ]
+[ sql ] [ SQL ] SELECT `id`,`order_id`,`status`,`refund_type`,`create_at`,`refund_time`,`refund_money`,`apply_remark`,`audit_desc`,`is_deleted`,`apply_case`,`refund_no`,`express_no`,`consignee_name`,`consignee_add`,`consignee_tel`,`express_company`,`images` FROM `dd_store_order_refund` WHERE  `order_type` = 2  AND `is_deleted` = 0  AND `status` IN (0,1,2,3,4)  AND `order_id` IN (589,588,587,586,585,437,413) [ RunTime:0.124851s ]
+[ sql ] [ SQL ] SHOW COLUMNS FROM `dd_bill_apply` [ RunTime:0.150979s ]
+[ sql ] [ SQL ] SELECT `id`,`header`,`type`,`phone`,`email`,`bank`,`card_no`,`identify_number`,`bill_img`,`remark` FROM `dd_bill_apply` WHERE  `order_type` = 2  AND `order_id` = 589 LIMIT 1 [ RunTime:0.124314s ]
+[ sql ] [ SQL ] SELECT `id`,`header`,`type`,`phone`,`email`,`bank`,`card_no`,`identify_number`,`bill_img`,`remark` FROM `dd_bill_apply` WHERE  `order_type` = 2  AND `order_id` = 588 LIMIT 1 [ RunTime:0.117063s ]
+[ sql ] [ SQL ] SELECT `id`,`header`,`type`,`phone`,`email`,`bank`,`card_no`,`identify_number`,`bill_img`,`remark` FROM `dd_bill_apply` WHERE  `order_type` = 2  AND `order_id` = 587 LIMIT 1 [ RunTime:0.114018s ]
+[ sql ] [ SQL ] SELECT `id`,`header`,`type`,`phone`,`email`,`bank`,`card_no`,`identify_number`,`bill_img`,`remark` FROM `dd_bill_apply` WHERE  `order_type` = 2  AND `order_id` = 586 LIMIT 1 [ RunTime:0.115250s ]
+[ sql ] [ SQL ] SELECT `id`,`header`,`type`,`phone`,`email`,`bank`,`card_no`,`identify_number`,`bill_img`,`remark` FROM `dd_bill_apply` WHERE  `order_type` = 2  AND `order_id` = 585 LIMIT 1 [ RunTime:0.111391s ]
+[ sql ] [ SQL ] SELECT `id`,`header`,`type`,`phone`,`email`,`bank`,`card_no`,`identify_number`,`bill_img`,`remark` FROM `dd_bill_apply` WHERE  `order_type` = 2  AND `order_id` = 437 LIMIT 1 [ RunTime:0.113662s ]
+[ sql ] [ SQL ] SELECT `id`,`header`,`type`,`phone`,`email`,`bank`,`card_no`,`identify_number`,`bill_img`,`remark` FROM `dd_bill_apply` WHERE  `order_type` = 2  AND `order_id` = 413 LIMIT 1 [ RunTime:0.119451s ]
+[ sql ] [ SQL ] SELECT COUNT(*) AS tp_count FROM `dd_store_order` WHERE  `user_id` = 88  AND `is_deleted` = 0  AND `status` = 1  AND `refund_state` = 0 [ RunTime:0.112597s ]