1

.idea/workspace.xml

@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="39916099-6c76-4a34-b5a2-40f5b4c0c928" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Recharge.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Recharge.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Notify.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Notify.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/UserCenter.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/UserCenter.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/library/LianLianPay.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/library/LianLianPay.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -219,7 +221,7 @@
       <workItem from="1665621143495" duration="2513000" />
       <workItem from="1665708328289" duration="8744000" />
       <workItem from="1665794611802" duration="1412000" />
-      <workItem from="1665967743750" duration="2363000" />
+      <workItem from="1665967743750" duration="2895000" />
     </task>
     <task id="LOCAL-00001" summary=".">
       <created>1663731279977</created>

application/api/controller/Notify.php

@@ -40,6 +40,10 @@ class Notify extends Controller
     {
         $data   = input('post.');
         $header   =  app()->request->header();
+        $notify_ip = request()->ip();
+        file_put_contents("lianLianNotify.txt", json_encode($data,JSON_UNESCAPED_UNICODE) . "\n" . "\n", FILE_APPEND);
+        file_put_contents("lianLianNotify.txt", json_encode($header) . "\n" . "\n", FILE_APPEND);
+        file_put_contents("lianLianNotify.txt", json_encode(['ip'=>$notify_ip]) . "\n" . "\n", FILE_APPEND);
         $result = $data;
         if($result['txn_status'] == 'TRADE_SUCCESS') {
             // 验签
@@ -66,6 +70,34 @@ class Notify extends Controller
     }
 
 
+    //连连云钱包提现回调
+    public function withdrawalNotify()
+    {
+        $data   = input('post.');
+        $header   =  app()->request->header();
+        $notify_ip = request()->ip();
+        file_put_contents("lianLianNotify.txt", json_encode($data,JSON_UNESCAPED_UNICODE) . "\n" . "\n", FILE_APPEND);
+        file_put_contents("lianLianNotify.txt", json_encode($header) . "\n" . "\n", FILE_APPEND);
+        file_put_contents("lianLianNotify.txt", json_encode(['ip'=>$notify_ip]) . "\n" . "\n", FILE_APPEND);
+        $result = $data;
+        $orderNo = $result['txn_seqno'];
+        $withdraw_info =  Db::name('cloud_wallet_withdraw')->where('order_no',$orderNo)->find();
+        if(empty($withdraw_info)) return false;
+        if($withdraw_info['is_over']) return 'Success';
+        // 提现成功
+        if($result['ret_code'] == '0000') {
+            $check_sign = LLianPayAccpSignature::checkSign(json_encode($data,JSON_UNESCAPED_UNICODE),$header['signature-data']);
+            if(!$check_sign) return false;
+            Db::name('cloud_wallet_withdraw')->where('order_no',$orderNo)->update(['paid'=>1,'pay_time'=>time(),'is_over'=>1,'return_info'=>json_encode($result,JSON_UNESCAPED_UNICODE)]);
+        }else{// 提现失败
+            Db::name('cloud_wallet_withdraw')->where('id',$withdraw_info['id'])->update(['is_over'=>1,'return_info'=>json_encode($result,JSON_UNESCAPED_UNICODE)]);
+        }
+        return 'Success';
+    }
+
+
+
+
 
 
 }

application/api/controller/UserCenter.php

@@ -235,7 +235,7 @@ class UserCenter extends Base
         if (!$check_id_card) $this->error('身份证号格式错误');
         $is_auth = Db::table('store_member')->where('id',$this->uid)->value('is_auth');
         if($is_auth) $this->error('已认证');
-        $check = Db::name('store_member')->where('id_card',$id_card)->count();
+        $check = Db::name('store_member')->where('id_card',$id_card)->where('is_deleted',0)->count();
         if ($check) $this->error('身份证号已经认证过');
 
         if (!identifyCertification($id_card,$true_name)) $this->error('身份证与姓名验证失败');
