Merge branch 'master' of http://git.huxiukeji.com/zhangxiaobin/ggyuyin

application/api/controller/Dispatch.php

@@ -622,7 +622,7 @@ class Dispatch extends Common
                 $res2 = $userModel->where($where)->setInc("jewel",$money);
                 // 添加用户余额变动记录
                 $userjewellogModel = new \app\common\model\UserJewelLog();
-                $res3 = $userjewellogModel->addUserJewelLog($this->auth->id, $money, "+", $userInfo["jewel"], "拒绝订单返还余额", 7);
+                $res3 = $userjewellogModel->addUserJewelLog($orderInfo["recive_id"], $money, "+", $userInfo["jewel"], "拒绝订单返还余额", 7);
                 // 更新订单状态
                 $data = [];
                 $data["status"] = $status;
@@ -633,7 +633,7 @@ class Dispatch extends Common
                 if($res1 && $res2 && $res3 && $res4) {
                     Db::commit();
                     // 短信通知
-                    $reciveuserInfo = $userModel->where(["id"=>$orderInfo["user_id"]])->find();
+                    //$reciveuserInfo = $userModel->where(["id"=>$orderInfo["user_id"]])->find();
                     //Smslib::notice($reciveuserInfo->mobile, $orderInfo["skill_name"],"被拒绝接单",'orderNotice');
                     // 系统消息通知
                     \app\common\model\Message::addMessage($orderInfo["user_id"],"派单通知","您的订单，技能：".$orderInfo["skill_name"]."已被拒绝接单，请登录伴声app查看！");
@@ -665,13 +665,25 @@ class Dispatch extends Common
                 $where = [];
                 $where["id"] = $orderInfo["recive_id"];
                 $userInfo = $userModel->where($where)->find();
-                $res1 = $userModel->where($where)->setInc("jewel",$money);
+                //$res1 = $userModel->where($where)->setInc("jewel",$money);
+                $jewelMoneyRate = config('site.money_to_jewel');//1人民币兑换钻石数
+                $moneyRmb = bcdiv($money,$jewelMoneyRate);
+                $res1 = $userModel->where($where)->setInc("money",$moneyRmb);
                 $where = [];
                 $where["id"] = $this->auth->id;
                 $res2 = $userModel->where($where)->setDec("frozen",$money);
                 // 添加用户余额变动记录
-                $userjewellogModel = new \app\common\model\UserJewelLog();
-                $res3 = $userjewellogModel->addUserJewelLog($orderInfo["recive_id"], $money, "+", $userInfo["jewel"], "完成用户订单获得收益", 8);
+                /*$userjewellogModel = new \app\common\model\UserJewelLog();
+                $res3 = $userjewellogModel->addUserJewelLog($orderInfo["recive_id"], $money, "+", $userInfo["jewel"], "完成用户订单获得收益", 8);*/
+                $remark = $orderInfo['skill_name'].'服务';
+                $rs_wallet = model('wallet')->lockChangeAccountRemain($orderInfo["recive_id"],$moneyRmb,'+',$userInfo['money'],$remark,106,'money');
+                $res3 = false;
+                if($rs_wallet['status'] == false){
+                    $this->error($rs_wallet['msg']);
+                    Db::rollback();
+                } else {
+                    $res3 = true;
+                }
                 // 更新订单状态
                 $data = [];
                 $data["status"] = $status;
@@ -682,11 +694,11 @@ class Dispatch extends Common
                 if($res1 && $res2 && $res3 && $res4) {
                     Db::commit();
                     // 短信通知
-                    $reciveuserInfo = $userModel->where(["id"=>$orderInfo["recive_id"]])->find();
+                    //$reciveuserInfo = $userModel->where(["id"=>$orderInfo["recive_id"]])->find();
                     //Smslib::send($reciveuserInfo->mobile, $orderInfo["skill_name"], "顺利完成啦！",'orderNotice');
 
                     // 系统消息通知
-                    \app\common\model\Message::addMessage($orderInfo["recive_id"],"派单通知","您的派单，技能：".$orderInfo["skill_name"]." 完成啦！，请登录伴声app查看！");
+                    \app\common\model\Message::addMessage($orderInfo["recive_id"],"派单通知","您的派单，技能：".$orderInfo["skill_name"]." 完成啦！，请登录GG语音app查看！");
 
                     $this->success('恭喜！订单完成。');
                 } else {

application/api/controller/Money.php

@@ -1435,6 +1435,32 @@ class Money extends Common
     }
 
     /**
+     * 获取收益
+     * @return void
+     */
+    public function getMySoundCoinRecordNew()
+    {
+        try {
+            $userId = $this->auth->id;
+            $field = 'id,type,detail,mode,value,createtime';
+            $where['user_id'] = $userId;
+            $where['mode'] = '+';
+            //$where['type'] = [101,102,103,105,106];//101=>'获赠礼物',102=>'房间礼物抽成',103=>'邀请推广',105=>'申请提现驳回',106=>'接单收益',
+            $result = model('UserMoneyLog')->field($field)->where($where)->autopage()->order('createtime desc')->select();
+            if (!empty($result)) {
+                $logType = config('wallet.logtype');
+                foreach ($result as $key => &$value) {
+                    $value['type_text'] = isset($logType[$value['type']]) ? $logType[$value['type']] : '';
+                    $value['createtime'] = !empty($value['createtime']) ? date('Y-m-d H:i',$value['createtime']) : '';
+                }
+            }
+            $this->success('获取成功',$result);
+        } catch (Exception $e) {
+            $this->error($e->getMessage());
+        }
+    }
+
+    /**
      * 内购参数验证
      */
     public function applebuy()

application/common/service/UserService.php

@@ -168,8 +168,8 @@ class UserService
                             $moneyLog = model('UserMoneyLog')->where($moneyLogWhere)->find();
                             if (empty($moneyLog)) {
                                 $money = config('site.invite_money');
-                                $remark = '邀请用户充值赠送金额';
-                                $res = model('Wallet')->lockChangeAccountRemain($preUser['id'],$money,'+',$preUser['money'],$remark,15,'money',$userId);
+                                $remark = '邀请推广充值';
+                                $res = model('Wallet')->lockChangeAccountRemain($preUser['id'],$money,'+',$preUser['money'],$remark,103,'money',$userId);
                                 if (!$res['status']) {
                                     throw new Exception($res['msg']);
                                 }

application/extra/wallet.php

@@ -25,9 +25,10 @@ return [
         //money
         101 => '获赠礼物', //增加
         102 => '房间礼物抽成', //增加
-        103 => '邀请用户充值赠送金额', //增加
+        103 => '邀请推广', //增加
         104 => '申请提现', //减少
         105 => '申请提现驳回', //增加
+        106 => '接单收益', //增加
     ],
     'moneyname' => [
         'jewel'    => '钻石',