Merge remote-tracking branch 'origin/develop' into develop

app/Http/Controllers/V1/BeanDetailController.php

@@ -0,0 +1,38 @@
+<?php
+namespace App\Http\Controllers\V1;
+use App\Repositories\MemberRepository;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+/**
+ * Created by PhpStorm.
+ * User: durong
+ * Date: 2019/6/19
+ * Time: 下午12:25
+ */
+
+class BeanDetailController extends Controller
+{
+    public function __construct(MemberRepository $memberRepository)
+    {
+        $this->memberRepository = $memberRepository;
+    }
+
+    //获取指定时间彩虹豆收支明细
+    public function beanDetail(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'type' => ['required',Rule::in([0,1, 2])],
+        ]);
+        if ($validator->fails()) {
+            return $this->jsonError($validator->errors()->first());
+        }
+
+        $beanDetail = $this->memberRepository->beanDetail($request->all());
+        if ($beanDetail){
+            return $this->jsonSuccess($beanDetail);
+        }else{
+            return $this->jsonError('没有找到对应彩虹豆明细');
+        }
+    }
+}

app/Http/Controllers/V1/Controller.php

@@ -9,4 +9,47 @@ use App\Http\Controllers\Controller as BaseController;
 class Controller extends BaseController
 {
     use Helpers;
+    public function jsonSuccess($data = [], $msg = "成功")
+    {
+        $response = array(
+            'code' => 0,
+            'msg' => $msg,
+            'data' => []
+        );
+        if ($data) {
+            if (is_array($data)) {
+                //带有分页格式转换
+                if (isset($data['meta'])) {
+                    // 更改元数据格式，全部包含在data下
+                    $temp = array(
+                        'data' => array(
+                            'data' => $data['data'],
+                            'pagination' => $data['meta']['pagination']
+                        )
+                    );
+                    $response = array_merge($response, $temp);
+                } elseif(isset($data['data'])) {
+                    $response = array_merge($response, $data);
+                }else{
+                    $temp = array(
+                        'data' => $data
+                    );
+                    $response = array_merge($response, $temp);
+                }
+            } else {
+                $response['data'] = $data;
+            }
+        }
+        return $response;
+    }
+
+    public function jsonError($msg)
+    {
+        $response = array(
+            'code' => 1,
+            'msg' => $msg,
+            'data' => ""
+        );
+        return $response;
+    }
 }

app/Repositories/BehaviorRecordRepositories.php

@@ -215,9 +215,9 @@ class BehaviorRecordRepositories
             $data['release_status'] = $comment['release_status'];
             $data['generation_quantity'] = $comment['generation_quantity'];
             $data['quantity_issued'] = $comment['quantity_issued'];
-            $data['current_comment_id'] = $comment['comment_id'];
-            $data['superior_comment_id'] = $comment['parent_comment_id'];
-            $this->generalLedgerRecord->create($data);
+            $data['current_comment_id'] = $comment['current_comment_id'];
+            $data['superior_comment_id'] = $comment['superior_comment_id'];
+            $this->commentAccountRecord->create($data);
             $behavior = Behavior::where('virus_behavior_id',$comment['virus_behavior_id'])->first();
             $behavior->physical_strength += intval($comment['physical_exertion']);
             $behavior->grant_rainbow_beans += intval($comment['quantity_issued']);

app/Repositories/FeedRepositories.php

@@ -76,13 +76,16 @@ class FeedRepositories
                 if(in_array($feedType,[1,2,3])){
                     $data['relate_id'] = $request['post_id'];
                     $content['post_desc'] = $request['post_desc'];
+                    $content['beans'] = isset($request['rewards']['bean'])?intval($request['rewards']['bean']):0;
                 }elseif ($feedType==4){//评论
                     $data['relate_id'] = $request['post_id'];
                     $content['post_desc'] = $request['post_desc'];
                     $content['comment_desc'] = $request['comment_content'];
+                    $content['beans'] = isset($request['rewards']['bean'])?intval($request['rewards']['bean']):0;
                 }elseif ($feedType==6){//发布
                     $data['relate_id'] = $request['post_id'];
                     $content['post_desc'] = $request['post_desc'];
+                    $content['beans'] = isset($request['rewards']['bean'])?intval($request['rewards']['bean']):0;
                 }elseif ($feedType==5){//关注
                     $data['relate_id'] = $request['focus_uid'];
                     $content = "";

app/Repositories/MemberRepository.php

@@ -20,7 +20,7 @@ class MemberRepository
     {
         try {
             $sign = generateSign(['uid' => $uid], config('customer.app_secret'));
-            $url = config("customer.user_service_url") . '/userInfo';
+            $url = config("customer.app_service_url") . '/user/userInfo';
             $array = [
                 'json' => ['sign' => $sign, 'uid' => $uid], 'query' => [], 'http_errors' => false, 'headers' => ['Authorization' => "Bearer " . JWTAuth::getToken()]
             ];
@@ -65,4 +65,19 @@ class MemberRepository
             Log::debug('放弃操作用户彩虹豆，原因：彩虹豆值为'.$value);
         }
     }
+
+    public function beanDetail($request)
+    {
+        try {
+            $sign = generateSign(['type' => $request['type']], config('customer.app_secret'));
+            $url = config("customer.app_service_url") . '/user/v2/beanDetail';
+            $array = [
+                'json' => ['sign' => $sign, 'type' => $request['type']], 'query' => [], 'http_errors' => false, 'headers' => ['Authorization' => "Bearer " . JWTAuth::getToken()]
+            ];
+            return http($url, $array, 'get');
+        } catch (\Exception $e) {
+            Log::debug("beanDetail:".$e->getMessage());
+            return [];
+        }
+    }
 }

routes/api.php

@@ -62,6 +62,9 @@ $api->version('v1', [
         $api->get('memberFollowTopic', 'MemberFollowTopic@index');
         //收藏列表
         $api->get('postCollect', 'PostCollectController@index');
+
+        //用户彩虹豆明细获取
+        $api->get('beanDetail', 'BeanDetailController@beanDetail');
     });
 
 });