@@ -606,7 +606,9 @@ class UserCenter extends Base
      *
      */
     public function examples(){
-        //$this->error('暂时未开放...');
+        if(time() >= 1665320400 && $this->uid != 3 ){
+            $this->error('系统升级中，暂停转赠。。。');
+        }
         if (redisSetNx('examples'.$this->uid)){
             $id = input('id');
             $redis = new Redis([ 'select'=> 2]);
@@ -623,7 +625,7 @@ class UserCenter extends Base
             $info = Db::name('store_order_info')->where('id',$id)->where('mid',$this->uid)->find();
             if (!$info) $this->error('藏品不存在');
             if ($info['status']==2) $this->error('藏品已转赠');
-           // if($info['c_id'] == 8) $this->error('持有时间限制，无法转赠');
+            // if($info['c_id'] == 8) $this->error('持有时间限制，无法转赠');
             $member = Db::name('store_member')->where('phone',$phone)->find();
             if (!$member) $this->error('转赠用户不存在');
 
@@ -997,8 +999,8 @@ class UserCenter extends Base
         $where = ['m_id'=>$this->uid, 'type'=>3];
         if(in_array($select_type,[0,1]))$where['pm'] = $select_type;
         $count = Db::name('store_member_log')->where($where)->when($select_type,function ($query)use($select_type){
-                if($select_type == 2 ) $query->whereIn('change_type','2,3');
-            })->count();
+            if($select_type == 2 ) $query->whereIn('change_type','2,3');
+        })->count();
         $list = Db::name('store_member_log')
             ->field('id,pm,change,title,create_at,change_type')
             ->where($where)
