1

.idea/workspace.xml

@@ -4,6 +4,7 @@
     <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/Notify.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Notify.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Recharge.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Recharge.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -217,7 +218,9 @@
       <workItem from="1665535774839" duration="2954000" />
       <workItem from="1665543792569" duration="7208000" />
       <workItem from="1665621143495" duration="2513000" />
-      <workItem from="1665708328289" duration="5111000" />
+      <workItem from="1665708328289" duration="8744000" />
+      <workItem from="1665794611802" duration="1412000" />
+      <workItem from="1665967743750" duration="1346000" />
     </task>
     <task id="LOCAL-00001" summary=".">
       <created>1663731279977</created>
@@ -257,10 +260,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1242" y="398" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1663731298581" />
-    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog" timestamp="1665710696137">
+    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog" timestamp="1665971423773">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1665710696137" />
+    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1665971423773" />
     <state x="1125" y="483" key="FileChooserDialogImpl" timestamp="1665476140468">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/api/controller/Notify.php

@@ -9,14 +9,14 @@ use llianpay\accp\params\TradeCreateOrderInfo;
 use llianpay\accp\params\TradeCreatePayeeInfo;
 use llianpay\accp\params\GetRandomParams;
 use llianpay\accp\params\TradeCreatePayerInfo;
-require env('root_path').'application/common/library/llp/src/security/LLianPayAccpSignature.php';
-require env('root_path').'application/common/library/llp/src/cfg.php';
-require env('root_path').'application/common/library/llp/src/client/LLianPayClient.php';
-require env('root_path').'application/common/library/llp/src/params/TradeCreateParams.php';
-require env('root_path').'application/common/library/llp/src/params/TradeCreateOrderInfo.php';
-require env('root_path').'application/common/library/llp/src/params/TradeCreatePayeeInfo.php';
-require env('root_path').'application/common/library/llp/src/params/TradeCreatePayerInfo.php';
-require env('root_path').'application/common/library/llp/src/params/GetRandomParams.php';
+require_once env('root_path').'application/common/library/llp/src/security/LLianPayAccpSignature.php';
+require_once env('root_path').'application/common/library/llp/src/cfg.php';
+require_once env('root_path').'application/common/library/llp/src/client/LLianPayClient.php';
+require_once env('root_path').'application/common/library/llp/src/params/TradeCreateParams.php';
+require_once env('root_path').'application/common/library/llp/src/params/TradeCreateOrderInfo.php';
+require_once env('root_path').'application/common/library/llp/src/params/TradeCreatePayeeInfo.php';
+require_once env('root_path').'application/common/library/llp/src/params/TradeCreatePayerInfo.php';
+require_once env('root_path').'application/common/library/llp/src/params/GetRandomParams.php';
 /**
  * 连连异步回调
  * Class Notify
@@ -36,20 +36,20 @@ class Notify extends Controller
     }
 
     // 连连充值异步回调
-    public function lianLianNotify()
+    public function cloudWalletNotify()
     {
+        $data   = input('post.');
         $header   =  app()->request->header();
-        $result = input('post.');
+        $result = $data;
         if($result['txn_status'] == 'TRADE_SUCCESS') {
             // 验签
-            $check_sign = LLianPayAccpSignature::checkSign(json_encode($result,JSON_UNESCAPED_UNICODE),$header['signature-data']);
+            $check_sign = LLianPayAccpSignature::checkSign(json_encode($data,JSON_UNESCAPED_UNICODE),$header['signature-data']);
             if(!$check_sign) return false;
             $orderNo = $result['orderInfo']['txn_seqno'];
-            $order = Db::name('store_recharge_order')->where('order_no',$orderNo)->find();
+            $order = Db::name('cloud_wallet_order')->where('order_no',$orderNo)->find();
             if (!$order) return false;
             if ($order['status']==1) return 'Success';
-            Db::name('store_recharge_order')->where('order_no',$orderNo)->update(['status'=>1,'pay_at'=>date('Y-m-d H:i:s')]);
-            memberMoneyChange($order['total_price'],3,$order['mid'],'余额充值',1,$order['id'],5);
+            Db::name('cloud_wallet_order')->where('order_no',$orderNo)->update(['status'=>1,'pay_at'=>date('Y-m-d H:i:s')]);
             return 'Success';
         }
     }
@@ -60,7 +60,7 @@ class Notify extends Controller
         $result = input('post.');
         $result['openAcctApplyNotify'] = 'openAcctApplyNotify';
         if($result['user_status'] == 'NORMAL') {
-             Db::name('store_member')->where('id',trim($result['user_id'],$this->prefix))->update(['cloud_wallet'=>1]);
+            Db::name('store_member')->where('id',trim($result['user_id'],$this->prefix))->update(['cloud_wallet'=>1]);
         }
 
     }

application/api/controller/Recharge.php

@@ -41,7 +41,7 @@ class Recharge extends Base
      */
     public function voucher()
     {
-        //if($this->uid != 73) $this->error('暂未开通');
+        if(!checkAuth($this->uid)) $this->error('维护中.....');
         if (redisSetNx($this->request->action().$this->uid,3)) {
             $money = input('post.money',0);
             $pay_type = input('post.pay_type','sd_rapid');
@@ -49,7 +49,8 @@ class Recharge extends Base
             $typecode = $from == 1 ? 4:5;
             if($money <=0 ) $this->error('充值金额有误！');
             $money = bcadd($money,0,2);
-            //if($money < 10 )$this->error('最低充值10元！');
+            if($money < 10 && $this->uid != 73)$this->error('最低充值10元！');
+            if($pay_type != 'll')$this->error('维护中，请选择其他支付方式');
             $user = Db::name('store_member')->where('id',$this->uid)->find();
             if(!$user['true_name'] || !$user['id_card']) $this->error('请实名认证,在进行订单支付');
             Db::startTrans();
@@ -102,15 +103,13 @@ class Recharge extends Base
                     case 'll':
                         $notify_url = 'https://'.$_SERVER['HTTP_HOST'] . '/api/Pay/lianLianNotify';
                         $return_url ='https://'.$_SERVER['HTTP_HOST']."/h5/pages/mine/mine?id={$order_id}&orderNo={$voucher_order['order_no']}";//回调地址
-                        $risk_item= risk_item($user,'余额充值',$from == 1 ? 16 : 10);
-                        $payeeInfo =[[
+                        $risk_item= risk_item($user,'订单支付',$from == 1 ? 16 : 10);
+                        $res= LianLianPay::cashierPay($voucher_order['order_no'],$money,$this->uid,$notify_url,$return_url,'余额充值',[[
                             'payee_id'=>OID_PARTNER,
                             'payee_type' => 'MERCHANT',
                             'payee_amount' => $money,
-                        ]];
-                        $res= LianLianPay::cloudWalletRecharge($voucher_order['order_no'],$money,$this->uid,$notify_url,$return_url,'余额充值',$risk_item);
+                        ]],$risk_item);
                         $retrun_data = $res['pay_result'];
-                       // $retrun_data['request_params'] = $res['request_params'];
                         break;
                 }
                 Db::commit();
@@ -128,4 +127,67 @@ class Recharge extends Base
     }
 
 
