server/manghe
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
zpc 2025-04-29 20:19:17 +08:00
commit 659a3ac92c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env
View File

@ -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

12
app/admin/controller/Statistics.php
View File

@ -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) {

2
app/api/controller/Config.php
View File

@ -26,7 +26,7 @@ class Config extends Base
return $this->renderSuccess('获取成功', [
'good_type' => $goodsTypeList,
'app_setting' => $app_setting,
'version' => '108'
'version' => '109'
]);
}