Merge branch 'master' of ssh://119.23.72.7:22611/mushishixian/ic_server_welfare

app/Http/Controllers/ExchangesTask.php

@@ -64,24 +64,18 @@ class ExchangesTask extends Task
         //获取用户的unionid
         //获取用户的unionid
         $Redis = new RedisModel();
         $Redis = new RedisModel();
         $UserInfo = json_decode($Redis->hget('ic_user', $this->data['user_id']), true);
         $UserInfo = json_decode($Redis->hget('ic_user', $this->data['user_id']), true);
-        if(!$UserInfo || empty($UserInfo['union_id']))
-            throw new \Exception('用户union_id获取失败#'.$this->data['id']);
-
-        //获取用户的微信openid
-        $wechat = json_decode($Redis->hget('ic_user_oauth', $UserInfo['union_id'].'_2'), true);
-        if(!$wechat || empty($wechat['open_id']))
+        if(!$UserInfo || empty($UserInfo['wechat_oauth']['open_id']))
             throw new \Exception('用户open_id获取失败#'.$this->data['id']);
             throw new \Exception('用户open_id获取失败#'.$this->data['id']);
 
 
+
         //发放红包
         //发放红包
-        $Url = config('system.wechat_api_url').'/payment/send/normal';
+        $Url = config('system.wechat_api_url').'/payment/send/balance';
 
 
         $map = [
         $map = [
             'mch_billno' => 'integrals'.$this->data['id'],
             'mch_billno' => 'integrals'.$this->data['id'],
-            're_openid'  => $wechat['open_id'],
+            're_openid'  => $UserInfo['wechat_oauth']['open_id'],
             'total_amount'  => $this->Exchange['amount'],
             'total_amount'  => $this->Exchange['amount'],
-            'wishing'       => '天下都是我的，而我的都是你的！',
-            'act_name'      => '红包提现',
-            'remark'        => '芯掌柜'
+            'remark'        => '芯掌柜现金红包提现'
         ];
         ];
 
 
         $data = ExcessEncryption($map,config('system.secretKey'));
         $data = ExcessEncryption($map,config('system.secretKey'));

common @ 8428774c

-Subproject commit 6a492b76f3938205ed9d94cd12b81d66feea657d
+Subproject commit 8428774c731bbcd89366d7d698daf57579f0b53b