Просмотр исходного кода

优化积分明细的remark记录

lh 1 месяц назад
Родитель
Сommit
3063866c2d

+ 1 - 1
app/Services/DeepSeek/DeepSeekService.php

@@ -381,7 +381,7 @@ class DeepSeekService
                 'modality' => $modality,
                 'source'   => 'generateText',
             ],
-            $modality === 'video' ? 'Gemini视频理解成功计费' : 'Gemini图片理解成功计费',
+            '',
             $model
         );
         if (empty($result['charged'])) {

+ 4 - 4
app/Services/PointsService.php

@@ -439,7 +439,7 @@ class PointsService
             $points,
             $tokens,
             $chargeInfo,
-            '视频生成成功计费'
+            ''
         );
 
         // 自动时长被实际时长覆盖时,计费成功后同步回填任务表的 charge_info
@@ -572,11 +572,11 @@ class PointsService
      * @param int $points
      * @param int $tokens
      * @param array $chargeInfo
-     * @param string $remark
+     * @param string $remark 特殊备注(默认空,测试用户由内部追加[测试]仅记账不扣费)
      * @param string $apiType
      * @return array
      */
-    public function recordChatCharge(int $uid, int $points, int $tokens, array $chargeInfo = [], string $remark = 'AI对话生成成功计费', string $apiType = 'deepseek'): array
+    public function recordChatCharge(int $uid, int $points, int $tokens, array $chargeInfo = [], string $remark = '', string $apiType = 'deepseek'): array
     {
         return $this->deductAndRecord(
             $uid,
@@ -641,7 +641,7 @@ class PointsService
             $points,
             $tokens,
             $chargeInfo,
-            '图片生成成功计费'
+            ''
         );
     }
 

+ 5 - 0
app/Transformer/Points/PointsTransformer.php

@@ -7,6 +7,10 @@ class PointsTransformer
     const TYPE_LABELS = [
         'video' => '视频生成',
         'video_refund' => '视频生成退款',
+        'image' => '图片生成',
+        'image_refund' => '图片生成退款',
+        'chat' => 'AI对话',
+        'chat_refund' => 'AI对话退款',
     ];
 
     /**
@@ -50,6 +54,7 @@ class PointsTransformer
                 'task_id' => (int)getProp($item, 'task_id'),
                 'charge_info' => [
                     'model' => getProp($chargeInfo, 'model'),
+                    'modality' => getProp($chargeInfo, 'modality'),
                     'video_resolution' => getProp($chargeInfo, 'video_resolution'),
                     'video_duration' => getProp($chargeInfo, 'video_duration'),
                     'ratio' => getProp($chargeInfo, 'ratio'),