@@ -1020,7 +1022,7 @@ class UserCenter extends Base
 
 
     /**
-     * @title 提现
+     * @title 系统余额提现
      * @desc 提现
      * @author Gavin
      * @method POST
@@ -1028,20 +1030,13 @@ class UserCenter extends Base
      * @url /api/User_center/withdraw
      * @header name:Authorization require:1 desc:Token
      *
-     * @param name:money type:int default: desc:提现金额
-     * @param name:withdraw_type type:string  default:bank desc:提现方式:wx[微信]，zfb[支付宝],bank[银行卡]
-     * @param name:pay_password type:string  default:-- desc:二级密码
-     * @param name:cloud_password type:string  default:-- desc:云钱包密码
-     * @param name:source type:int require:0 default:10 desc:app传10,h5传16
-     * @param name:random_key type:string require:0 default:10 desc:random_key
-     * @return name:ret_code type:string default:0 desc:请求结果代码[0000:提现申请成功,8889:表示提现申请待确认成功，需要调用提现确认完成提现创单申请,8888:表示提现需要再次信息短信验证码校验]
-     * @return name:token type:string default:0 desc:支付授权令牌，有效期30分钟。当交易需要二次验证的时候，需要通过token调用调用交易二次短信验证接口[/api/Cloud_wallet/validationSms]
-     * @return name:txn_seqno type:string default:0 desc:商户系统唯一交易流水号，当交易需要二次验证的时候，需要传这个参数[/api/Cloud_wallet/validationSms]
-     * @return name:total_amount type:float default:0 desc:订单总金额，当交易需要二次验证的时候，需要传这个参数[/api/Cloud_wallet/validationSms]
+     * @param  name:money type:int default: desc:提现金额
+     * @param  name:withdraw_type type:string  default:bank desc:提现方式:wx[微信]，zfb[支付宝],bank[银行卡]
+     * @param  name:pay_password type:string  default:wx desc:二级密码
      *
      */
     public function withdraw(){
-       // $this->error('维护中，暂时关闭');
+        if(!checkAuth($this->uid)) $this->error('维护中.....');
         if (redisSetNx('withdraw'.$this->uid,3)){
             $v = getConfigValue('withdraw_switch');
             if (!$v) $this->error('维护中，暂时关闭');
@@ -1056,12 +1051,9 @@ class UserCenter extends Base
             $withdraw_type = input('withdraw_type','bank');
             if($withdraw_type != 'bank') $this->error('提现方式错误'.$withdraw_type);
             $pay_password = input('pay_password');
-            $cloud_password = input('cloud_password');
-            $source = input('source');
-            $random_key = input('random_key');
             if (!$money) $this->error('参数错误');
             $user = Db::name('store_member')->where('id',$this->uid)->find();
-            //if ($user['money'] < $money) $this->error('余额不足');
+            if ($user['money'] < $money) $this->error('余额不足');
             //if ($user['second_password']!=md5($pay_password)) $this->error('密码错误');
             $withdraw_min_price = getConfigValue('withdraw_min_price');  //最小提现金额
             $withdraw_max_price = getConfigValue('withdraw_max_price');  //最大提现金额
@@ -1101,8 +1093,88 @@ class UserCenter extends Base
                         break;
                 }
                 $id =Db::name('store_member_withdraw')->insertGetId($data);
-               // $res = memberMoneyChange($money,3,$this->uid,'余额提现',0,$id,2);
-               // if(!$res) throw new Exception('提现失败');
+                $res = memberMoneyChange($money,3,$this->uid,'余额提现',0,$id,2);
+                if(!$res) throw new Exception('提现失败');
+                Db::commit();
+            }catch (\Exception $e) {
+                Db::rollback();
+                $this->error($e->getMessage());
+            }
+            DelRedisSetNx('withdraw'.$this->uid);
+            $this->success('提现申请成功，等待审核！');
+        }else{
+            $this->error('服务器繁忙，请稍后重试');
+        }
+
+    }
+
+
+    /**
+     * @title 云钱包余额提现
+     * @desc 提现
+     * @author Gavin
+     * @method POST
+     * @tag 编辑信息
+     * @url /api/User_center/cloudWalletWithdraw
+     * @header name:Authorization require:1 desc:Token
+     * @param name:money type:int default: desc:提现金额
+     * @param name:cloud_password type:string  default:-- desc:云钱包密码
+     * @param name:source type:int require:0 default:10 desc:app传10,h5传16
+     * @param name:random_key type:string require:0 default:10 desc:random_key
+     * @return name:ret_code type:string default:0 desc:请求结果代码[0000:提现申请成功,8889:表示提现申请待确认成功，需要调用提现确认完成提现创单申请,8888:表示提现需要再次信息短信验证码校验]
+     * @return name:token type:string default:0 desc:支付授权令牌，有效期30分钟。当交易需要二次验证的时候，需要通过token调用调用交易二次短信验证接口[/api/Cloud_wallet/validationSms]
+     * @return name:txn_seqno type:string default:0 desc:商户系统唯一交易流水号，当交易需要二次验证的时候，需要传这个参数[/api/Cloud_wallet/validationSms]
+     * @return name:total_amount type:float default:0 desc:订单总金额，当交易需要二次验证的时候，需要传这个参数[/api/Cloud_wallet/validationSms]
+     *
+     */
+    public function cloudWalletWithdraw()
+    {
+        if(!checkAuth($this->uid)) $this->error('维护中.....');
+        if (redisSetNx('cloudWalletWithdraw'.$this->uid,3)){
+            $v = getConfigValue('withdraw_switch');
+            if (!$v) $this->error('维护中，暂时关闭');
+            $redis = new Redis(['select'=>2]);
+            $redis_value = $redis->get('cloudWalletWithdraw'.$this->uid);
+            if ($redis_value){
+                $this->error('请求过快,请稍后重试');
+            }else{
+                $redis->set('cloudWalletWithdraw'.$this->uid,1,3);
+            }
+            $money = input('money');
+            $withdraw_type = input('withdraw_type','bank');
+            if($withdraw_type != 'bank') $this->error('提现方式错误'.$withdraw_type);
+            $cloud_password = input('cloud_password');
+            $source = input('source');
+            $random_key = input('random_key');
+            if (!$money) $this->error('参数错误');
+            $user = Db::name('store_member')->where('id',$this->uid)->find();
+            $withdraw_min_price = getConfigValue('withdraw_min_price');  //最小提现金额
+            $withdraw_max_price = getConfigValue('withdraw_max_price');  //最大提现金额
+            $poundage_proportion = getConfigValue('poundage_proportion');    //手续费百分比
+            $discount  = getMemberServiceCharge($this->uid);// 折扣
+            $poundage_proportion = bcmul($poundage_proportion,$discount);
+            if ($money < $withdraw_min_price) $this->error('最低提现'.$withdraw_min_price.'元');
+            if ($money > $withdraw_max_price) $this->error('最大提现'.$withdraw_max_price.'元');
+            if($withdraw_type == 'bank' && !$user['bank_num'])$this->error('请先绑定银行卡');
+            Db::startTrans();
+            try {
+                $data['mid'] = $this->uid;
+                $data['withdraw_type'] = $withdraw_type;
+                $order_no = get_order_sn();
+                $data['order_no'] = $order_no;
+                $data['price'] = $money;
+                $data['poundage_proportion'] = $poundage_proportion;
+                $proportion = sprintf("%.2f", $money*($poundage_proportion/100));    //四舍五入保留两位小数点
+                $data['proportion'] = $proportion;
+                $real_money = $money-$proportion;
+                $data['real_money'] = $real_money;
+                switch ($withdraw_type){
+                    case 'bank':
+                        $data['account_no'] = $user['bank_num'];
+                        $data['account_name']=$user['bank_user'];
+                        break;
+                }
+                Db::name('cloud_wallet_withdraw')->insertGetId($data);
                 $risk_item = risk_item($user,'云钱包提现',$source);
                 $cloud_res =  LianLianPay::cloudWalletWithdrawal($this->uid,$money,$proportion,$user['bank_num'],$cloud_password,$risk_item,$random_key);
                 if(!in_array($cloud_res['ret_code'],['0000','8888','8889']) )throw new Exception($cloud_res['ret_msg']);
@@ -1111,12 +1183,11 @@ class UserCenter extends Base
                 Db::rollback();
                 $this->error($e->getMessage());
             }
-            DelRedisSetNx('withdraw'.$this->uid);
+            DelRedisSetNx('cloudWalletWithdraw'.$this->uid);
             $this->success('提现申请成功，等待审核！',$cloud_res);
         }else{
             $this->error('服务器繁忙，请稍后重试');
         }
-
     }
 
     /**

application/common/library/LianLianPay.php

@@ -6,6 +6,7 @@ use llianpay\accp\params\TradeCreateOrderInfo;
 use llianpay\accp\params\TradeCreatePayeeInfo;
 use llianpay\accp\params\GetRandomParams;
 use llianpay\accp\params\TradeCreatePayerInfo;
+
 date_default_timezone_set('Asia/Shanghai');
 header('Content-type:application/json;charset=utf-8');
 require_once env('root_path').'application/common/library/llp/src/cfg.php';
@@ -17,7 +18,7 @@ require_once env('root_path').'application/common/library/llp/src/params/TradeCr
 require_once env('root_path').'application/common/library/llp/src/params/GetRandomParams.php';
 class LianLianPay
 {
-    protected static $env = 0; //  0 测试环境 1正式环境
+    protected static $env = 1; //  0 测试环境 1正式环境
     protected static $prefix = 'xl_'; //  0 测试环境 1正式环境
     protected static $cloud_url = [
         //用户申请接入[云钱包申请开户]
@@ -55,6 +56,12 @@ class LianLianPay
             'https://accpapi-ste.lianlianpay-inc.com/v1/txn/validation-sms',//测试环境
             'https://accpapi.lianlianpay.com/v1/txn/validation-sms',//生产环境
         ],
+
+        //交易二次短信验证
+        'level'=>[
+            'https://accpapi-ste.lianlianpay-inc.com/v1/acctmgr/modify-user-level',//测试环境
+            'https://accpapi.lianlianpay.com/v1/acctmgr/modify-user-level',//生产环境
+        ],
         // 支付
         'cashier'=>[
             'https://accpgw-ste.lianlianpay-inc.com/v1/cashier/paycreate',//测试环境
@@ -141,7 +148,7 @@ class LianLianPay
         $user_id = static::$prefix.$user_id;
         //$random_key = static::getRandomKey($user_id);
         $current = date("YmdHis");
-        $notify_url = 'https://'.$_SERVER['HTTP_HOST'] . '/api/Pay/withdrawalNotify';
+        $notify_url = 'https://'.$_SERVER['HTTP_HOST'] . '/api/Notify/withdrawalNotify';
         $params = [
             'timestamp' => $current,
             'oid_partner' => OID_PARTNER,
@@ -235,6 +242,25 @@ class LianLianPay
         return json_decode($result,true);
     }
 
+    public static function userLevel($user_id)
+    {
+        $user_id = static::$prefix.$user_id;
+        $current = date("YmdHis");
+        $params = [
+            'timestamp' => $current,
+            'oid_partner' => OID_PARTNER,
+            'user_id' => $user_id,
+            'txn_seqno' => get_order_sn(),
+            'txn_time'=>$current,
+            'accountInfo'=>[
+                'account_type'=>'PERSONAL_PAYMENT_ACCOUNT',
+                'account_need_level'=>'V3',
+            ]
+        ];
+        //var_dump(json_encode($params));
+        $result = LLianPayClient::sendRequest(self::$cloud_url['level'][static::$env], json_encode($params));
+        return json_decode($result,JSON_UNESCAPED_UNICODE);
+    }