经济人收益

app/admin/controller/Broker.php

@@ -327,7 +327,7 @@ class Broker extends BaseController
 
     public function editdefault()
     {
-        $brokerid = input('brokerid/d',0);
+        $brokerid = input('brokerid/d', 0);
         if (empty($brokerid)) {
             exit(json_encode([
                 'code' => 1,
@@ -335,7 +335,7 @@ class Broker extends BaseController
             ]));
         }
 
-        Config::setConfigValue('default_broker',$brokerid);
-        exit(json_encode(['code'  => 0]));
+        Config::setConfigValue('default_broker', $brokerid);
+        exit(json_encode(['code' => 0]));
     }
 }

app/admin/controller/User.php

@@ -968,15 +968,15 @@ class User extends BaseController
 
     public function editGetmoney()
     {
-        $param = UserParamModel::fwhere(1)->findOrEmpty();
+        $param = UserParamModel::where(1)->findOrEmpty();
         $data  = [
             'getmoney' => input('getmoney/a', []),
         ];
         foreach ($data['getmoney'] as $v) {
-            if ($v['money'] <= 0) {
+            if ($v['money'] < 0.3) {
                 exit(json_encode([
                     'code' => 1,
-                    'msg'  => "金额必须大于等于0",
+                    'msg'  => "金额必须大于等于0.3",
                 ]));
             }
             if ($v['num'] <= 0) {

app/admin/view/user/getmoney.html

@@ -8,7 +8,7 @@
 						<button type="button" id="add" class="layui-btn layui-btn-normal">添加</button>
 						<table class="layui-table" id="table">
 							<tr>
-								<th>金额</th>
+								<th>金额（最低0.3）</th>
 								<th>可提次数</th>
 								<th>次数限制条件</th>
 								<th>操作</th>

app/common/model/UserBalance.php

@@ -31,4 +31,9 @@ class UserBalance extends Model
         return $this->hasOne(User::class, "id", "userid");
     }
 
+    public function getStatusTextAttr($value,$data)
+    {
+        $status = [1=>'待处理', 2=>'已处理'];
+        return $status[$data['status']];
+    }
 }

app/common/service/BalanceService.php

@@ -54,6 +54,7 @@ class BalanceService extends BaseService
             ]);
 
             $user->balance += $commission[$field['user']];
+            $user->balance_total += $commission[$field['user']];
             $user->save();
         }
 

app/mainapp/controller/Broker.php

@@ -2,6 +2,7 @@
 
 namespace app\mainapp\controller;
 
+use app\common\model\BrokerIncome;
 use app\mainapp\BaseController;
 
 use app\common\model\Param as ParamModel;
@@ -455,4 +456,38 @@ class Broker extends BaseController
         ]);
     }
 
+
+
+    /**
+     * 获取收益列表
+     */
+    public function getIncome()
+    {
+        $ppage    = input('ppage/d', 1);
+        $psize    = input('psize/d', 20);
+        $brokerid = input('brokerid/d', 0);
+        if ($brokerid != 0) {
+            $map[] = ['brokerid', '=', $brokerid];
+        }
+        $plist = BrokerIncome::where($map)->order(['id' => 'desc'])->page($ppage)->limit($psize)->select();
+        page_result(0, "", [
+            'plist'   => $plist,
+            'pstatus' => $psize > count($plist) ? 'noMore' : 'more',
+        ]);
+    }
+
+    public function brokerIncome()
+    {
+        $brokerid = input('brokerid/d', 0);
+        $broker   = BrokerModel::findOrEmpty($brokerid);
+        if ($broker->isEmpty()) {
+            page_result(1, "用户信息不存在。");
+        }
+        $month_time   = date('Ym', strtotime('-1 month'));
+        $month_income = BrokerIncome::where(['monthtime' => $month_time, 'brokerid' => $brokerid])->sum('value');
+        page_result(0, "", [
+            'broker'       => $broker,
+            'month_income' => $month_income,
+        ]);
+    }
 }

app/mainapp/controller/My.php

@@ -4,6 +4,7 @@ namespace app\mainapp\controller;
 
 use app\common\model\Feedback;
 use app\common\model\ResumeInvite;
+use app\common\model\UserBalance as UserBalanceModel;
 use app\common\model\UserGetmoneyLog as UserGetmoneyLogModel;
 use app\common\model\UserGetmoneyLog;
 use app\common\model\UserWill;
@@ -292,6 +293,24 @@ class My extends BaseController
         ]);
     }
 
