Browse Source

修改bug

master
王泽彦 9 months ago
parent
commit
69c5618428
  1. 57
      niucloud/app/api/controller/member/Member.php
  2. 1
      niucloud/app/api/route/route.php
  3. 49
      niucloud/app/service/api/member/MemberService.php

57
niucloud/app/api/controller/member/Member.php

@ -26,7 +26,7 @@ class Member extends BaseApiController
*/ */
public function info() public function info()
{ {
return success(( new MemberService() )->getInfo()); return success((new MemberService())->getInfo());
} }
/** /**
@ -35,7 +35,7 @@ class Member extends BaseApiController
*/ */
public function center() public function center()
{ {
return success(( new MemberService() )->center()); return success((new MemberService())->center());
} }
/** /**
@ -46,12 +46,12 @@ class Member extends BaseApiController
public function modify($field) public function modify($field)
{ {
$data = $this->request->params([ $data = $this->request->params([
[ 'value', '' ], ['value', ''],
[ 'field', $field ], ['field', $field],
]); ]);
$data[ $field ] = $data[ 'value' ]; $data[$field] = $data['value'];
$this->validate($data, 'app\validate\member\Member.modify'); $this->validate($data, 'app\validate\member\Member.modify');
( new MemberService() )->modify($field, $data[ 'value' ]); (new MemberService())->modify($field, $data['value']);
return success('MODIFY_SUCCESS'); return success('MODIFY_SUCCESS');
} }
@ -62,9 +62,9 @@ class Member extends BaseApiController
public function edit() public function edit()
{ {
$data = $this->request->params([ $data = $this->request->params([
[ 'data', [] ], ['data', []],
]); ]);
( new MemberService() )->edit($data[ 'data' ]); (new MemberService())->edit($data['data']);
return success('MODIFY_SUCCESS'); return success('MODIFY_SUCCESS');
} }
@ -75,10 +75,10 @@ class Member extends BaseApiController
public function mobile() public function mobile()
{ {
$data = $this->request->params([ $data = $this->request->params([
[ 'mobile', '' ], ['mobile', ''],
[ 'mobile_code', '' ], ['mobile_code', ''],
]); ]);
return success(( new AuthService() )->bindMobile($data[ 'mobile' ], $data[ 'mobile_code' ])); return success((new AuthService())->bindMobile($data['mobile'], $data['mobile_code']));
} }
/** /**
@ -88,11 +88,11 @@ class Member extends BaseApiController
public function log() public function log()
{ {
$data = $this->request->params([ $data = $this->request->params([
[ 'route', '' ], ['route', ''],
[ 'params', '' ], ['params', ''],
[ 'pre_route', '' ] ['pre_route', '']
]); ]);
( new MemberLogService() )->log($data); (new MemberLogService())->log($data);
return success(); return success();
} }
@ -101,7 +101,7 @@ class Member extends BaseApiController
*/ */
public function qrcode() public function qrcode()
{ {
return success(( new MemberService() )->getQrcode()); return success((new MemberService())->getQrcode());
} }
/** /**
@ -111,19 +111,30 @@ class Member extends BaseApiController
public function getMobile() public function getMobile()
{ {
$data = $this->request->params([ $data = $this->request->params([
[ 'mobile_code', '' ], ['mobile_code', ''],
]); ]);
return success(( new AuthService() )->getMobile($data[ 'mobile_code' ])); return success((new AuthService())->getMobile($data['mobile_code']));
} }
public function get_campuses_list(){ public function get_campuses_list()
return success(( new MemberService() )->get_campuses_list()); {
return success((new MemberService())->get_campuses_list());
} }
public function list_call_up(){ public function list_call_up()
{
$data = $this->request->params([
['sales_id', ''],
]);
return success((new MemberService())->list_call_up($data['sales_id']));
}
public function update_call_up()
{
$data = $this->request->params([ $data = $this->request->params([
[ 'sales_id', '' ], ['id', ''],
['remarks', ''],
]); ]);
return success(( new MemberService() )->list_call_up($data['sales_id'])); return success((new MemberService())->update_call_up($data['id'], $data['remarks']));
} }
} }

1
niucloud/app/api/route/route.php

@ -333,6 +333,7 @@ Route::group(function () {
Route::get('teachingResearch/submitTestPaper', 'apiController.teachingResearch/submitTestPaper'); Route::get('teachingResearch/submitTestPaper', 'apiController.teachingResearch/submitTestPaper');
Route::get('per_list_call_up', 'member.Member/list_call_up'); Route::get('per_list_call_up', 'member.Member/list_call_up');
Route::post('per_update_call_up', 'member.Member/update_call_up');
})->middleware(ApiChannel::class) })->middleware(ApiChannel::class)
->middleware(ApiPersonnelCheckToken::class, true) ->middleware(ApiPersonnelCheckToken::class, true)
->middleware(ApiLog::class); ->middleware(ApiLog::class);

49
niucloud/app/service/api/member/MemberService.php

@ -36,7 +36,8 @@ class MemberService extends BaseApiService
/** /**
* 新增会员 * 新增会员
*/ */
public function add(array $data){ public function add(array $data)
{
return $this->model->create($data)?->member_id ?? 0; return $this->model->create($data)?->member_id ?? 0;
} }
@ -49,7 +50,7 @@ class MemberService extends BaseApiService
{ {
$member = $this->findMemberInfo(['member_id' => $this->member_id]); $member = $this->findMemberInfo(['member_id' => $this->member_id]);
if($member->isEmpty()) throw new ApiException('MEMBER_NOT_EXIST'); if ($member->isEmpty()) throw new ApiException('MEMBER_NOT_EXIST');
$member->allowField(['nickname', 'headimg', 'birthday', 'sex', 'last_visit_time'])->save($data); $member->allowField(['nickname', 'headimg', 'birthday', 'sex', 'last_visit_time'])->save($data);
return true; return true;
} }
@ -87,28 +88,29 @@ class MemberService extends BaseApiService
* @param array $data * @param array $data
* @return Member|array|mixed|Model !!! 仔细看,返回值是模型对象 如果想要判断是否为空 请用 $member->isEmpty() * @return Member|array|mixed|Model !!! 仔细看,返回值是模型对象 如果想要判断是否为空 请用 $member->isEmpty()
*/ */
public function findMemberInfo(array $data){ public function findMemberInfo(array $data)
{
//会员账号 //会员账号
if(!empty($data['username'])) if (!empty($data['username']))
$where[] = ['username', '=', $data['username']]; $where[] = ['username', '=', $data['username']];
//会员手机号 //会员手机号
if(!empty($data['mobile'])) if (!empty($data['mobile']))
$where[] = ['mobile', '=', $data['mobile']]; $where[] = ['mobile', '=', $data['mobile']];
//会员id //会员id
if(!empty($data['member_id'])) if (!empty($data['member_id']))
$where[] = ['member_id', '=', $data['member_id']]; $where[] = ['member_id', '=', $data['member_id']];
//微信公众号openid //微信公众号openid
if(!empty($data['wx_openid'])) if (!empty($data['wx_openid']))
$where[] = ['wx_openid', '=', $data['wx_openid']]; $where[] = ['wx_openid', '=', $data['wx_openid']];
//微信小程序openid //微信小程序openid
if(!empty($data['weapp_openid'])) if (!empty($data['weapp_openid']))
$where[] = ['weapp_openid', '=', $data['weapp_openid']]; $where[] = ['weapp_openid', '=', $data['weapp_openid']];
// 微信unionid // 微信unionid
if(!empty($data['wx_unionid'])) if (!empty($data['wx_unionid']))
$where[] = ['wx_unionid', '=', $data['wx_unionid']]; $where[] = ['wx_unionid', '=', $data['wx_unionid']];
if(!empty($data['username|mobile'])) if (!empty($data['username|mobile']))
$where[] = ['username|mobile', '=', $data['username|mobile']]; $where[] = ['username|mobile', '=', $data['username|mobile']];
if(empty($where)){ if (empty($where)) {
$where[] = ['member_id', '=', -1]; $where[] = ['member_id', '=', -1];
} }
return $this->model->where($where)->findOrEmpty(); return $this->model->where($where)->findOrEmpty();
@ -120,7 +122,8 @@ class MemberService extends BaseApiService
* @param $data * @param $data
* @return void * @return void
*/ */
public function editByFind($member, $data){ public function editByFind($member, $data)
{
return $member->save($data); return $member->save($data);
} }
@ -135,11 +138,12 @@ class MemberService extends BaseApiService
return (new CoreMemberService())->modify($this->member_id, $field, $data); return (new CoreMemberService())->modify($this->member_id, $field, $data);
} }
public function getQrcode(){ public function getQrcode()
{
// 生成会员二维码 // 生成会员二维码
$qrcode_dir = 'upload/member/temp'; $qrcode_dir = 'upload/member/temp';
if (!is_dir($qrcode_dir)) mkdir($qrcode_dir, intval('0755', 8), true); if (!is_dir($qrcode_dir)) mkdir($qrcode_dir, intval('0755', 8), true);
$id = "member-".$this->member_id; $id = "member-" . $this->member_id;
$qrcode_path = "{$qrcode_dir}/order_qrcode_{$this->member_id}.png"; $qrcode_path = "{$qrcode_dir}/order_qrcode_{$this->member_id}.png";
\core\util\QRcode::png($id, $qrcode_path, 'L', 16, 1); \core\util\QRcode::png($id, $qrcode_path, 'L', 16, 1);
@ -154,21 +158,30 @@ class MemberService extends BaseApiService
/** /**
* 初始化会员数据 * 初始化会员数据
*/ */
public function initMemberData(){ public function initMemberData()
{
if ($this->member_id) { if ($this->member_id) {
event("MemberLoginAfter", ['member_id' => $this->member_id]); event("MemberLoginAfter", ['member_id' => $this->member_id]);
} }
} }
public function get_campuses_list(){ public function get_campuses_list()
{
$campus = new Campus(); $campus = new Campus();
$list = $campus->select()->toArray(); $list = $campus->select()->toArray();
return $list; return $list;
} }
public function list_call_up($resource_id){ public function list_call_up($resource_id)
{
$campus = new CommunicationRecords();
return $campus->where('resource_id', $resource_id)->select()->toArray();
}
public function update_call_up($resource_id, $remarks)
{
$campus = new CommunicationRecords(); $campus = new CommunicationRecords();
return $campus->where('resource_id',$resource_id)->select()->toArray(); return $campus->where('resource_id', $resource_id)->update(['remarks' => $remarks]);
} }
} }

Loading…
Cancel
Save