no message

app/Http/Controllers/Api/ContractController.php

@@ -105,7 +105,7 @@ class ContractController extends FrontController
             ->leftJoin('broadcasts as b', 'b.id', '=', 'cd.broadcast_id')
             ->where('to_m_id', $mId)
             ->whereIn('cd.status',[1,3])
-            ->select(['cd.id', 'db_money', 'nbn_money', 'cd.created_at', 'cd.type', 'cd.status', 'b.hash'])->paginate(15);
+            ->select(['cd.id', 'db_money', 'nbn_money', 'cd.created_at', 'cd.type', 'cd.status', 'b.hash','cd.service_money'])->paginate(15);
         return $this->apiResponseSuccess('', ['total' => $list->total(), 'items' => $list->items()]);
     }
 
@@ -115,7 +115,10 @@ class ContractController extends FrontController
      */
     function getContractList(){
         $mId = MemberServer::creatServer()->getMemberId();
-        $list=Contract::where('m_id',$mId)->select(['id','status','hash','money','created_at','is_out'])->paginate(15);
+        $list=Contract::where('m_id',$mId)->select(['id','status','hash','money','created_at','is_out'])->orderBy('id','desc')->paginate(15);
+        foreach ($list as $item){
+            $item->{'statusName'}=__('contract.status'.$item->{'status'});
+        }
         return $this->apiResponseSuccess('', ['total' => $list->total(), 'items' => $list->items()]);
     }
 

app/Http/Controllers/Api/MemberController.php

@@ -71,10 +71,10 @@ class MemberController extends FrontController
     {
         $invite_code = request()->input('inviteCode', '');
         if (!empty($invite_code)) {
-            $p_member = Member::where('invite_code', $invite_code)->where('status',1)->select(['id', 'address'])->first();
+            $p_member = Member::where([['invite_code','=', $invite_code,'or'],['address','=', $invite_code,'or']])->select(['id', 'address'])->first();
         }
         if (empty($p_member)) {
-            return $this->apiResponseError('推荐码错误');
+            return $this->apiResponseError('member.no_invite');
         }
 
         $address = request()->input('address', '');

app/Http/Middleware/MemberAuthMiddleware.php

@@ -34,6 +34,8 @@ class MemberAuthMiddleware
      */
     public function handle($request, Closure $next)
     {
+        //设置系统语言包
+        app()->setLocale(request()->input('lang', 'zh-Hans'));
         //验证会员授权信息
         $clientRoute = request()->route()->getName();
         $token=request()->header('Authorization');

app/Servers/ContractServer.php

@@ -386,6 +386,10 @@ class ContractServer
      * @param string $remark
      */
     function addDistribution($contractId,$mId,$dbMoney,$nbnMoney,$type,$toMid,$toAddress,$proportion,$status,$remark='奖金发放'){
+        $serviceMoney=0;
+        if($toMid>0 && $nbnMoney>0){
+            $serviceMoney=CommonServer::creatServer()->getConfigValue('service_money')?:0;
+        }
         ContractDistribution::create([
             'contract_id' => $contractId,
             'broadcast_id' => 0,
@@ -397,6 +401,7 @@ class ContractServer
             'to_address' => $toAddress,
             'status' => $status,
             'proportion' => $proportion,
+            'service_money' => $serviceMoney,
             'remark' => $remark
         ]);
     }

config/app.php

@@ -80,7 +80,7 @@ return [
     |
     */
 
-    'locale' => 'zh-CN',
+    'locale' => 'zh-Hans',
 
     /*
     |--------------------------------------------------------------------------

resources/lang/zh-Hans/contract.php

@@ -13,8 +13,12 @@ return [
     |
     */
 
-    'no_hash' => '当前交易已执行',
+    'no_hash' => '哈希已执行',
     'ok' => '执行成功',
     'no' => '执行失败',
+    'status1' => '广播中',
+    'status2' => '成功',
+    'status3' => '失败',
+    'status4' => '完成',
 
 ];

resources/lang/zh-Hans/member.php

@@ -0,0 +1,20 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'no_invite' => '推荐人错误',
+    'key_error' => '参数错误',
+    'key_num' => '操作频繁',
+
+];

routes/api/contract.php

@@ -8,4 +8,5 @@ Route::group(['domain' => env('APP_HOST_WEB'), 'prefix' => 'contract'],function
     Route::match(['get','post'],'invest', 'ContractController@getInvestData')->name('contract.invest');
     Route::match(['get','post'],'add-invest', 'ContractController@setInvest')->name('contract.add-invest');
     Route::match(['get','post'],'earnings', 'ContractController@getEarnings')->name('contract.earnings');
+    Route::match(['get','post'],'contracts', 'ContractController@getContractList')->name('contract.contracts');
 });