blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

修改代码注释

Browse Source
This commit is contained in:
邹景立 2021-09-16 10:08:19 +08:00
parent fe51597a33
commit fe3fb615b3
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/data/command/OrderClean.php
View File

@ -46,15 +46,10 @@ class OrderClean extends Command
try {
$map = [['status', '<', 3], ['payment_status', '=', 0]];
$map[] = ['create_at', '<', date('Y-m-d H:i:s', strtotime('-30 minutes'))];
[$total, $count] = [ShopOrder::mk()->where($map)->count(), 0];
ShopOrder::mk()->where($map)->select()->map(function (Model $item) use ($total, &$count) {
[$count, $total] = [0, ($result = ShopOrder::mk()->where($map)->select())->count()];
$result->map(function (Model $item) use ($total, &$count) {
$this->queue->message($total, ++$count, "开始取消未支付的订单 {$item['order_no']}");
$item->save([
'status' => 0,
'cancel_status' => 1,
'cancel_datetime' => date('Y-m-d H:i:s'),
'cancel_remark' => '30分钟未完成支付已自动取消',
]);
$item->save(['status' => 0, 'cancel_status' => 1, 'cancel_datetime' => date('Y-m-d H:i:s'), 'cancel_remark' => '自动取消30分钟未完成支付']);
OrderService::instance()->stock($item['order_no']);
$this->queue->message($total, $count, "完成取消未支付的订单 {$item['order_no']}", 1);
});
@ -72,8 +67,8 @@ class OrderClean extends Command
try {
$map = [['status', '=', 0], ['payment_status', '=', 0]];
$map[] = ['create_at', '<', date('Y-m-d H:i:s', strtotime('-3 days'))];
[$total, $count] = [ShopOrder::mk()->where($map)->count(), 0];
ShopOrder::mk()->where($map)->select()->map(function (Model $item) use ($total, &$count) {
[$count, $total] = [0, ($result = ShopOrder::mk()->where($map)->select())->count()];
$result->map(function (Model $item) use ($total, &$count) {
$this->queue->message($total, ++$count, "开始清理已取消的订单 {$item['order_no']}");
ShopOrder::mk()->where(['order_no' => $item['order_no']])->delete();
ShopOrderItem::mk()->where(['order_no' => $item['order_no']])->delete();

1
app/data/command/UserAgent.php
View File

@ -76,5 +76,4 @@ class UserAgent extends Command
$this->setQueueMessage($total, $count, "完成更新下级用户[{$vo['id']}]代理绑定!", 1);
}
}
}

1
app/data/controller/api/auth/News.php
View File

@ -212,5 +212,4 @@ class News extends Auth
NewsService::instance()->buildListByUidAndCode($result['list']);
$this->success('获取浏览历史成功！', $result);
}
}

3
app/data/controller/api/auth/Order.php
View File

@ -10,6 +10,7 @@ use app\data\model\ShopGoods;
use app\data\model\ShopGoodsItem;
use app\data\model\ShopOrder;
use app\data\model\ShopOrderItem;
use app\data\model\ShopOrderSend;
use app\data\service\ExpressService;
use app\data\service\GoodsService;
use app\data\service\OrderService;
@ -279,7 +280,7 @@ class Order extends Auth
$express['address_area'] = $addr['area'];
$express['address_content'] = $addr['address'];
data_save('ShopOrderSend', $express, 'order_no');
data_save(ShopOrderSend::class, $express, 'order_no');
// 组装更新订单数据
$update = ['status' => 2, 'amount_express' => $express['template_amount']];
// 重新计算订单金额

4
app/data/controller/api/auth/Rebate.php
View File

@ -27,8 +27,8 @@ class Rebate extends Auth
$query = DataUserRebate::mQuery()->where($map)->equal('type,status')->whereLike('date', "{$date}%");
$this->success('获取返利统计', array_merge($query->order('id desc')->page(true, false, false, 10), [
'total' => [
'年度' => $this->_query('DataUserRebate')->where($map)->equal('type,status')->whereLike('date', "{$year}%")->db()->sum('amount'),
'月度' => $this->_query('DataUserRebate')->where($map)->equal('type,status')->whereLike('date', "{$date}%")->db()->sum('amount'),
'年度' => DataUserRebate::mQuery()->where($map)->equal('type,status')->whereLike('date', "{$year}%")->db()->sum('amount'),
'月度' => DataUserRebate::mQuery()->where($map)->equal('type,status')->whereLike('date', "{$date}%")->db()->sum('amount'),
],
]));
}