资产页面对接完成

app/Http/Controllers/Api/MemberController.php

@@ -16,6 +16,7 @@ use App\Models\GoodsCollect;
 use App\Models\Member;
 use App\Models\MemberAddress;
 use App\Models\MemberClan;
+use App\Models\MemberCoins;
 use App\Models\MemberCoupon;
 use App\Models\MemberOpenId;
 use App\Models\Members;
@@ -118,76 +119,8 @@ class MemberController extends FrontController
     }
 
 
-    /**
-     * 修改登录密码
-     * @return \Illuminate\Http\JsonResponse
-     */
-    function retrievePassword()
-    {
-        $mobile = request()->input('phone', '13900139110');
-        $password = request()->input('password', '123456');
-        $password = str_replace(' ', '', $password);
-        if (empty($password)) {
-            return $this->apiResponseError('请设置登录密码');
-        }
-        if (strlen($password) < 6) {
-            return $this->apiResponseError('登录密码最低6位');
-        }
-        $code = request()->input('code', '1234');
-        if (empty($code)) {
-            return $this->apiResponseError('请输入验证码');
-        }
-        $send_server = SmsServer::creatServer();
-        $code_ret = $send_server->verifyCode($mobile, $code, 'retrieve');
-        if (empty($code_ret)) {
-            return $this->apiResponseError($send_server->getErrorMsg() ?: '验证码错误');
-        }
-        $member = Member::where('id', request()->member['id'])->where('status',1)->select(['id', 'password', 'encrypt'])->first();
-        $pass_server = PassServer::creatServer($password, $member->{'encrypt'});
-        $new_pass = $pass_server->creatPassword();
-        $ret = $member->update(['password' => $new_pass['password']]);
-        if (empty($ret)) {
-            return $this->apiResponseError('密码修改失败');
-        } else {
-            return $this->apiResponseSuccess('密码修改成功');
-        }
-    }
 
 
-    /**
-     * 修改登录密码
-     * @return \Illuminate\Http\JsonResponse
-     */
-    function setPassword()
-    {
-        $old_password = request()->input('old_password', '123456');
-        if (empty($old_password)) {
-            return $this->apiResponseError('请输入旧密码');
-        }
-        $password = request()->input('password', '123456');
-        $password = str_replace(' ', '', $password);
-        if (empty($password)) {
-            return $this->apiResponseError('请设置登录密码');
-        }
-        $pass_two = request()->input('pass_two', '123456');
-        if ($password != $pass_two) {
-            return $this->apiResponseError('两次密码输入不一致');
-        }
-        $member = Member::where('id', request()->member['id'])->where('status',1)->select(['id', 'password', 'encrypt'])->first();
-        $pass_server = PassServer::creatServer($old_password, $member->{'encrypt'});
-        if (!$pass_server->verifyPass($member->{'password'})) {
-            return $this->apiResponseError('旧密码错误');
-        }
-        $pass_server->setPassword($password);
-        $new_pass = $pass_server->creatPassword();
-        $ret = $member->update(['password' => $new_pass['password']]);
-        if (empty($ret)) {
-            return $this->apiResponseError('密码修改失败');
-        } else {
-            return $this->apiResponseSuccess('密码修改成功');
-        }
-    }
-
 
 
     /**
@@ -233,6 +166,28 @@ class MemberController extends FrontController
         }
     }
 
+
+    function getIconList(){
+        $mId=request()->member['id'];
+        $totalPrice=0;
+        $totalUsdt=0;
+        $usdtPrice=CommonServer::creatServer()->getConfigValue('usdt');
+        $luckyPrice=CommonServer::creatServer()->getConfigValue('lucky');
+        $list=MemberCoins::where('m_id',$mId)->select(['coin_name','coin_id','num','lock_num'])->get();
+        foreach ($list as $value){
+            if($value->{'coin_id'}==1){
+                $value->{'price'}=round(($value->{'num'}+$value->{'lock_num'})*$usdtPrice*$luckyPrice,6);
+                $value->{'totalUsdt'}=round(($value->{'num'}+$value->{'lock_num'})*$luckyPrice,6);
+            }else{
+                $value->{'price'}=round(($value->{'num'}+$value->{'lock_num'})*$usdtPrice,6);
+                $value->{'totalUsdt'}=round($value->{'num'}+$value->{'lock_num'},6);
+            }
+            $totalPrice+=$value->{'price'};
+            $totalUsdt+=$value->{'totalUsdt'};
+        }
+        return $this->apiResponseSuccess('获取信息成功',['totalPrice'=>$totalPrice,'totalUsdt'=>$totalUsdt,'list'=>$list]);
+    }
+
     /**
      * 获取用户资产信息
      */