+    /**
+     * 我的钱包
+     */
+    public function myBag()
+    {
+        $userid = input('userid/d', 0);
+        $user   = UserModel::findOrEmpty($userid);
+        if ($user->isEmpty()) {
+            page_result(1, "用户信息不存在。");
+        }
+        $month_time    = date('Ym', strtotime('-1 month'));
+        $month_balance = UserBalanceModel::where(['monthtime' => $month_time, 'userid' => $userid])->sum('value');
+        page_result(0, "", [
+            'user'          => $user,
+            'month_balance' => $month_balance,
+        ]);
+    }
+
     public function getRecharge()
     {
         $userid = input('userid/d', 0);
@@ -407,6 +426,21 @@ class My extends BaseController
         ]);
     }
 
+    public function getBag()
+    {
+        $ppage  = input('ppage/d', 1);
+        $psize  = input('psize/d', 20);
+        $userid = input('userid/d', 0);
+        if ($userid != 0) {
+            $map[] = ['userid', '=', $userid];
+        }
+        $plist = UserBalanceModel::where($map)->order(['id' => 'desc'])->page($ppage)->limit($psize)->select();
+        page_result(0, "", [
+            'plist'   => $plist,
+            'pstatus' => $psize > count($plist) ? 'noMore' : 'more',
+        ]);
+    }
+
     // 银行卡信息
     public function editUserBankinfo()
     {
@@ -459,7 +493,7 @@ class My extends BaseController
             $user->save();
             //发放佣金
             $balanceService = new BalanceService();
-            $balanceService->add($userid,BalanceService::IMPROVERESUME);
+            $balanceService->add($userid, BalanceService::IMPROVERESUME);
         }
         /*$integralService = new IntegralService();
         $integralService->add($userid, IntegralService::IMPROVERESUME);*/
@@ -636,16 +670,17 @@ class My extends BaseController
 
         //满足提现条件
         $user = UserModel::findOrEmpty($userid);
-        if ($user['integral'] < ($cash['money'] * $param['inttomoney'])) {
-            page_result(1, "积分不足");
+        if ($user['balance'] < $cash['money']) {
+            page_result(1, "余额不足");
         }
         $where = [
             ['userid', '=', $userid],
             ['money', '=', $cash['money']],
         ];
         if ($cash['type'] == 2) {
-            $where = ['createtime', '>=', strtotime(date('Y-m-01'))];
+            $where[] = ['createtime', '>=', strtotime(date('Y-m-01'))];
         }
+
         $cash_count = UserGetmoneyLog::where($where)->count();
         if ($cash_count >= $cash['num']) {
             page_result(1, "超过次数限制");
@@ -659,34 +694,30 @@ class My extends BaseController
         $transfers    = new WechatTransfers();
         $detail[]     = $transfers->getDetailList($out_trade_no, $cash['money'], $batch_name, $openid);
         $res          = $transfers->transfers($batch_name, $detail);
-        Log::record('用户提现：'.json_encode($res));
+        Log::record('用户提现：' . json_encode($res));
 
         //记录
         if (!empty($res['batch_id'])) {
-            $point = $cash['money'] * $param['inttomoney'];
             UserGetmoneyLog::create([
                 'userid'       => $userid,
                 'out_trade_no' => $out_trade_no,
                 'money'        => $cash['money'],
-                'integral'     => $point,
                 'remark'       => '小程序用户提现',
                 'createtime'   => time(),
             ]);
-            $integral = new UserIntegralModel;
-            $integral->save([
-                'userid'      => $userid,
-                'title'       => "用户提现",
-                'intvalue'    => $point,
-                'intmoney'    => 0.00,
-                'onlycontent' => "",
-                'remark'      => "积分提现活动",
-                'itype'       => 3,
-                'status'      => 2,
-                'createtime'  => time(),
-                'yeartime'    => date("Y"),
-                'monthtime'   => date("Ym"),
+            $balance = new UserBalanceModel();
+            $balance->save([
+                'userid'       => $userid,
+                'title'        => "用户提现",
+                'origin_value' => $user->balance,
+                'value'        => $cash['money'],
+                'remark'       => "余额提现",
+                'status'       => 2,
+                'createtime'   => time(),
+                'yeartime'     => date("Y"),
+                'monthtime'    => date("Ym"),
             ]);
-            $user->integral -= $point;
+            $user->balance -= $cash['money'];
             $user->save();
         }