feat: 添加阿里云短信服务支持并优化验证码逻辑
- 引入 alibabacloud/dysmsapi-20170525 依赖,集成阿里云短信服务 - 将短信验证码从6位改为4位,优化用户体验 - 添加聚水潭商品按时间范围同步功能,支持分页拉取 - 增强Cron任务异常处理,添加错误日志记录 - 修复系统附件服务中图片路径处理逻辑 - 更新阿里云SDK相关组件至最新版本 - 添加think-trace调试扩展,便于问题排查 - 优化跨域中间件,使用str_contains替代strpos
This commit is contained in:
@@ -31,15 +31,13 @@ class OrderStatisticServices extends BaseServices
|
||||
$orderService = app()->make(StoreOrderServices::class);
|
||||
$data['pay_price'] = $orderService->sum(['paid' => 1, 'pid' => 0, 'time' => $where['time'], 'supplier_id' => $supplier_id], 'pay_price', true);
|
||||
$data['pay_count'] = $orderService->count(['paid' => 1, 'pid' => 0, 'time' => $where['time'], 'supplier_id' => $supplier_id]);
|
||||
$times = explode('-', $where['time']);
|
||||
if(count($times) > 1){
|
||||
$times = [
|
||||
'start_time'=>$times[0],
|
||||
'end_time'=>$times[1] . ' 23:59:59'
|
||||
];
|
||||
$refundWhere = ['refund_type' => 6, 'time' => explode('-', $where['time']), 'is_cancel' => 0, 'is_del' => 0];
|
||||
if ($supplier_id !== '') {
|
||||
$refundWhere['supplier_id'] = $supplier_id;
|
||||
}
|
||||
$data['refund_price'] = app()->make(StoreOrderRefundServices::class)->sum(['refund_type' => 6, 'time' => explode('-', $where['time'])],'refund_price', true);
|
||||
$data['refund_count'] = app()->make(StoreOrderRefundServices::class)->count(['refund_type' => 6, 'time' => explode('-', $where['time'])]);
|
||||
$refundService = app()->make(StoreOrderRefundServices::class);
|
||||
$data['refund_price'] = $refundService->sum($refundWhere, 'refund_price', true);
|
||||
$data['refund_count'] = $refundService->count($refundWhere);
|
||||
$data['coupon_price'] = $orderService->sum(['paid' => 1, 'pid' => 0, 'time' => $where['time'], 'supplier_id' => $supplier_id], 'coupon_price', true);
|
||||
$data['coupon_count'] = $orderService->search(['paid' => 1, 'pid' => 0, 'time' => $where['time'], 'is_coupon' => 1, 'supplier_id' => $supplier_id])->count();
|
||||
return $data;
|
||||
|
||||
Reference in New Issue
Block a user