Merge branch 'sess_0306' of 121.43.114.153:/home/git/repositories/shopnc into sess_0306

data/logic/queue.logic.php

@@ -6,28 +6,32 @@
  * QueueClient::push('editGroupbuySaleCount',$groupbuy_info);
  * public function editGroupbuySaleCount($groupbuy_info){...}
  *
- 
+
  */
 defined('InShopNC') or exit('Access Invalid!');
 
-class queueLogic {
+class queueLogic
+{
 
     /**
      * 添加会员积分
      * @param unknown $member_info
      */
-    public function addPoint($member_info) {
+    public function addPoint($member_info)
+    {
         $points_model = Model('points');
-        $points_model->savePointsLog('login',array('pl_memberid'=>$member_info['member_id'],'pl_membername'=>$member_info['member_name']),true);
+        $points_model->savePointsLog('login', array('pl_memberid' => $member_info['member_id'], 'pl_membername' => $member_info['member_name']), true);
         return callback(true);
     }
+
     /**
      * 添加会员经验值
      * @param unknown $member_info
      */
-    public function addExppoint($member_info) {
+    public function addExppoint($member_info)
+    {
         $exppoints_model = Model('exppoints');
-        $exppoints_model->saveExppointsLog('login',array('exp_memberid'=>$member_info['member_id'],'exp_membername'=>$member_info['member_name']),true);
+        $exppoints_model->saveExppointsLog('login', array('exp_memberid' => $member_info['member_id'], 'exp_membername' => $member_info['member_name']), true);
         return callback(true);
     }
 
@@ -36,14 +40,15 @@ class queueLogic {
      * @param unknown $groupbuy_info
      * @throws Exception
      */
-    public function editGroupbuySaleCount($groupbuy_info) {
+    public function editGroupbuySaleCount($groupbuy_info)
+    {
         $model_groupbuy = Model('groupbuy');
         $data = array();
-        $data['buyer_count'] = array('exp','buyer_count+1');
-        $data['buy_quantity'] = array('exp','buy_quantity+'.$groupbuy_info['quantity']);
-        $update = $model_groupbuy->editGroupbuy($data,array('groupbuy_id'=>$groupbuy_info['groupbuy_id']));
+        $data['buyer_count'] = array('exp', 'buyer_count+1');
+        $data['buy_quantity'] = array('exp', 'buy_quantity+' . $groupbuy_info['quantity']);
+        $update = $model_groupbuy->editGroupbuy($data, array('groupbuy_id' => $groupbuy_info['groupbuy_id']));
         if (!$update) {
-            return callback(false,'更新抢购信息失败groupbuy_id:'.$groupbuy_info['groupbuy_id']);
+            return callback(false, '更新抢购信息失败groupbuy_id:' . $groupbuy_info['groupbuy_id']);
         } else {
             return callback(true);
         }
@@ -54,11 +59,12 @@ class queueLogic {
      * @param $input_voucher_list
      * @throws Exception
      */
-    public function editVoucherState($voucher_list) {
+    public function editVoucherState($voucher_list)
+    {
         $model_voucher = Model('voucher');
         $send = new sendMemberMsg();
         foreach ($voucher_list as $store_id => $voucher_info) {
-            $update = $model_voucher->editVoucher(array('voucher_state'=>2),array('voucher_id'=>$voucher_info['voucher_id']),$voucher_info['voucher_owner_id']);
+            $update = $model_voucher->editVoucher(array('voucher_state' => 2), array('voucher_id' => $voucher_info['voucher_id']), $voucher_info['voucher_owner_id']);
             if ($update) {
                 // 发送用户店铺消息
                 $send->set('member_id', $voucher_info['voucher_owner_id']);
@@ -68,7 +74,7 @@ class queueLogic {
                 $param['voucher_url'] = urlShop('member_voucher', 'index');
                 $send->send($param);
             } else {
-                return callback(false,'更新代金券状态失败vcode:'.$voucher_info['voucher_code']);
+                return callback(false, '更新代金券状态失败vcode:' . $voucher_info['voucher_code']);
             }
         }
         return callback(true);
@@ -78,16 +84,17 @@ class queueLogic {
      * 下单变更库存销量
      * @param unknown $goods_buy_quantity
      */
-    public function createOrderUpdateStorage($goods_buy_quantity) {
+    public function createOrderUpdateStorage($goods_buy_quantity)
+    {
         $model_goods = Model('goods');
         foreach ($goods_buy_quantity as $goods_id => $quantity) {
             $data = array();
-            $data['goods_storage'] = array('exp','goods_storage-'.$quantity);
-            $data['goods_salenum'] = array('exp','goods_salenum+'.$quantity);
+            $data['goods_storage'] = array('exp', 'goods_storage-' . $quantity);
+            $data['goods_salenum'] = array('exp', 'goods_salenum+' . $quantity);
             $result = $model_goods->editGoodsById($data, $goods_id);
         }
         if (!$result) {
-            return callback(false,'变更商品库存与销量失败');
+            return callback(false, '变更商品库存与销量失败');
         } else {
             return callback(true);
         }
@@ -97,16 +104,17 @@ class queueLogic {
      * 取消订单变更库存销量
      * @param unknown $goods_buy_quantity
      */
-    public function cancelOrderUpdateStorage($goods_buy_quantity) {
+    public function cancelOrderUpdateStorage($goods_buy_quantity)
+    {
         $model_goods = Model('goods');
         foreach ($goods_buy_quantity as $goods_id => $quantity) {
             $data = array();
-            $data['goods_storage'] = array('exp','goods_storage+'.$quantity);
-            $data['goods_salenum'] = array('exp','goods_salenum-'.$quantity);
+            $data['goods_storage'] = array('exp', 'goods_storage+' . $quantity);
+            $data['goods_salenum'] = array('exp', 'goods_salenum-' . $quantity);
             $result = $model_goods->editGoodsById($data, $goods_id);
         }
         if (!$result) {
-            return callback(false,'变更商品库存与销量失败');
+            return callback(false, '变更商品库存与销量失败');
         } else {
             return callback(true);
         }
@@ -116,10 +124,11 @@ class queueLogic {
      * 更新F码为使用状态
      * @param int $fc_id
      */
-    public function updateGoodsFCode($fc_id) {
-        $update = Model('goods_fcode')->editGoodsFCode(array('fc_state' => 1),array('fc_id' => $fc_id));
+    public function updateGoodsFCode($fc_id)
+    {
+        $update = Model('goods_fcode')->editGoodsFCode(array('fc_state' => 1), array('fc_id' => $fc_id));
         if (!$update) {
-            return callback(false,'更新F码使用状态失败fc_id:'.$fc_id);
+            return callback(false, '更新F码使用状态失败fc_id:' . $fc_id);
         } else {
             return callback(true);
         }
@@ -129,11 +138,12 @@ class queueLogic {
      * 删除购物车
      * @param unknown $cart
      */
-    public function delCart($cart) {
+    public function delCart($cart)
+    {
         if (!is_array($cart['cart_ids']) || empty($cart['buyer_id'])) return callback(true);
-        $del = Model('cart')->delCart('db',array('buyer_id'=>$cart['buyer_id'],'cart_id'=>array('in',$cart['cart_ids'])));
+        $del = Model('cart')->delCart('db', array('buyer_id' => $cart['buyer_id'], 'cart_id' => array('in', $cart['cart_ids'])));
         if (!$del) {
-            return callback(false,'删除购物车数据失败');
+            return callback(false, '删除购物车数据失败');
         } else {
             return callback(true);
         }
@@ -141,14 +151,15 @@ class queueLogic {
 
     /**
      * 根据商品id更新促销价格
-     * 
-     * @param int/array $goods_commonid
+     *
+     * @param int /array $goods_commonid
      * @return boolean
      */
-    public function updateGoodsPromotionPriceByGoodsId($goods_id) {
+    public function updateGoodsPromotionPriceByGoodsId($goods_id)
+    {
         $update = Model('goods')->editGoodsPromotionPrice(array('goods_id' => array('in', $goods_id)));
         if (!$update) {
-            return callback(false,'根据商品ID更新促销价格失败');
+            return callback(false, '根据商品ID更新促销价格失败');
         } else {
             return callback(true);
         }
@@ -157,13 +168,14 @@ class queueLogic {
     /**
      * 根据商品公共id更新促销价格
      *
-     * @param int/array $goods_commonid
+     * @param int /array $goods_commonid
      * @return boolean
      */
-    public function updateGoodsPromotionPriceByGoodsCommonId($goods_commonid) {
+    public function updateGoodsPromotionPriceByGoodsCommonId($goods_commonid)
+    {
         $update = Model('goods')->editGoodsPromotionPrice(array('goods_commonid' => array('in', $goods_commonid)));
         if (!$update) {
-            return callback(false,'根据商品公共id更新促销价格失败');
+            return callback(false, '根据商品公共id更新促销价格失败');
         } else {
             return callback(true);
         }
@@ -172,7 +184,8 @@ class queueLogic {
     /**
      * 发送店铺消息
      */
-    public function sendStoreMsg($param) {
+    public function sendStoreMsg($param)
+    {
         $send = new sendStoreMsg();
         $send->set('code', $param['code']);
         $send->set('store_id', $param['store_id']);
@@ -183,7 +196,8 @@ class queueLogic {
     /**
      * 发送会员消息
      */
-    public function sendMemberMsg($param) {
+    public function sendMemberMsg($param)
+    {
         $send = new sendMemberMsg();
         $send->set('code', $param['code']);
         $send->set('member_id', $param['member_id']);
@@ -196,19 +210,20 @@ class queueLogic {
     /**
      * 生成商品F码
      */
-    public function createGoodsFCode($param) {
+    public function createGoodsFCode($param)
+    {
         $insert = array();
         for ($i = 0; $i < $param['fc_count']; $i++) {
             $array = array();
             $array['goods_commonid'] = $param['goods_commonid'];
-            $array['fc_code'] = strtoupper($param['fc_prefix']).mt_rand(100000,999999);
+            $array['fc_code'] = strtoupper($param['fc_prefix']) . mt_rand(100000, 999999);
             $insert[$array['fc_code']] = $array;
         }
         if (!empty($insert)) {
             $insert = array_values($insert);
             $insert = Model('goods_fcode')->addGoodsFCodeAll($insert);
             if (!$insert) {
-                return callback(false,'生成商品F码失败goods_commonid:'.$param['goods_commonid']);
+                return callback(false, '生成商品F码失败goods_commonid:' . $param['goods_commonid']);
             }
         }
         return callback(true);
@@ -217,18 +232,19 @@ class queueLogic {
     /**
      * 生成商品二维码
      */
-    public function createGoodsQRCode($param) {
+    public function createGoodsQRCode($param)
+    {
         if (empty($param['goodsid_array'])) {
             return callback(true);
         }
 
         // 生成商品二维码
-        require_once(BASE_RESOURCE_PATH.DS.'phpqrcode'.DS.'index.php');
+        require_once(BASE_RESOURCE_PATH . DS . 'phpqrcode' . DS . 'index.php');
         $PhpQRCode = new PhpQRCode();
-        $PhpQRCode->set('pngTempDir',BASE_UPLOAD_PATH.DS.ATTACH_STORE.DS.$param['store_id'].DS);
+        $PhpQRCode->set('pngTempDir', BASE_UPLOAD_PATH . DS . ATTACH_STORE . DS . $param['store_id'] . DS);
         foreach ($param['goodsid_array'] as $goods_id) {
             // 生成商品二维码
-            $PhpQRCode->set('date',urlShop('goods', 'index', array('goods_id'=>$goods_id)));
+            $PhpQRCode->set('date', urlShop('goods', 'index', array('goods_id' => $goods_id)));
             $PhpQRCode->set('pngTempName', $goods_id . '.png');
             $PhpQRCode->init();
         }
@@ -238,7 +254,8 @@ class queueLogic {
     /**
      * 清理特殊商品促销信息
      */
-    public function clearSpecialGoodsPromotion($param) {
+    public function clearSpecialGoodsPromotion($param)
+    {
         // 抢购
         Model('groupbuy')->delGroupbuy(array('goods_commonid' => $param['goods_commonid']));
         // 显示折扣
@@ -255,14 +272,15 @@ class queueLogic {
      * @param array $data 订单信息
      * @return boolean
      */
-    public function delOrderCountCache($order_info){
+    public function delOrderCountCache($order_info)
+    {
         if (empty($order_info)) return callback(true);
         $model_order = Model('order');
         if ($order_info['order_id']) {
-            $order_info = $model_order->getOrderInfo(array('order_id'=>$order_info['order_id']),array(),'buyer_id,store_id');
+            $order_info = $model_order->getOrderInfo(array('order_id' => $order_info['order_id']), array(), 'buyer_id,store_id');
         }
-        $model_order->delOrderCountCache('buyer',$order_info['buyer_id']);
-        $model_order->delOrderCountCache('store',$order_info['store_id']);
+        $model_order->delOrderCountCache('buyer', $order_info['buyer_id']);
+        $model_order->delOrderCountCache('store', $order_info['store_id']);
         return callback(true);
     }
 
@@ -271,30 +289,31 @@ class queueLogic {
      * @param unknown $param
      * @return boolean
      */
-    public function sendVrCode($param) {
+    public function sendVrCode($param)
+    {
         if (empty($param) && !is_array($param)) return callback(true);
         $condition = array();
         $condition['order_id'] = $param['order_id'];
         $condition['buyer_id'] = $param['buyer_id'];
         $condition['vr_state'] = 0;
         $condition['refund_lock'] = 0;
-        $code_list = Model('vr_order')->getOrderCodeList($condition,'vr_code,vr_indate');
+        $code_list = Model('vr_order')->getOrderCodeList($condition, 'vr_code,vr_indate');
         if (empty($code_list)) return callback(true);
 
         $content = '';
         foreach ($code_list as $v) {
-            $content .= $v['vr_code'].',';
+            $content .= $v['vr_code'] . ',';
         }
 
-        $tpl_info = Model('mail_templates')->getTplInfo(array('code'=>'send_vr_code'));
+        $tpl_info = Model('mail_templates')->getTplInfo(array('code' => 'send_vr_code'));
         $data = array();
-        $data['site_name']	= C('site_name');
-        $data['vr_code'] = rtrim($content,',');
-        $message	= ncReplaceText($tpl_info['content'],$data);
+        $data['site_name'] = C('site_name');
+        $data['vr_code'] = rtrim($content, ',');
+        $message = ncReplaceText($tpl_info['content'], $data);
         $sms = new Sms();
-        $result = $sms->send($param["buyer_phone"],$message);
+        $result = $sms->send($param["buyer_phone"], $message);
         if (!$result) {
-            return callback(false,'兑换码发送失败order_id:'.$param['order_id']);
+            return callback(false, '兑换码发送失败order_id:' . $param['order_id']);
         } else {
             return callback(true);
         }
@@ -303,7 +322,8 @@ class queueLogic {
     /**
      * 添加订单自提表内容
      */
-    public function saveDeliveryOrder($param) {
+    public function saveDeliveryOrder($param)
+    {
         if (!is_array($param['order_sn_list'])) return callback(true);
         $data = array();
         $model_delivery_order = Model('delivery_order');
@@ -317,7 +337,7 @@ class queueLogic {
             $data['reciver_mobphone'] = $param['mob_phone'];
             $insert = $model_delivery_order->addDeliveryOrder($data);
             if (!$insert) {
-                return callback(false,'保存自提站订单信息失败order_sn:'.$v['order_sn']);
+                return callback(false, '保存自提站订单信息失败order_sn:' . $v['order_sn']);
             }
         }
         return callback(true);
@@ -326,17 +346,18 @@ class queueLogic {
     /**
      * 发送提货码短信消息
      */
-    public function sendPickupcode($param) {
+    public function sendPickupcode($param)
+    {
         $dorder_info = Model('delivery_order')->getDeliveryOrderInfo(array('order_id' => $param['order_id']), 'reciver_mobphone');
-        $tpl_info = Model('mail_templates')->getTplInfo(array('code'=>'send_pickup_code'));
+        $tpl_info = Model('mail_templates')->getTplInfo(array('code' => 'send_pickup_code'));
         $data = array();
         $data['site_name'] = C('site_name');
         $data['pickup_code'] = $param['pickup_code'];
-        $message = ncReplaceText($tpl_info['content'],$data);
+        $message = ncReplaceText($tpl_info['content'], $data);
         $sms = new Sms();
-        $result = $sms->send($dorder_info['reciver_mobphone'],$message);
+        $result = $sms->send($dorder_info['reciver_mobphone'], $message);
         if (!$result) {
-            return callback(false,'发送提货码短信消息失败order_id:'.$param['order_id']);
+            return callback(false, '发送提货码短信消息失败order_id:' . $param['order_id']);
         } else {
             return callback(true);
         }
@@ -345,10 +366,29 @@ class queueLogic {
     /**
      * 刷新搜索索引
      */
-    public function flushIndexer() {
-        require_once(BASE_DATA_PATH.'/api/xs/lib/XS.php');
+    public function flushIndexer()
+    {
+        require_once(BASE_DATA_PATH . '/api/xs/lib/XS.php');
         $obj_doc = new XSDocument();
         $obj_xs = new XS(C('fullindexer.appname'));
         $obj_xs->index->flushIndex();
     }
+
+    /**
+     * 推送服务
+     */
+    public function upushSendMsg($param)
+    {
+
+        $push = new upush();
+        $push->ticker = $param['ticker'];
+        $push->member_id = $param['member_id'];
+        $push->title = $param['title'];
+        $push->text = $param['text'];
+
+        list($ret_code, $ret_content) = $push->android_push();
+        $return_info = json_decode($ret_content);
+        joutput_data($return_info);
+        return;
+    }
 }

helper/umeng.php

@@ -6,7 +6,7 @@
  * Date: 2016/4/15
  * Time: 16:27
  */
-// 发送类型，安卓还是ios
+// 发送类型, android 或者 ios
 class platform_type extends SplEnum
 {
     const __default = self::unicast;
@@ -66,7 +66,8 @@ class upush
     private $alias;
 
     // 个人信息
-    private $devices_token;
+    private $member_id = array();     // 必填选项
+    private $devices_token = array();
 
     // 通知展示内容
     private $ticker;
@@ -148,7 +149,8 @@ class upush
         $pack['appkey'] = self::APPKEY;
         $pack['timestamp'] = time();
         $pack['type'] = msg_type::unicast;
-        $pack['device_tokens'] = "Aj9AympPsCha5zmPhrV0DbnOZJYF0pqKY5jdKvFy_Hbu";
+//        $pack['device_tokens'] = "Aj9AympPsCha5zmPhrV0DbnOZJYF0pqKY5jdKvFy_Hbu";
+        $pack['device_tokens'] = $this->devices_token;
         $pack['alias_type'] = "";
         $pack['alias'] = "";
         $pack['file_id'] = "";
@@ -195,22 +197,30 @@ class upush
         return $pack;
     }
 
-    // ios 推送
-    public function android_push()
+    private function pre_pack()
     {
-        $pack_body = self::android_pack();
-        $url = self::PUSH_URL . '?sign=' . self::make_sign("POST", self::PUSH_URL, $pack_body, self::APP_MASTER_SECRET);
-        return $this->http_post_data($url, json_encode($pack_body));
-    }
+        if (!empty($this->member_id)) {
 
-    // ios 打包
-    private function ios_pack()
-    {
+            $result = Model()->table('device_binding')->where(array('member_id' => array('in', $this->member_id)))->select();
+            foreach ($result as $value) {
+                array_push($this->devices_token, $value['upush_device_token']);
+            }
+            return true;
+        } else {
+            return false;
+        }
     }
 
-    // ios 推送
-    public function ios_push()
+    // android 推送
+    public function android_push()
     {
+        $ret = $this->pre_pack();
+        if ($ret) {
+            $pack_body = self::android_pack();
+            $url = self::PUSH_URL . '?sign=' . self::make_sign("POST", self::PUSH_URL, $pack_body, self::APP_MASTER_SECRET);
+            return $this->http_post_data($url, json_encode($pack_body));
+        } else {
+            return array(600, '参数输入不完整');
+        }
     }
-
 }

mobile/control/control.php

@@ -123,6 +123,10 @@ class mobileControl
             if (!empty($page)) {
                 TPL::showpage($page);
             }
+
+            // 测试使用内容，还需要重新整理
+            joutput_data($data);
+
         } else if ($_SESSION['client_type'] == 'ajax') {
             echo "callback(";
             joutput_data($data);

mobile/control/test.php

@@ -67,6 +67,7 @@ class testControl extends mobileHomeControl
     {
         $push = new upush();
         $push->ticker = 'ticker';
+        $push->member_id = array('36496');
         list($ret_code, $ret_content) = $push->android_push();
 
         $return_info = json_decode($ret_content);

mobile/control/umeng.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * umeng 推送服务
+ *
+ ***/
+
+
+defined('InShopNC') or exit('Access Invalid!');
+
+class umengControl extends mbMemberControl
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * 更新device_token数据
+     */
+    public function updateOp()
+    {
+        $member_id = $_SESSION['member_id'];
+        $data = array();
+        $data['upush_device_token'] = trim($_GET['device_token']);
+        $data['updatetime'] = time();
+
+        // 判断用户是否存在
+        $ret = Model()->table('device_binding')->where(array('member_id' => $member_id))->select();
+
+        if (!empty($ret)) {
+            $ret = Model()->table('device_binding')->where(array('member_id' => $member_id))->update($data);
+        } else {
+            $data['member_id'] = $member_id;
+            $ret = Model()->table('device_binding')->insert($data);
+        }
+
+        if ($ret) {
+            self::outsuccess(array('result' => 'true'));
+        } else {
+            self::outerr(errcode::ErrDB);
+        }
+    }
+}