app/Http/Controllers/Config/ConfigsController.php

@@ -44,7 +44,7 @@ class ConfigsController extends AdminBaseController
      */
     public function index_new()
     {
-        $configs=Config::whereIn('key',['delay_time','service_num','province_num','city_num','area_num','sales_num','shop_num','member_cash','beans_modulus','member_num','fans_num','purchases_num','than_column','service_type','promotion_num','replenish_date'])->pluck('value','key');
+        $configs=Config::whereIn('key',['usdt','lucky'])->pluck('value','key');
         return view('admins.configs.index',['configs'=>$configs]);
     }
 
@@ -111,30 +111,7 @@ class ConfigsController extends AdminBaseController
         return view('admins.configs.consume',['configs'=>$configs]);
     }
 
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function on_order_set()
-    {
-        if(request()->isMethod('post')){
-            $data=request()->all();
-            if(isset($data['_token']))unset($data['_token']);
-            if(($data['province_num']+$data['city_num']+$data['area_num']+$data['sales_num']+$data['shop_num']+$data['user_num'])!=100){
-                return $this->response('分佣比列之和必须是100','erroe');
-            }
-            Config::where('key','expense_num')->update(['value' =>$data['expense_num'] ]);
-            OrderAccountsSet::where('id',1)->update($data);
-            OrderAccountsSet::where('id','<>',1)->update(['server_num'=>$data['server_num']]);
-            return $this->response(self::SUCCESS_MSG,'success','',route('admin.config.on_order_set'));
-        }else{
-            $configs=OrderAccountsSet::where('id',1)->first();
-            $configs->{'expense_num'}=CommonServer::creatServer()->getConfigValue('expense_num');
-            return view('admins.configs.on_order_set',['configs'=>$configs]);
-        }
 
-    }
 
 
     /**
@@ -153,9 +130,7 @@ class ConfigsController extends AdminBaseController
             // 查找当前数据是否存在
             if( Config::where('key', $key)->where('value', $value)->count() ){ continue; }
             Config::where('key', $key)->update([ 'value' => $value ]);
-            if(in_array($key,['province_num','city_num','area_num','sales_num','shop_num','member_num','purchases_num','fans_num','member_cash'])){
-                ShopSet::where('shop_id','>',0)->update([$key=>$value]);
-            }
+
         }
 
         return $this->response(self::SUCCESS_MSG,'success','');

resources/views/admins/configs/index.blade.php

@@ -9,8 +9,9 @@
     <div id="configs">
         <el-form action="{{ route('admin.config.update') }}" method="post" id="configs-edit">
 
-            <hr>
-
+            <h4>价格设置</h4>
+            <ui-input-float-number label="USDT：" :min="0" :precision="6" value="{{ $configs->get('usdt','') }}" name="usdt" max="999999" tips="USDT价格"></ui-input-float-number>
+            <ui-input-float-number label="LUCKY：" :min="0" :precision="6" value="{{ $configs->get('lucky','') }}" name="lucky" max="999999" tips="LUCKY价格"></ui-input-float-number>
 
             {{ csrf_field() }}
             <ui-submit></ui-submit>

routes/api/member.php

@@ -8,8 +8,8 @@ Route::group(['domain' => env('APP_HOST_WEB'), 'prefix' => 'member'],function ()
     Route::match(['get','post'],'index', 'MemberController@index')->name('member.index');
     Route::match(['get','post'],'register', 'MemberController@register')->name('member.register');
     Route::match(['get','post'],'login', 'MemberController@login')->name('member.login');
-    Route::match(['get','post'],'password', 'MemberController@setPassword')->name('member.password');
-    Route::match(['get','post'],'retrieve', 'MemberController@retrievePassword')->name('member.retrieve');
+    Route::match(['get','post'],'coin-list', 'MemberController@getIconList')->name('member.coin-list');
+
     Route::match(['get','post'],'pay_pass', 'MemberController@setPayPass')->name('member.pay_pass');
     Route::match(['get','post'],'money', 'MemberController@getMoneyInfo')->name('member.money');
     Route::match(['get','post'],'info', 'MemberController@getMemberInfo')->name('member.info');