From 9b1daae474cece76da06cdf239bdb2079cd59d36 Mon Sep 17 00:00:00 2001 From: zpc Date: Mon, 28 Apr 2025 15:18:10 +0800 Subject: [PATCH 1/3] 111 --- .env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index d30629e..a15c551 100644 --- a/.env +++ b/.env @@ -6,9 +6,9 @@ DEFAULT_TIMEZONE = Asia/Shanghai [DATABASE] TYPE = mysql HOSTNAME = 127.0.0.1 -DATABASE = youda_test -USERNAME = youda_test -PASSWORD = youda_test +DATABASE = youda +USERNAME = youda +PASSWORD = youda HOSTPORT = 3306 CHARSET = utf8 DEBUG = false From 4db9d733d0e6997515600ba390d7d2506b9a7b30 Mon Sep 17 00:00:00 2001 From: youda Date: Tue, 29 Apr 2025 01:02:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Statistics.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/admin/controller/Statistics.php b/app/admin/controller/Statistics.php index 9402419..0fdf9c9 100755 --- a/app/admin/controller/Statistics.php +++ b/app/admin/controller/Statistics.php @@ -730,7 +730,7 @@ class Statistics extends Base // 查询3：获取兑换成本 $reMoneyQuery = Db::name('order_list') ->where('goods_id', '=', $goodId) - ->where('LENGTH(recovery_num)', '>', 0) + ->where('status', '=', 1) ->where('user_id', 'not in', $testUserIds); if ($hasTimeRange) { @@ -743,7 +743,7 @@ class Statistics extends Base // 查询4：获取发货成本 $fhMoneyQuery = Db::name('order_list') ->where('goods_id', '=', $goodId) - ->where('LENGTH(send_num)', '>', 0) + ->where('status', '=', 2) ->where('user_id', 'not in', $testUserIds); if ($hasTimeRange) { @@ -882,7 +882,7 @@ class Statistics extends Base // 查询3：获取兑换成本 $reMoneyQuery = Db::name('order_list') ->where('goods_id', 'in', $goodsIds) - ->where('LENGTH(recovery_num)', '>', 0) + ->where('status', '=', 1) ->where('user_id', 'not in', $testUserIds); if ($hasTimeRange) { @@ -895,7 +895,7 @@ class Statistics extends Base // 查询4：获取发货成本 $fhMoneyQuery = Db::name('order_list') ->where('goods_id', 'in', $goodsIds) - ->where('LENGTH(send_num)', '>', 0) + ->where('status', '=', 2) ->where('user_id', 'not in', $testUserIds); if ($hasTimeRange) { @@ -1177,7 +1177,7 @@ class Statistics extends Base // 查询3：获取兑换成本 $reMoneyQuery = Db::name('order_list') ->where('goods_id', '=', $goodId) - ->where('LENGTH(recovery_num)', '>', 0) + ->where('status', '=', 1) ->where('user_id', 'not in', $testUserIds); if ($hasTimeRange) { @@ -1190,7 +1190,7 @@ class Statistics extends Base // 查询4：获取发货成本 $fhMoneyQuery = Db::name('order_list') ->where('goods_id', '=', $goodId) - ->where('LENGTH(send_num)', '>', 0) + ->where('status', '=', 2) ->where('user_id', 'not in', $testUserIds); if ($hasTimeRange) { From 9e1e93c9ad0cd0225c626670e0178fa2fef53986 Mon Sep 17 00:00:00 2001 From: youda Date: Tue, 29 Apr 2025 20:18:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/Config.php b/app/api/controller/Config.php index 212704d..0c1f619 100755 --- a/app/api/controller/Config.php +++ b/app/api/controller/Config.php @@ -26,7 +26,7 @@ class Config extends Base return $this->renderSuccess('获取成功', [ 'good_type' => $goodsTypeList, 'app_setting' => $app_setting, - 'version' => '108' + 'version' => '109' ]); }