gitfjn/duolamaojiazhen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复内容

Browse Source
This commit is contained in:
gitfjn
2026-01-18 18:07:53 +08:00
parent 5455aceab5
commit 5fe5289e26
9 changed files with 493 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/api/logic/GoodsCategoryLogic.php
View File

@@ -32,11 +32,11 @@ class GoodsCategoryLogic{
* @author: 2021/3/6 18:49
*/
public static function categoryThirdTree($client,$type){
$cache_key = 'goods_category_'.$client.'_'.$type;
$cache = Cache::get($cache_key);
if ($cache) {
return $cache;
}
// $cache_key = 'goods_category_'.$client.'_'.$type;
// $cache = Cache::get($cache_key);
// if ($cache) {
// return $cache;
// }
// 构建查询条件
$where1 = ['is_show'=>1,'del'=>0,'level'=>1];
@@ -137,7 +137,7 @@ class GoodsCategoryLogic{
}
}
Cache::set($cache_key, array_values($lists));
// Cache::set($cache_key, array_values($lists));
return array_values($lists);
}

14
application/api/logic/OrderLogic.php
View File

@@ -1069,6 +1069,7 @@ class OrderLogic extends LogicBase
case 'delivery':
$where[] = ['pay_status', '=', 1];
$where[] = ['order_status', '=', 1];
$where[] = ['refund_status', '=', 0];
break;
case 'finish':
$where[] = ['pay_status', '=', 1];
@@ -1133,10 +1134,10 @@ class OrderLogic extends LogicBase
$list['goods_name']=$goods['name'];
$list['goods_price']=$goods['min_price'];
$number=Db::name('order_exe')->where('order_sn',$list['order_sn'])->where('staff_status',3)->count(); //查询订单服务次数
$list['ordercs']=$number;
$list['ordercs'] = Db::name('order_exe')->where('order_sn',$list['order_sn'])->where('staff_status','<>',3)->count(); //已预约
$list['orderyjfw']= $list['number']-$number;
$list['orderdaifw'] = Db::name('order_exe')->where('order_sn',$list['order_sn'])->where('staff_status',0)->count(); //待服务数量
$list['orderfwzhon'] = Db::name('order_exe')->where('order_sn',$list['order_sn'])->where('staff_status',1)->count(); //服务中数量
$list['orderdaifw'] = $list['number']-$number; //待预约数量
$list['orderfwzhon'] = Db::name('order_exe')->where('order_sn',$list['order_sn'])->where('status',3)->count(); //暂停中数量
$list['orderyiwanchen'] = Db::name('order_exe')->where('order_sn',$list['order_sn'])->where('staff_status',3)->count(); //服务已完成
$list['showBubble']=false;
$list['more']="更多";
@@ -1492,13 +1493,12 @@ class OrderLogic extends LogicBase
break;
}
$count =$order->where('order_sn',$order_sn)
->count();
$count =$order->where($where)->count();
$lists = $order->where('order_sn',$order_sn)
->where($where)
->page($page, $size)
->order('autotime asc')
->orderRaw('CASE WHEN staff_status = 3 THEN 1 ELSE 0 END, autotime ASC')
->select();
foreach ($lists as $list){
@@ -1518,8 +1518,6 @@ class OrderLogic extends LogicBase
}
$list['autotime']=date("Y-m-d",$list['autotime']);
}
$data = [
'list' => $lists,

8
application/api/logic/UserAddressLogic.php
View File

@@ -136,7 +136,9 @@ class UserAddressLogic
'district_id' => $post['district_id'],
'address' => $post['address'],
'is_default' => $post['is_default'],
'createtime' => time()
'createtime' => time(),
'lng' => $post['latitude'],
'lat' => $post['longitude']
];
$result = Db::name('user_address')->insert($data);
Db::commit();
@@ -175,7 +177,9 @@ class UserAddressLogic
'district_id' => $post['district_id'],
'address' => $post['address'],
'is_default' => $post['is_default'],
'updatetime' => time()
'updatetime' => time(),
'lng' => $post['latitude'],
'lat' => $post['longitude']
];
$result = Db::name('user_address')