Merge branch 'hotfix/618修复' into feature/1.1.3api开发

zhaojs

2023-06-19 6bbd51ce41a6bb79349d36156912d6fa875b77fd

 application/api/controller/User.php

@@ -18,6 +18,8 @@
use app\api\logic\UserWithdrawal as LogicUserWithdrawal;
use app\api\logic\SettlementRecord as LogicSettlementRecord;
use app\api\logic\UserMoneyLog as LogicUserMoneyLog;
use think\log;

/**
 * 会员接口
 */
@@ -84,6 +86,7 @@
        $mobile = $this->request->post('mobile');
        $captcha = $this->request->post('captcha');
        $ismobouth=$this->request->post('ismobouth',false);
        $push_cid=$this->request->post('push_cid',false);
        if (!$mobile || !$captcha) {
            $this->error(__('Invalid parameters'));
        }
@@ -245,6 +248,7 @@
    {
        $openid = request()->param('openid');
        $access_token = request()->param('access_token');
        $push_cid=request()->param('push_cid','');
        $LogicUser = new LogicUser();
        $userId = $LogicUser->getUserByOpenId($openid);
        if ($userId) {
@@ -252,6 +256,10 @@
            if(empty($user)) $this->error("用户信息获取失败");
            if ($user['status'] != 'normal') {
                $this->error(__('Account is locked'));
            }
            if(!empty($push_cid)&&empty($user['push_cid']))
            {//表里push_cid为空，补全push_cid
                
            }
            //如果已经有账号则直接登录
            $ret = $this->auth->direct($user['id']);
@@ -282,16 +290,21 @@
        if(empty($wxUser)) $this->error('微信授权信息获取失败');
        $mobile = $this->request->post('mobile');
        $captcha = $this->request->post('captcha');
        if (!$mobile || !$captcha) {
        $isyj=$this->request->post('isyj',false);
        if (!$mobile || (!$isyj&&!$captcha)) {
            $this->error(__('Invalid parameters'));
        }
        if (!Validate::regex($mobile, "^1\d{10}$")) {
            $this->error('请输入正确手机号');
        }
        $result = Sms::check($mobile, $captcha, 'changemobile');
        if (!$result) {
            $this->error(__('Captcha is incorrect'));
        if(!$isyj)
        {
            $result = Sms::check($mobile, $captcha, 'changemobile');
            if (!$result) {
                $this->error(__('Captcha is incorrect'));
            }
        }
        
        $ModelThird = new ModelThird();
        $LogicUser = new LogicUser();
        //判断当前手机号是否已经绑定微信
@@ -428,6 +441,46 @@
        if($res === false) $this->error($LogicUserBrowse->getError());

        $this->success([],'删除成功');
    }


    /**
     * 标记浏览0元购商品记录
     *
     * @return void
     */
    public function update_first_free_browse()
    {
        $ids = request()->param('goodsid','');

        $new_goodsId = request()->param('new_goodsId','');

        $LogicUserBrowse = new LogicUserBrowse();

        $res = $LogicUserBrowse->updatefirstfreelog(USERID,$ids,$new_goodsId);

        if($res === false) $this->error($LogicUserBrowse->getError());

        $this->success([],'添加成功');
    }

    /**
     * 检测是否首单
     *
     * @return void
     */

    public function check_isfirst_free()
    {

        $LogicUserBrowse = new LogicUserBrowse();

        $res = $LogicUserBrowse->checkIsFirstFree(USERID);

        if($res === false) $this->error($LogicUserBrowse->getError());
        Log::write('检测是否首单：'.json_encode($res));
        if(empty($res)) $this->success(['info'=>1],'首单客户');
        $this->success(['info'=>0],'非首单客户');
    }


@@ -743,6 +796,7 @@
        $user_jjcj_num = $ModelUser->where(['f_invitation_id'=>USERID,'level'=>1])->count(); //间接初级人数
        $user_zszj_num = $ModelUser->where(['invitation_id'=>USERID,'level'=>2])->count(); //直属中级人数
        $user_jjzj_num = $ModelUser->where(['f_invitation_id'=>USERID,'level'=>2])->count(); //间接中级人数
        $user_zong_num = $ModelUser->where(['invitation_id'=>USERID])->count(); //总邀请人数
        $user_monthly_commission = LogicUser::getUserCommission($user['id'],'month'); //获取近30佣金
        $user_total_commission = LogicUser::getUserCommission($user['id'],'total'); //获取累计佣金
        $data = [
@@ -751,6 +805,7 @@
                'user_jjcj_num' => $user_jjcj_num,
                'user_zszj_num' => $user_zszj_num,
                'user_jjzj_num' => $user_jjzj_num,
                'user_zong_num'=>$user_zong_num,
                'user_monthly_commission' => $user_monthly_commission,
                'total_commission' => $user_total_commission
            ],