|
|
@@ -62,7 +62,7 @@ class AskController extends BaseController
|
|
|
|
|
|
'blogger_rate' => Settings::get('askorder_blogger_balance_rate'),
|
|
|
];
|
|
|
- $data['blogger_price'] = bcdiv(bcmul($data['ask_price'],$data['blogger_rate'],2)100,2);
|
|
|
+ $data['blogger_price'] = bcdiv(bcmul($data['ask_price'],$data['blogger_rate'],2),100,2);
|
|
|
|
|
|
//0元的直接已付
|
|
|
$need_pay = 1;
|
|
|
@@ -237,7 +237,7 @@ class AskController extends BaseController
|
|
|
//咨询者收益
|
|
|
'user_rate' => Settings::get('sitorder_user_balance_rate'),
|
|
|
];
|
|
|
- $data['user_price'] = bcdiv(bcmul($data['sit_price'],$data['user_rate'],2)100,2);
|
|
|
+ $data['user_price'] = bcdiv(bcmul($data['sit_price'],$data['user_rate'],2),100,2);
|
|
|
|
|
|
if($order->sit_price == 0){
|
|
|
$need_pay = 0; //零元不需要支付
|
|
|
@@ -611,12 +611,13 @@ class AskController extends BaseController
|
|
|
$page = $request->page ?? 1;
|
|
|
$limit = $request->limit ?? 10;
|
|
|
$offset = ($page - 1) * $limit;
|
|
|
+ $user_id = $request->user_id;
|
|
|
|
|
|
//
|
|
|
$list = DB::table('ask_order')
|
|
|
->leftJoin('wx_user','wx_user.id','=','ask_order.user_id')
|
|
|
- ->select('ask_order.id','ask_order.eva_time','ask_order.eva_score','ask_order.eva_content','ask_order.is_hidden','wx_user.user_avatar','wx_user.user_name')
|
|
|
- ->where('ask_order.blogger_user_id',$request->user_id)
|
|
|
+ ->select('ask_order.id','ask_order.user_id','ask_order.blogger_user_id','ask_order.eva_time','ask_order.eva_score','ask_order.eva_content','ask_order.is_hidden','wx_user.user_avatar','wx_user.user_name')
|
|
|
+ ->where('ask_order.blogger_user_id',$user_id)
|
|
|
->where('ask_order.eva_time','>',0)
|
|
|
->where('ask_order.status',20)
|
|
|
->orderBy('ask_order.eva_time','desc')
|
|
|
@@ -624,11 +625,15 @@ class AskController extends BaseController
|
|
|
->get();
|
|
|
$list = json_decode(json_encode($list),true);
|
|
|
|
|
|
+ if(empty($list)){
|
|
|
+ return $this->success([]);
|
|
|
+ }
|
|
|
+
|
|
|
foreach($list as &$val){
|
|
|
|
|
|
- if($val['user_id'] == $request->uid){
|
|
|
+ if($val['user_id'] == $user_id){
|
|
|
//自己提问的
|
|
|
- }elseif($val['is_hidden'] == 0 && $val['blogger_user_id'] == $request->uid){
|
|
|
+ }elseif($val['is_hidden'] == 0 && $val['blogger_user_id'] == $user_id){
|
|
|
//登录者是答主，并且非匿名
|
|
|
}else{
|
|
|
$val['user_avatar'] = 'https://img.yiyoujiayuan.cn/2025/03/20/0/b59ce3b31611a3bd82199c3183208a10.jpg';//匿名头像
|
lizhen_gitee