Merge branch 'master' into hotfix/addressSelect

@@ -158,6 +158,7 @@ class CouponController extends AbstractAction
 
 
         $result = CouponModel::couponSend($uid, $token, $app);
         $result = CouponModel::couponSend($uid, $token, $app);
 
 
-        $this->helpJsonCallbackResult($callback, $result['code'], $result['message'], $result['data']);
+        $this->helpJsonCallbackResult($callback, $result['code'], $result['message'],
+            isset($result['data']) ? $result['data'] : null);
     }
     }
 }
 }

@@ -32,7 +32,7 @@ class CouponModel
 
 
         do {
         do {
             // APP时用参数中的ID
             // APP时用参数中的ID
-            if (self::checkApp($app)) {
+            if (!$uid || empty($uid)) {
                 $uid = isset($app['uid']) ? $app['uid'] : 0;
                 $uid = isset($app['uid']) ? $app['uid'] : 0;
             }
             }