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 diff --git a/app/admin/controller/Statistics.php b/app/admin/controller/Statistics.php index 67f8195..454bf42 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) { 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' ]); }