+    /**
+     * @title 云钱包余额充值
+     * @desc  云钱包余额充值
+     * @author  Qc
+     * @url /api/Recharge/cloudWalletVoucher
+     * @method POST
+     * @header name:Authorization require:1 desc:Token
+     * @param name:money type:int require:1 default:1 desc:充值金额
+     * @param name:from type:int require:1 default1 desc:1:h5,2:app[Android],3：app[ios]
+     * @return name:order_no type:string default:0 desc:支付单号
+     * @return name:id type:int default:0 desc:支付订单id
+     * @return name:extend type:int default:0 desc:用户id
+     * @return name:pay type:array default:0 desc:支付信息
+     * @return name:pay.body type:array default:0 desc:支付信息
+     * @return name:pay.totalAmount type:string default:0 desc:支付金额【000000010000是100元】
+     * @return name:pay.orderCode type:string default:0 desc:支付单号
+     * @return name:pay.credential type:string default:0 desc:正书
+     */
+    public function cloudWalletVoucher()
+    {
+        if(!checkAuth($this->uid)) $this->error('维护中.....');
+        if (redisSetNx($this->request->action().$this->uid,3)) {
+            $money = input('post.money',0);
+            $from = input('post.from',1);
+            if($money <=0 ) $this->error('充值金额有误！');
+            $money = bcadd($money,0,2);
+            $user = Db::name('store_member')->where('id',$this->uid)->find();
+            if(!$user['true_name'] || !$user['id_card']) $this->error('请实名认证,在进行订单支付');
+            Db::startTrans();
+            try{
+                $voucher_order = [
+                    'mid' => $this->uid ,
+                    'total_price' => $money,
+                    'order_no' =>get_order_sn(),
+                    'pay_no' =>get_order_sn(),
+                    'create_at' => date("Y-m-d H:i:s"),
+                    'pay_type' => 'll',
+                    'ext' => json_encode(['name'=>$user['true_name'],'phone'=>$user['phone'],'id_card'=>$user['id_card']])
+                ];
+                $order_id = Db::table('cloud_wallet_order')->insertGetId($voucher_order);
+                $notify_url = 'https://'.$_SERVER['HTTP_HOST'] . '/api/Notify/cloudWalletNotify';
+                $return_url ='https://'.$_SERVER['HTTP_HOST']."/h5/pages/mine/mine?id={$order_id}&orderNo={$voucher_order['order_no']}";//回调地址
+                $risk_item= risk_item($user,'余额充值',$from == 1 ? 16 : 10);
+                $res= LianLianPay::cloudWalletRecharge($voucher_order['order_no'],$money,$this->uid,$notify_url,$return_url,'余额充值',$risk_item);
+                $retrun_data = $res['pay_result'];
+                Db::commit();
+            }catch (\Exception $e){
+                Db::rollback();
+                DelRedisSetNx($this->request->action().$this->uid);
+                $this->error($e->getMessage());
+            }
+            DelRedisSetNx($this->request->action().$this->uid);
+            $this->success('ok',$retrun_data);
+        }else{
+            $this->error('服务器繁忙');
+        }
+    }
+
+
+
+
+
+
 }