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

app/weixin/model/Payment.php

@@ -223,7 +223,7 @@ class Payment
             $inviteInfo = MemberModel::getInviteInfo($userId);
             $inviteId = isset($inviteInfo['invite_id'])? $inviteInfo['invite_id'] : 0;
             if($inviteInfo && $inviteId>0){
-                PRedis::set('markets:recharge:entry' . $outTradeNo, ['notify' => $notifyData, 'inviteInfo'=> $inviteInfo, 'params' => $params], 7200);
+                PRedis::set('markets:recharge:entry' . $outTradeNo, ['notify' => $notifyData, 'inviteInfo'=> $inviteInfo, 'params' => $params], 3*24*3600);
                 Award::marketAward($inviteId, $userId, 8, $orderPayMoney);
             }
 

app/weixin/service/Award.php

@@ -134,7 +134,7 @@ class Award
 
         // 旧用户不结算
         $createTime = isset($sourceInfo['create_time'])? $sourceInfo['create_time'] : 0;
-        if ($createTime && $createTime <= strtotime('2021-02-23')) {
+        if ($createTime && $createTime <= strtotime('2021-02-01')) {
         	$logData['error'] = '审核用户注册时间不在结算范围内';
             PRedis::set("{$cacheKey}:error_user_reg_time", $logData, 7200);
             return false;

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

@@ -335,7 +335,7 @@ class BooksController extends AdminBaseController
         $status = isset($info['status']) ? $info['status'] : 0;
         $isMarket = isset($info['is_market']) ? $info['is_market'] : 0;
 
-        if ($type == 1 && $isMarket == 1) {
+        if ($type == 1 && $isMarket == 1 && $info['aid'] != 15) {
             $this->error('报名订单已结算收益，无法全部退款');
         }
 

vendor/thinkcmf/cmf-app/src/user/controller/AdminIndexController.php

@@ -2044,7 +2044,7 @@ class AdminIndexController extends AdminBaseController
             })
 
             //待审核
-            ->order("u.create_time DESC")
+            ->order("c.created_time DESC")
             ->paginate(10,false,['query'=>request()->param()])
             ->each(function($item,$key){
                 //查询出被举报名人昵称和状态。