合并分支 '1iuzhen' 到 'master'

订单添加优化



查看合并请求 !220

@@ -20,8 +20,6 @@ class IndexController extends HomeBaseController
     protected $abc;
     protected $abc;
     public function index()
     public function index()
     {
     {
-//        $href = file_get_contents('http://suo.im/api.php?format=json&url=http%3a%2f%2fwww.baidu.com');
-//        echo json_decode($href, true)['url'];
         // 生成页面二维码（用户推广）
         // 生成页面二维码（用户推广）
         $url = url('index','','',true);
         $url = url('index','','',true);
         $qrcode = $this->createQRcode($url,'Q',9);
         $qrcode = $this->createQRcode($url,'Q',9);

@@ -172,6 +172,10 @@ class MemberSalesController extends HomeBaseController
                 $typeInfo['groupD'][] = $v;
                 $typeInfo['groupD'][] = $v;
             }
             }
         }
         }
+        // 生成输入订单确认码页面短网址
+//        $url = url('portal/Order/to_pay',[],true,true);
+//        $short_url = json_decode(file_get_contents('http://suo.im/api.php?format=json&url='.urlencode($url)),true)['url'];
+//        Cache::set('short_url',$short_url);
         $this->assign('default',$default);
         $this->assign('default',$default);
         $this->assign('goodsList',json_encode($goodsList));
         $this->assign('goodsList',json_encode($goodsList));
         $this->assign('myOrderUrl',url('portal/MemberSales/deal',['id'=>$id]));
         $this->assign('myOrderUrl',url('portal/MemberSales/deal',['id'=>$id]));
@@ -231,17 +235,15 @@ class MemberSalesController extends HomeBaseController
             if(!$result) {
             if(!$result) {
                 $this->error('电子订单生成失败');
                 $this->error('电子订单生成失败');
             }
             }
-//            $order_where = [
-//                'status' => 0,
-//                'over_time' => ['egt',time()],
-//                'delete_time' => 0
-//            ];
-//            $url = url('portal/Order/to_pay',[],true,true);
-//            $short_url = json_decode(file_get_contents('http://suo.im/api.php?format=json&url='.urlencode($url)),true)['url'];
-//            $text = '订单确认码：'.Session::get('user_sale.number').'.点击 '.$short_url.' 或关注【宛林儿童游乐】支付.详询4001107575.';
-//            $this->sendSMSS($mobile,$text);
-//            $numberList = $this->order_model->where($order_where)->column('number');
-//            Cache::set('number',$numberList);
+            $order_where = [
+                'status' => 0,
+                'over_time' => ['egt',time()],
+                'delete_time' => 0
+            ];
+            $text = '订单确认码：'.Session::get('user_sale.number').'.点击 http://suo.im/51dOVK 或关注【宛林儿童游乐】支付.详询4001107575.';
+            $this->sendSMSS($mobile,$text);
+            $numberList = $this->order_model->where($order_where)->column('number');
+            Cache::set('number',$numberList);
             $this->success('订单生成成功','',Session::get('user_sale.number'));
             $this->success('订单生成成功','',Session::get('user_sale.number'));
         }
         }
     }
     }