fix bug

f950435a · 冷斌 · 65cae3e5 · f950435a · f950435a
Commit f950435a authored May 10, 2020 by 冷斌
Show whitespace changes
Inline Side-by-side

Showing with 56 additions and 62 deletions

application/Appapi/Controller/RechangeController.class.php
+55 -52

themes/simplebootx/Appapi/Rechange/index.html
+1 -10

No files found.
--- a/application/Appapi/Controller/RechangeController.class.php
+++ b/application/Appapi/Controller/RechangeController.class.php
@@ -16,8 +16,8 @@ class RechangeController extends HomebaseController
 {
    public function index()
    {
-        $chargelist=M('charge_rules')->field('id,coin,money,money_ios,product_id,give')->order('orderno asc')->select();
+        $chargelist = M('charge_rules')->field('id,coin,money,money_ios,product_id,give')->order('orderno asc')->select();
-        $this->assign('chargelist',$chargelist);
+        $this->assign('chargelist', $chargelist);
        $this->display();
    }
@@ -31,13 +31,13 @@ class RechangeController extends HomebaseController
                'appSecret'  => '7f8291af4e0795ee375f66487a721627', // 公众号 秘钥
                'mch_id'     => '1587472431', //  商户号 id
                'key'        => 'hkLfAAmPx6TxsinuyciefzFivk6yE4r4', // 商户 key
-                'notify_url' => '/pay/wx',
+                'notify_url' => 'http://' . $_SERVER['HTTP_HOST'] . '/wxpay/notify_url.php',
 //            'cert_client' => __DIR__ . '/apiclient_cert.pem', // optional, 退款，红包等情况时需要用到
 //            'cert_key'    => __DIR__ . '/apiclient_key.pem',// optional, 退款，红包等情况时需要用到
            ],
            'alipay' => [
                'app_id'         => '2021001155692232',
-                'notify_url'     => '/',
+                'notify_url'     => 'http://' . $_SERVER['HTTP_HOST'] . '/alipay/alipay_app/notify_url.php',
 //                'return_url' => 'http://yansongda.cn/return.php',
                'ali_public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkXI1E4BN+iJecnOHMkSwMDPQWkoyqqYJujea5DYKViQ5jVh2CGjGwxnwsDobWR3z015mbw1rmw9ioi0TjeefUZmyi17BmlFyJPMLNy5O0hv1Bo+SnQE1PAbgWakYecXhpaeIGBf3YTF/qq5lZHPP7PMTNn11s6BXKoXMPqD9jv+PObG8PJWxh/oUMCBlthOCkEBsOqe0nNtHdXHG45dAa5NwqjGg2B+Q6AaCBkKDmbiwWGXTtu7gHZnzTpuKaZudCaF335Iu7PAfH6hMQxroes26F+dxPwA+FTaczp8RA0c7F5tZBcrXkW3S8gnKWSlZu9do1ZmoaiggRN26c57bQIDAQAB',
                'private_key'    => 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCL3lwAq5DY7YFFr8rCtFEK7zl1cbKLPFcQyrBReuVjROo6wMIT0I+/2zUOew5M/8h/nhf8OSFRNypjWzC57h98aO6i6fG5nfPWYn0+I9Dl/kZXEdljgT0pg3nBQ0fOvnxc6tLVC7DXn3qVMJ++z9wolme65KwVPdn4KJAgBtliz13Be48+kYYnnNtxSJfKbr4X6oCZlGFgr2p4fWyddqJb0+//kc18p5o/clqXO/aWwXnWcWwVuBZbxIqvhF7mGj+SwTI/+T1sPTUI/hlcMIv8TGVB40lVZSDgb/a6/nQKezdvHX8+p/krTyQwQ5B/4u24lkISPLSwop5TRGRsusnnAgMBAAECggEASx3/sUhzAV4EyGVR8uGeiM3TwRRv/EFKzTTeHtRu77JqTWWKldOz8CkNRJqoIohYqNlCLm6MSy7ib/vgnmqZtFoyl4InFTYUZ7X7Z20a2vqF0ms+oicdrvbyY+37WbiJ1+kxk8O0lQkMb6Vula7SoWWtjf0TwlC2iIVYairjgyHpR+t3KceX0cto+hE1Bbcq394VPAddHqQbIXYp83IEGozXdtn70xPhNfyIZ51AmpKIOGSjmwZi24+sFUrhGtcVKYeopHOtsl/4HpWLZ5+SCZM7JA9nfX5GmMKXdc67mjRkE/2BYe9hOPybZV7Prz0A2m2vPZMOyWU/8M/wHsu76QKBgQDOU4MF0eJuVbBvItyryH1G0zdqqpwWhQQKFmxOt/BHiSz5DoUPPu6jh0H2190Xjg86FkUV4f7lT7MfSktO0ZV8vnH1QDMvDKCRNgIt4FXgbOE0A3cokdz8s7rbd7oJ8F34cI5PIcYuFHDogR9BF4vh7uLN4wHRltJMhYBikWKidQKBgQCtit6koeILtt9Nucg4U8+GL4yJRCEQ0vJyLyEk7OwL9gtyIA+6QT62EzAPOuzpLJ5Mu/Dtk8/IkN5ExjECIcTvC/0BKvInQzKEqT6pARKvRp4qgbCJflPd+rOqLl6YdJv5jY5txebau0xC9Sks98mI/tQxjwonLu9utwIbinr3awKBgC/mhYGhY484B5kVn+OlzSfXO4NhDpHP2cs5v3VbEMaa2z0LGOscMiz25uKW5PZl/bT/nJRi/llgcnZuOiOXVrw6PpywhfGDXfe4cTMTZPyQaow3zb82dfaZB2WSWzeZfUeDYhaPAcKK7lecOpRTEh+m5TLlY/OzrykiyVaY6CxNAoGBAJi7VUMzLcv9f/3Z+bqJGGUSR+8uxKMX5ERV8iebVAsa2evxB6Z2cYiwzmU5CPQWTqNd7KZKpl3wEY4Zl1w2+CkiNeLnNwMTAsz6XqlCxnz3+4+RYBtB0PHWCHVIJfyq8/LngGhf+dKbcHylYz2uPfKRw5JyPw9JIXQhIHu4noxNAoGAEG+IFWJJlOMuFWrsWQ3sqQ6VUNA1magFzndOd6rXpJTBS/jN1V6xyGujylmxA9XpzyCNakgzMcaaDFKon0MsHJKPHKLbhB0EYj4HZDUvlil3FeeOadZLhBUvO6tX1yG7bQCWh2BzBkP/pghixKaZLLdtbU/BN3oul1lTx7BYGT8=',
@@ -52,51 +52,50 @@ class RechangeController extends HomebaseController
    protected function getOrderId()
    {
-        $uid =I('uid');
+        $uid = I('uid');
-        $chargeid=I('chargeid');
+        $chargeid = I('chargeid');
-        $rs=array(
+        $rs = [
-            'code'=>0,
+            'code' => 0,
-            'data'=>array(),
+            'data' => [],
-            'msg'=>'',
+            'msg'  => '',
-        );
+        ];
        if (empty($uid)) {
-            $rs['code']=1001;
+            $rs['code'] = 1001;
-            $rs['msg']='用户ID不能为空';
+            $rs['msg'] = '用户ID不能为空';
        } else {
-            $userinfo=M("users")->field("id,user_nicename,avatar_thumb,coin")->where("id='{$uid}'")->find();
+            $userinfo = M("users")->field("id,user_nicename,avatar_thumb,coin")->where("id='{$uid}'")->find();
            if (!$userinfo) {
-                $rs['code']=1002;
+                $rs['code'] = 1002;
-                $rs['msg']='用户不存在';
+                $rs['msg'] = '用户不存在';
            } else {
-                $charge=M("charge_rules")->where("id={$chargeid}")->find();
+                $charge = M("charge_rules")->where("id={$chargeid}")->find();
-                if($charge){
+                if ($charge) {
-                    $orderid=$uid.'_'.date('YmdHis').rand(100,999);
+                    $orderid = $uid . '_' . date('YmdHis') . rand(100, 999);
-                    $orderinfo=array(
+                    $orderinfo = [
-                        "uid"=>$uid,
+                        "uid"       => $uid,
-                        "touid"=>$uid,
+                        "touid"     => $uid,
-                        "money"=>$charge['money'],
+                        "money"     => $charge['money'],
-                        "coin"=>$charge['coin'],
+                        "coin"      => $charge['coin'],
-                        "coin_give"=>$charge['give'],
+                        "coin_give" => $charge['give'],
-                        "orderno"=>$orderid,
+                        "orderno"   => $orderid,
-                        "type"=>'2',
+                        "type"      => '2',
-                        "ambient"=>'1',
+                        "ambient"   => '1',
-                        "status"=>0,
+                        "status"    => 0,
-                        "addtime"=>time()
+                        "addtime"   => time(),
-                    );
+                    ];
-//                    $result=M("users_charge")->add($orderinfo);
+                    $result = M("users_charge")->add($orderinfo);
                    $result = 1;
-                    if($result){
+                    if ($result) {
-                        $rs['data']['uid']=$uid;
+                        $rs['data']['money'] = $charge['money'];
-                        $rs['data']['money']=$charge['money'];
+                        $rs['data']['orderid'] = $orderid;
-                        $rs['data']['orderid']=$orderid;
+                    } else {
-                    }else{
+                        $rs['code'] = 1003;
-                        $rs['code']=1003;
+                        $rs['msg'] = '订单生成失败';
-                        $rs['msg']='订单生成失败';
                    }
-                }else{
+                } else {
-                    $rs['code']=1004;
+                    $rs['code'] = 1004;
-                    $rs['msg']='订单信息错误';
+                    $rs['msg'] = '订单信息错误';
                }
            }
        }
@@ -107,29 +106,33 @@ class RechangeController extends HomebaseController
    public function wx()
    {
        $order = $this->getOrderId();
-        var_dump($order);
+        if ($order['code'] > 0) {
+            echo json_encode(["ret" => $order['code'], 'msg' => $order['msg']]);
            die;
+        }
        $data = [
            'ulr' => $this->getPay()->driver('wechat')->gateway('wap')->pay([
-                'out_trade_no' => time(),           // 订单号
+                'out_trade_no' => $order['data']['orderid'],
-                'total_fee'    => '1',              // 订单金额，**单位：分**
+                'total_fee'    => $order['data']['money'] * 100,
-                'body'         => '测试支付',                   // 订单描述
+                'body'         => '账户充值',
-//            'spbill_create_ip' => '',       // 支付人的 IP
            ]),
        ];
        echo json_encode(["ret" => 200, 'data' => $data, 'msg' => '']);
        die;
    }
    public function alipay()
    {
+        $order = $this->getOrderId();
+        if ($order['code'] > 0) {
+            echo json_encode(["ret" => $order['code'], 'msg' => $order['msg']]);
+            die;
+        }
        $data = [
            'html' => $this->getPay()->driver('alipay')->gateway('wap')->pay([
-                'out_trade_no' => time(),           // 订单号
+                'out_trade_no' => $order['data']['orderid'],
-                'total_amount' => '0.01',              // 订单金额，
+                'total_amount' => $order['data']['money'],
-                'subject'      => '测试支付',                   // 订单描述
+                'subject'      => '账户充值',
-//            'spbill_create_ip' => '',       // 支付人的 IP
            ]),
        ];

--- a/themes/simplebootx/Appapi/Rechange/index.html
+++ b/themes/simplebootx/Appapi/Rechange/index.html
@@ -85,27 +85,18 @@
                        data:{ uid: _this.userId },
                        dataType:'json',
                        success:function(data){
-                            console.log(data);
                            if(data.code == 0) {
                                _this.zuanNum = data.data.coin;
                                _this.face = data.data.avatar_thumb;
                                _this.nickname = data.data.user_nicename;
-                                // $("#nice_name").html(data.data.user_nicename);
-                                // $("#avatar").attr('src',data.data.avatar_thumb);
-                                // $("#coin").html(data.data.coin);
-                                // $(that).attr('data-uid',data.data.id);
-                                // $("#userinfo").show();
                            } else {
                                layer.msg(data.msg);
                            }
                        },
                        error:function(e){
-                            console.log(e);
+                            layer.msg(e.msg);
                        }
                    })
                },
                wx() {
                    let _this = this;