下级分销员和普通用户显示

public/themes/admin_simpleboot3/admin/market/marketoneuser.html

@@ -258,7 +258,7 @@
                      <if condition="$vo.marketcount eq 0">
                     <a href="#">{$vo.marketcount}</a>
                     <else/>
-                    <a href="{:url('Market/marketoneuser')}">{$vo.marketcount}</a>
+                    <a href="{:url('Market/marketoneuser',array('id'=>$vo.id,'user_nickname'=>$vo.user_nickname,'agent_type'=>0))}">{$vo.marketcount}</a>
                     </if>
                     </td>
                     <td style="text-align: center;">

public/themes/admin_simpleboot3/admin/market/marketuser.html

@@ -260,7 +260,7 @@
                      <if condition="$vo.marketcount eq 0">
                        <a href="#">{$vo.marketcount}</a>
                     <else/>
-                       <a href="{:url('Market/marketoneuser',array('id'=>$vo.id,'user_nickname'=>$vo.user_nickname,'agent_type'=>2))}">{$vo.marketcount}</a>
+                       <a href="{:url('Market/marketoneuser',array('id'=>$vo.id,'user_nickname'=>$vo.user_nickname,'agent_type'=>1))}">{$vo.marketcount}</a>
                     </if>
 
                     </td>

vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php

@@ -15,6 +15,10 @@ use think\Db;
 use think\db\Query;
 use app\admin\model\BooksModel;
 use app\weixin\model\Wechat;
