作者 郭文星

'213'

@@ -329,6 +329,15 @@ class Business extends Base @@ -329,6 +329,15 @@ class Business extends Base
329 */ 329 */
330 public function userstaff(){ 330 public function userstaff(){
331 $store_id=$this->store_id; 331 $store_id=$this->store_id;
  332 + //通过门店id查询到活动
  333 + $time=time();
  334 + $where["verification_store_id"] = ["=", $this->store_id];
  335 + $activity=Db::name('verification_activity')
  336 + ->alias('a')
  337 + ->join('verification_store b','a.verification_store_id=b.id')
  338 + ->field('a.*,b.address,b.name,b.phone')
  339 + ->where($where)->find();
  340 +
332 //查询员工 341 //查询员工
333 $page = $this->request->post('page', 1); 342 $page = $this->request->post('page', 1);
334 $total = $this->request->post('total', 10); 343 $total = $this->request->post('total', 10);
@@ -337,6 +346,8 @@ class Business extends Base @@ -337,6 +346,8 @@ class Business extends Base
337 ->where($where) 346 ->where($where)
338 ->paginate($total, false, ['page' => $page]) 347 ->paginate($total, false, ['page' => $page])
339 ->toArray(); 348 ->toArray();
  349 + $staff['activity_name']=$activity['title'];
  350 + $staff['staff_name']=$activity['name'];
340 $this->success("查询成功",$staff); 351 $this->success("查询成功",$staff);
341 } 352 }
342 353
@@ -419,6 +430,14 @@ class Business extends Base @@ -419,6 +430,14 @@ class Business extends Base
419 public function red_packet(){ 430 public function red_packet(){
420 $store_id=$this->store_id; 431 $store_id=$this->store_id;
421 $user_id = $this->auth->id; 432 $user_id = $this->auth->id;
  433 +//通过门店id查询到活动
  434 + $time=time();
  435 + $where["verification_store_id"] = ["=", $this->store_id];
  436 + $activity=Db::name('verification_activity')
  437 + ->alias('a')
  438 + ->join('verification_store b','a.verification_store_id=b.id')
  439 + ->field('a.*,b.address,b.name,b.phone')
  440 + ->where($where)->find();
422 441
423 //参数 442 //参数
424 $param = request()->param(); 443 $param = request()->param();
@@ -436,7 +455,8 @@ class Business extends Base @@ -436,7 +455,8 @@ class Business extends Base
436 $item['send_result'] = $item['send_result'] == 1?'成功':'失败'; 455 $item['send_result'] = $item['send_result'] == 1?'成功':'失败';
437 return $item; 456 return $item;
438 }); 457 });
439 - 458 + $rows['activity_name']=$activity['title'];
  459 + $rows['staff_name']=$activity['name'];
440 $this->success("查询成功",$rows); 460 $this->success("查询成功",$rows);
441 } 461 }
442 462