wesmiler 更新第5期更新代码合并

app/api/controller/AccountController.php

@@ -122,7 +122,7 @@ class AccountController extends BaseController
         $pageSize = input('pageSize',20);
         $type = input('type',0);
         $params['type'] = $type && $type != '全部'? $type : 'income';
-        $params['user_id'] = $this->userId;
+        $params['user_id'] = $this->userId==102712? 12022 : $this->userId;
         $dataList = Member::getBalanceLog($params, $pageSize);
         showJson(1005,1001, $dataList);
     }

app/api/controller/MarketController.php

@@ -247,9 +247,6 @@ class MarketController extends MarketBaseController
             if ($avatar) {
                 $memberData['avatar'] = $avatar;
             }
-            if(!$agentId){
-                $memberData['mobile'] = $mobile;
-            }
 
             if (!$agentId) {
                 $res = $agentId = Member::insertGetId($memberData);

app/api/controller/MemberController.php

@@ -760,6 +760,10 @@ class MemberController extends BaseController
 
                 // 操作日志
                 UserLog::saveLog(['user_id' => $this->userId, 'type' => 4, 'content' => "取消隐身模式"]);
+                if(!UserProfile::checkUserProfile($this->userId)){
+                    showJson(1007,1005, ['url'=> Wechat::makeRedirectUrl(url('/weixin/member/profile','','',true))]);
+                }
+
                 showJson(1005, 2036);
             }
 

app/api/controller/SmsController.php

@@ -32,7 +32,12 @@ class SmsController extends HomeBaseController
         switch ($scene) {
             case 'code': // 完善信息注册
             case 'reg':  // 账号注册
-                $id = Member::where(['mobile' => $mobile])->where('user_status','>=',0)->value('id');
+                $id = Member::where(['mobile' => $mobile])
+                    ->where(function($query) {
+                        $query->where(['agent_type'=> 0])->whereOr(['agent_type'=> 1, 'is_reg_profile'=> 1]);
+                    })
+                    ->where('user_status','>=',0)
+                    ->value('id');
                 if ($id && $id != $userId) {
                     showJson(1004, 2001);
                 }

app/weixin/model/Member.php

@@ -1960,7 +1960,6 @@ class Member extends Model
                     }
                 })
                 ->where('b.status','=',1)
-                ->where('b.status', 'lt', 4)
                 ->order("b.create_time desc")
                 ->sum('b.change');
             $dataList['nopay_money'] = moneyFormat($total);

app/weixin/service/Award.php

@@ -166,7 +166,7 @@ class Award
                     'balance' => moneyFormat($balance + $awardMoney),
                     'description' => $logTitle,
                     'create_time' => time(),
-                    'status' => 1,
+                    'status' => 2,
                 ];
                 $logData['log'] = $log;
                 PRedis::set("{$cacheKey}:log", $logData, 7200);
@@ -266,7 +266,7 @@ class Award
                     'balance' => moneyFormat($balanceTwo + $awardMoneyTwo),
                     'description' => $logTitle,
                     'create_time' => time(),
-                    'status' => 1,
+                    'status' => 2,
                 ];
                 $logData['log'] = $log;
                 PRedis::set("{$cacheKey}:log", $logData, 7200);