+use app\weixin\model\AccountLog;
+
+use app\weixin\model\Member;
+use app\weixin\model\UserBalanceLog;
 use app\weixin\service\PRedis;
 
 /**
@@ -226,8 +230,8 @@ class MarketController extends AdminBaseController
             ->paginate(10,false,['query'=>request()->param()])
             ->each(function($item,$key){
                 $item['marketusername'] = Db::name('user')->where('id',$item['parent_id'])->field('real_name,user_nickname')->find();
-                $item['marketcount'] = Db::name('user')->where('parent_id',$item['id'])->count('id');
-                 $item['marketusercount'] = Db::name('user')->where(array('parent_id' =>$item['id'],'agent_type'=>0))->count('id');
+                $item['marketcount'] = Db::name('user')->where(array('parent_id'=>$item['id'],'agent_type'=>1))->count('id');
+                $item['marketusercount'] = Db::name('user')->where(array('parent_id' =>$item['id'],'agent_type'=>0))->count('id');
 
 
                 return $item;
@@ -428,14 +432,14 @@ class MarketController extends AdminBaseController
             ->where(function (Query $query) use($data){
 
                 $query->where('u.user_type', 2);
-                $query->where('u.agent_type', 1);
+               // $query->where('u.agent_type', 1);           //分销用户
                 
                 $query->where('u.openid', 'not in','');
                 if($data['agent_type']==0){
-                 $query->where(array('u.parent_id' =>$data['id'],'agent_type'=>0));
+                 $query->where(array('u.parent_id' =>$data['id'],'u.agent_type'=>0));
                 }
                 if($data['agent_type']==1){
-                   $query->where(array('u.parent_id' =>$data['id'],'agent_type'=>1));
+                   $query->where(array('u.parent_id' =>$data['id'],'u.agent_type'=>1));
                 }
               
 
@@ -563,7 +567,7 @@ class MarketController extends AdminBaseController
                 return $item;
             })
             ;
-        // echo Db::name('user')->getLastSql();die;
+        //echo Db::name('user')->getLastSql();die;
         // 获取分页显示
         $page = $list->render();
       
@@ -766,17 +770,17 @@ class MarketController extends AdminBaseController
                     $checkTime = date('Y.m.d H:i');
                     $remark = "感谢您对拾光的信任，我们一起解救单身青年！点击查看分销中心";
                     $msgParams = [
-                        'title' => "恭喜!!,您的推广红娘账号已审核通过！",
+                        'title' => "恭喜!!您的推广红娘账号已审核通过！",
                         'remark' => $remark,
                         'type' => 'confirm',
                         'keywords' => [
                             'keyword1' => [
-                                'value' => $userinfo['user_nickname'],
+                                'value' =>'推广红娘',
                                 'color' => '#173177',
                             ],
                             'keyword2' => [
-                                'value' => $checkTime,
-                                'color' => '#173177',
+                                'value' => '审核通过',
+                                'color' => '#3FAD46',
                             ],
                         ],
                         'url' => url('/weixin/market/index', '', '', true),
@@ -813,15 +817,15 @@ class MarketController extends AdminBaseController
                         'type' => 'confirm',
                         'keywords' => [
                             'keyword1' => [
-                                'value' => $userinfo['user_nickname'],
+                                'value' => '推广红娘',
                                 'color' => '#173177',
                             ],
                             'keyword2' => [
-                                'value' => $checkTime,
-                                'color' => '#173177',
+                                'value' => '审核不通过',
+                                'color' => '#c9302c',
                             ],
                         ],
-                        'url' => url('/weixin/market/index', '', '', true),
+                        'url' => url('', '', '', true),
                     ];
                     
                     Wechat::sendTplMsg($openid, $msgParams);
@@ -976,7 +980,7 @@ class MarketController extends AdminBaseController
         if (isset($param['ids']) && isset($param["yes"])) {
             $ids = $this->request->param('ids/a');
 
-            Db::name('user')->where('id', 'in', $ids)->update(['agent_type' => 0]);
+            Db::name('user')->where('id', 'in', $ids)->update(['agent_type' => 0,'agent_status' =>2]); //无，和待审核
 
             $this->success("删除成功！");
 
@@ -1023,50 +1027,50 @@ class MarketController extends AdminBaseController
             $awardMoney=$result['balance']+input('am');
             // 账户变动
             Db::startTrans();
-            if (Member::where($where)->setInc('balance', $awardMoney)) {
+            if (Member::where($where)->setInc('balance', input('am'))) {
                 // 写入分销奖励日志
            
                 $logTitle = "你获得了".input('ar')."奖励,额度".input('am')."元";
                 $log = [
-                    'change' => $awardMoneyTwo,
-                    'type' => $type,
-                    'level' => 2,
-                    'change_type' => 1,
-                    'pay_money' => $awardMoneyTwo,
-                    'user_id' => $userTwoId,
-                    'source_uid' => $userId,
-                    'balance' => moneyFormat($balanceTwo + $awardMoneyTwo),
-                    'description' => $logTitle,
+                    'change' => input('am'),
+                    'type' => 31,
+                    'level' => 1,   //默认是1级
+                    'change_type' => 1,  //收入相对于客户。
+                    'pay_money' => input('am'),
+                    'user_id' => input('id'),
+                    'source_uid' => 0,
+                    'balance' => $awardMoney,
+                    'description' => input('ar'),
                     'create_time' => time(),
                     'status' => 1,
                 ];
                 $logData['log'] = $log;
-                PRedis::set("{$cacheKey}:log", $logData, 7200);
+                //PRedis::set("{$cacheKey}:log", $logData, 7200);
                 if(UserBalanceLog::insertGetId($log)){
                     // 账户明细
                     $accountData = [
                         'type' => 4,
                         'account_type' => 2,
-                        'change_type' => 1,
-                        'user_id' => $userTwoId,
-                        'money' => $awardMoneyTwo,
-                        'balance' => $balanceTwo,
+                        'change_type' =>2,
+                        'user_id' => input('id'),
+                        'money' => input('am'),
+                        'balance' => $awardMoney,
                         'created_at' => date('Y-m-d H:i:s'),
-                        'remark' => $logTitle,
+                        'remark' => input('ar'),
                     ];
                     if(AccountLog::insertGetId($accountData)){
                         // 发送模板消息
-                        $openid = isset($userInfoTwo['openid'])? $userInfoTwo['openid'] : '';
+                        $openid = isset($result['openid'])? $result['openid'] : '';
                         if($openid){
-                            $checkTime = date('Y.m.d H:i');
-                            $remark = "感谢您对拾光的信任，我们一起解救单身青年！点击查看收益明细";
+                            $checkTime = date('Y.m.d H:i:s',time());
+                            $remark = input('ar');
                             $msgParams = [
-                                'title' => "您的下级[$nickname]邀请的用户[{$sourceNickname}]消费所得的收益已到账！\n\n类型：\t{$marketName}",
+                                'title' => "您好，您有一笔奖励结算金额已入账",
                                 'remark' => $remark,
                                 'type' => 'income',
                                 'keywords' => [
                                     'keyword1' => [
-                                        'value' => "{$awardMoneyTwo}",
+                                        'value' => '¥'.input('am'),
                                         'color' => '#173177',
                                     ],
                                     'keyword2' => [
@@ -1076,33 +1080,33 @@ class MarketController extends AdminBaseController
                                 ],
                                 'url' => url('/weixin/market/income', '', '', true),
                             ];
-                            PRedis::set("{$cacheKey}:message", ['result' => $userInfoTwo, 'params' => $msgParams], 600);
+                            // PRedis::set("{$cacheKey}:message", ['result' => $userInfoTwo, 'params' => $msgParams], 600);
                             Wechat::sendTplMsg($openid, $msgParams);
                         }
 
                         Db::commit();
                     }else{
-                        PRedis::set("{$cacheKey}:account_log", $logData, 7200);
+                       // PRedis::set("{$cacheKey}:account_log", $logData, 7200);
                         Db::rollback();
-                        return false;
+                         echo 0;die();
                     }
                 }else{
-                    PRedis::set("{$cacheKey}:balance_log", $logData, 7200);
+                    //PRedis::set("{$cacheKey}:balance_log", $logData, 7200);
                     Db::rollback();
-                    return false;
+                     echo 0;die();
                 }
 
             } else {
-                PRedis::set("{$cacheKey}:update_balance", $logData, 7200);
+               // PRedis::set("{$cacheKey}:update_balance", $logData, 7200);
                 Db::rollback();
-                return false;
+                 echo 0;die();
             }
         } else {
-            PRedis::set("{$cacheKey}:error_awardMoney", $logData, 7200);
-            return false;
+           // PRedis::set("{$cacheKey}:error_awardMoney", $logData, 7200);
+           echo 0;die();
         }
 
-        return $this->fetch();
+        echo 1;die();
 
      }
 
@@ -1192,26 +1196,29 @@ class MarketController extends AdminBaseController
                 echo 0;die;
             }
 
+           $pay_moneys=($param['pay_money']!='')?$param['pay_money']:$result['pay_money'];
+
             //开始进行调用成功发送
             $order = array(
            
             'orderNo' => $result['order_sn'],      //订单号
             'openid' => $result['openid'],         
-            'amount' => $result['pay_money'],       //实际支付金额
+            'amount' => $pay_moneys,              //实际支付金额
             'desc' =>$result['description'],      //描述
             
              );
-
+          //var_dump($order);die();
             $resulttrans=wechat::transferOrder($order);   //进行调用发送企业到零钱打款模板信息
+            //var_dump($resulttrans);die();
             if($resulttrans['result_code']=="SUCCESS"){
 
                      // 增加账户明细
                     $accountData = [
-                        'type' => 8,
-                        'account_type' => 2,
-                        'change_type' => 2,
+                        'type' => 8,        //提现
+                        'account_type' => 2,  //余额类型
+                        'change_type' => 1,     //收入
                         'user_id' => $param['id'],
-                        'money' => (param('pay_money')!='')?param('pay_money'):$result['pay_money'],
+                        'money' => ($param['pay_money']!='')?$param['pay_money']:$result['pay_money'],
                         'balance' => $param['balance'],
                         'created_at' => date('Y-m-d H:i:s'),
                         'remark' => '客户进行提现',
@@ -1224,8 +1231,8 @@ class MarketController extends AdminBaseController
                     if($result0){
                         //发送模板消息
                         if($result['openid']){
-                            $checkTime = date('Y-M-d H:i:s',$result['create_time']);
-                            $giveTime = date('Y-M-d H:i:s',time());
+                            $checkTime = date('Y-m-d H:i:s',$result['create_time']);
+                            $giveTime = date('Y-m-d H:i:s',time());
                             $remark = "您的提现已到账，请查收！";
                             $msgParams=[
                                 'title'=>$remark,
@@ -1233,7 +1240,7 @@ class MarketController extends AdminBaseController
                                 'type' =>'withdraw',
                                 'keywords' =>[
                                     'keyword1'=>[
-                                        'value'=> $param['balance'],
+                                        'value'=> ($param['pay_money']!='')?$param['pay_money']:$result['pay_money'],
                                         'color'=>'#173177'
                                     ],
                                     'keyword2'=>[
@@ -1241,7 +1248,7 @@ class MarketController extends AdminBaseController
                                         'color'=>'#173177'   
                                     ],
                                     'keyword3'=>[
-                                        'value'=>'微信账户类型',
+                                        'value'=>'商家转账入账',
                                         'color'=>'#173177'
                                     ],
                                     'keyword4'=>[