From ea269ffc08fc8c460ee0b365bedda500f9c5834b Mon Sep 17 00:00:00 2001 From: zpc Date: Fri, 25 Apr 2025 11:13:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 26273f6..a15c551 100644 --- a/.env +++ b/.env @@ -6,9 +6,9 @@ DEFAULT_TIMEZONE = Asia/Shanghai [DATABASE] TYPE = mysql HOSTNAME = 127.0.0.1 -DATABASE = youda_neice -USERNAME = youda_neice -PASSWORD = youda_neice +DATABASE = youda +USERNAME = youda +PASSWORD = youda HOSTPORT = 3306 CHARSET = utf8 DEBUG = false From 6397a2ba8d63752ad608df5a6aeb93ad2cb34872 Mon Sep 17 00:00:00 2001 From: youda Date: Fri, 25 Apr 2025 11:18:31 +0800 Subject: [PATCH 2/6] =?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/api/route/app.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/api/route/app.php b/app/api/route/app.php index c685419..d662e5c 100755 --- a/app/api/route/app.php +++ b/app/api/route/app.php @@ -138,10 +138,10 @@ Route::any('warehouse_order_logistics', 'Warehouse/warehouse_order_logistics'); #============================ #Notify.php通知回调 #============================ -Route::any('notify/order_notify', 'Notify/order_notify'); -Route::any('notify/ceshi', 'Notify/ceshi'); -Route::any('notify/order_notify7', 'Notify/order_notify7'); -Route::any('ad_notify', 'Notify/ad_notify'); +// Route::any('notify/order_notify', 'Notify/order_notify'); +// Route::any('notify/ceshi', 'Notify/ceshi'); +// Route::any('notify/order_notify7', 'Notify/order_notify7'); +// Route::any('ad_notify', 'Notify/ad_notify'); Route::any('user_sign_list', 'User/user_sign_list'); Route::any('user_sign', 'User/user_sign'); Route::any('shop_seckill_index', 'Seckill/shop_seckill_index'); From 028adafa108f8b443e67f23dce2c891c5cadfacb Mon Sep 17 00:00:00 2001 From: youda Date: Fri, 25 Apr 2025 15:53:24 +0800 Subject: [PATCH 3/6] =?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/view/User/user_box.html | 4 ++-- app/api/controller/Config.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/admin/view/User/user_box.html b/app/admin/view/User/user_box.html index fc98484..6193504 100755 --- a/app/admin/view/User/user_box.html +++ b/app/admin/view/User/user_box.html @@ -12,7 +12,7 @@ @@ -121,7 +121,7 @@ var statusText = ''; switch (parseInt(d.status)) { case 0: statusText = '盒柜中'; break; - case 1: statusText = '已回收'; break; + case 1: statusText = '兑换达达卷'; break; case 2: statusText = '选择发货'; break; default: statusText = '未知'; } diff --git a/app/api/controller/Config.php b/app/api/controller/Config.php index ba26285..212704d 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' => '107' + 'version' => '108' ]); } From c1cdc780795bfb3cba9061cd30184bce09d9f620 Mon Sep 17 00:00:00 2001 From: youda Date: Sat, 26 Apr 2025 15:17:40 +0800 Subject: [PATCH 4/6] =?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/Finance.php | 2 +- app/admin/controller/Order.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/admin/controller/Finance.php b/app/admin/controller/Finance.php index e2e05b7..6e59e76 100755 --- a/app/admin/controller/Finance.php +++ b/app/admin/controller/Finance.php @@ -26,7 +26,7 @@ class Finance extends Base $mobile = trim(input('get.mobile')); $addtime = trim(input('get.addtime')); $whe = []; - $whe[] = ['order_type', '<', 12]; + // $whe[] = ['order_type', '<', 12]; $whe[] = ['status', '=', 1]; if ($user_id) { $user_id = $this->convertUidToUserId($user_id); diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php index 9b05976..a55db61 100755 --- a/app/admin/controller/Order.php +++ b/app/admin/controller/Order.php @@ -501,12 +501,12 @@ class Order extends Base if ($info['status'] == 4) { return $this->renderError('请勿重复操作'); } - if ($info['status'] == 1) { - return $this->renderError('该订单未发货'); - } - if ($info['status'] != 2) { - return $this->renderError('请求参数错误1'); - } + // if ($info['status'] == 1) { + // return $this->renderError('该订单未发货'); + // } + // if ($info['status'] != 2) { + // return $this->renderError('请求参数错误1'); + // } if ($info['freight'] > 0) { $wxServer = new \app\common\server\WechatRefund($this->app); $refund_res = $wxServer->OrderRefund($info); From c15e51a393cfcd367f263066bda76e92d3f90f64 Mon Sep 17 00:00:00 2001 From: youda Date: Sun, 27 Apr 2025 13:11:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Order.php | 7 ++----- app/admin/controller/Statistics.php | 10 ++++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php index a55db61..3eb62ae 100755 --- a/app/admin/controller/Order.php +++ b/app/admin/controller/Order.php @@ -723,10 +723,6 @@ class Order extends Base exit; } - - /** - * 发货订单导出 - */ /** * 发货订单导出 */ @@ -796,7 +792,8 @@ class Order extends Base $user_info = 'ID：' . $value['user_id'] . " UID：" . ($value['user_info']['uid'] ?? $value['user_id']) . " 昵称：" . $value['user_info']['nickname'] . " 手机号：" . $value['user_info']['mobile']; $addtime = date('Y-m-d H:i:s', $value['addtime']); - $goods = OrderList::where('send_num', $value['send_num']) + $goods = OrderList::field('*,count(`id`) as num') + ->where('send_num', $value['send_num']) ->append(['shang_title', 'card_no']) ->group('prize_code') ->order('id desc') diff --git a/app/admin/controller/Statistics.php b/app/admin/controller/Statistics.php index 5d53f3a..fddc515 100755 --- a/app/admin/controller/Statistics.php +++ b/app/admin/controller/Statistics.php @@ -679,7 +679,9 @@ class Statistics extends Base } // 获取测试用户ID - $testUsers = User::where('istest', '>', 0)->column('id'); + $testUsers = User::where('istest', '>', 0) + ->whereOr('status', '=', 2) + ->column('id'); $testUserIds = empty($testUsers) ? [0] : $testUsers; // 获取盒子基本信息 @@ -841,7 +843,7 @@ class Statistics extends Base } // 获取测试用户ID - $testUsers = User::where('istest', '>', 0)->column('id'); + $testUsers = User::where('istest', '>', 0) ->whereOr('status', '=', 2)->column('id'); $testUserIds = empty($testUsers) ? [0] : $testUsers; // 查询1：获取充值金额和余额消费总和 @@ -958,7 +960,7 @@ class Statistics extends Base } // 获取测试用户ID - $testUsers = User::where('istest', '>', 0)->column('id'); + $testUsers = User::where('istest', '>', 0) ->whereOr('status', '=', 2)->column('id'); $testUserIds = empty($testUsers) ? [0] : $testUsers; // 获取盒子类型名称映射 @@ -1276,7 +1278,7 @@ class Statistics extends Base } // 获取测试用户ID - $testUsers = User::where('istest', '>', 0)->column('id'); + $testUsers = User::where('istest', '>', 0) ->whereOr('status', '=', 2)->column('id'); $testUserIds = empty($testUsers) ? [0] : $testUsers; // 查询1：获取充值金额和余额消费总和 From d7c66a952842526cb94f7bfb26fb6fa8b47c9628 Mon Sep 17 00:00:00 2001 From: zpc Date: Sun, 27 Apr 2025 13:12:29 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index a15c551..d30629e 100644 --- a/.env +++ b/.env @@ -6,9 +6,9 @@ DEFAULT_TIMEZONE = Asia/Shanghai [DATABASE] TYPE = mysql HOSTNAME = 127.0.0.1 -DATABASE = youda -USERNAME = youda -PASSWORD = youda +DATABASE = youda_test +USERNAME = youda_test +PASSWORD = youda_test HOSTPORT = 3306 CHARSET = utf8 DEBUG = false