wesmiler 3 周之前
父节点
当前提交
d9b2b8df8a
共有 3 个文件被更改,包括 21 次插入5 次删除
  1. 20 2
      app/Services/Api/OrderService.php
  2. 0 1
      app/Services/Api/SettleService.php
  3. 1 2
      app/Services/PaymentService.php

+ 20 - 2
app/Services/Api/OrderService.php

@@ -680,21 +680,27 @@ class OrderService extends BaseService
         }
 
         // 结算商家收益
-        if (SettleService::make()->storeBonus($storeId, $bonus, $info) < 0) {
+        $result = SettleService::make()->storeBonus($storeId, $bonus, $info);
+        if ($result < 0) {
             DB::rollBack();
             $this->error = SettleService::make()->getError();
             RedisService::clear($cacheLockKey);
+            $this->saveLog("caches:settle:{$orderNo}:store_{$storeId}_error",SettleService::make()->getError());
             return false;
         }
+        $this->saveLog("caches:settle:{$orderNo}:store_{$storeId}",$result);
 
 
         // 代理佣金结算
-        if (SettleService::make()->agentBonus($userId, $recBonus, $info, $recBonusId) < 0) {
+        $result = SettleService::make()->agentBonus($userId, $recBonus, $info, $recBonusId);
+        if ($result < 0) {
             DB::rollBack();
             $this->error = SettleService::make()->getError();
             RedisService::clear($cacheLockKey);
+            $this->saveLog("caches:settle:{$orderNo}:agent_{$userId}_error",SettleService::make()->getError());
             return false;
         }
+        $this->saveLog("caches:settle:{$orderNo}:agent_{$userId}",$result);
 
         DB::commit();
 
@@ -704,6 +710,18 @@ class OrderService extends BaseService
     }
 
     /**
+     * 日志
+     * @param $key
+     * @param $data
+     */
+    public function saveLog($key, $data)
+    {
+        if(env('APP_DEBUG')){
+            RedisService::set($key,$data,env('DEBUG_EXPIRE',7200));
+        }
+    }
+
+    /**
      * 售后或退款
      * @param $userId
      * @param $params

+ 0 - 1
app/Services/Api/SettleService.php

@@ -248,5 +248,4 @@ class SettleService extends BaseService
         $result = ['user_id'=>$userId,'total'=> $total,'bonus'=>$bonus,'parent_id'=>$recBonusId,'oneId'=>$parentOneId,'oneBonus'=>$oneBonus,'twoId'=>$parentTwoId,'twoBonus'=>$twoBonus];
         return $result;
     }
-
 }

+ 1 - 2
app/Services/PaymentService.php

@@ -803,7 +803,6 @@ class PaymentService extends BaseService
                 return false;
             }
             $this->saveLog("caches:settle:{$out_trade_num}:agent_{$orderUserId}",$result);
-
         }
 
         DB::commit();
@@ -819,7 +818,7 @@ class PaymentService extends BaseService
     public function saveLog($key, $data)
     {
         if(env('APP_DEBUG')){
-            RedisService::set($key,$data,3 * 86400);
+            RedisService::set($key,$data,env('DEBUG_EXPIRE',7200));
         }
     }