wesmiler 2 jaren geleden
bovenliggende
commit
2ef8d1a3dd
1 gewijzigde bestanden met toevoegingen van 7 en 8 verwijderingen
  1. 7 8
      app/Services/Api/FinanceService.php

+ 7 - 8
app/Services/Api/FinanceService.php

@@ -488,7 +488,7 @@ class FinanceService extends BaseService
             return true;
         }
 
-        $cacheKey = "caches:settle:{$userId}_{$orderNo}";
+        $cacheKey = "caches:settle:{$orderUserId}_{$orderNo}";
         if(RedisService::get($cacheKey)){
             $this->error = 3002;
             return true;
@@ -555,7 +555,6 @@ class FinanceService extends BaseService
 
             if($settleUsdt>0 && $merchantUserInfo){
                 $updateData = ['usdt'=> DB::raw("usdt + {$settleUsdt}"),'update_time'=>time()];
-                var_dump($updateData);
                 if(!MemberModel::where(['id'=> $orderMerchUid])->update($updateData)){
                     DB::rollBack();
                     $this->error = 1042;
@@ -596,7 +595,7 @@ class FinanceService extends BaseService
             'power_num'=>DB::raw("power_num + {$awardPowerNum}"),  // 算力奖励
             'update_time'=>time()
         ];
-        if(!MemberModel::where(['id'=> $userId])->update($updateData)){
+        if(!MemberModel::where(['id'=> $orderUserId])->update($updateData)){
             DB::rollBack();
             $this->error = 1042;
             RedisService::clear($cacheKey);
@@ -631,7 +630,7 @@ class FinanceService extends BaseService
             // 用户消息
             $dateTime = date('Y-m-d H:i:s');
             $message = "您在{$dateTime}(UTC+8)完成商城消费,获得待返积分奖励已到账:\n消费星豆:{$orderXdTotal}\n奖励积分:{$userAwardWaitScore}\n奖励前:{$userWaitScore}";
-            MessageService::make()->pushMessage($userId, '商城消费待返积分奖励', $message,3);
+            MessageService::make()->pushMessage($orderUserId, '商城消费待返积分奖励', $message,3);
         }
 
         // 算力奖励明细
@@ -662,10 +661,10 @@ class FinanceService extends BaseService
             // 用户消息
             $dateTime = date('Y-m-d H:i:s');
             $message = "您在{$dateTime}(UTC+8)完成商城消费,获得算力奖励已到账:\n消费星豆:{$orderXdTotal}\n奖励算力:{$awardPowerNum}\n奖励前:{$userPowerNum}";
-            MessageService::make()->pushMessage($userId, '商城消费算力奖励', $message,3);
+            MessageService::make()->pushMessage($orderUserId, '商城消费算力奖励', $message,3);
 
             // 算力统计
-            AccountLogService::make()->saveCount($userId, $userPowerNum, 1);
+            AccountLogService::make()->saveCount($orderUserId, $userPowerNum, 1);
         }
 
         // TODO 推荐用户待返积分奖励明细
@@ -708,8 +707,8 @@ class FinanceService extends BaseService
 
             // 用户消息
             $dateTime = date('Y-m-d H:i:s');
-            $message = "您在{$dateTime}(UTC+8)获得推荐用户【{$userId}】商城消费,待返积分奖励已到账:\n消费星豆:{$orderXdTotal}\n奖励积分:{$inviteAwardWaitScore}\n奖励前:{$parentWaitScore}";
-            MessageService::make()->pushMessage($userId, '推荐用户商城消费奖励', $message,3);
+            $message = "您在{$dateTime}(UTC+8)获得推荐用户【{$orderUserId}】商城消费,待返积分奖励已到账:\n消费星豆:{$orderXdTotal}\n奖励积分:{$inviteAwardWaitScore}\n奖励前:{$parentWaitScore}";
+            MessageService::make()->pushMessage($orderUserId, '推荐用户商城消费奖励', $message,3);
         }
 
         DB::commit();