wesmiler 报恩寺项目提交

app/Services/EnshrineService.php

@@ -508,36 +508,33 @@ class EnshrineService extends BaseService
                 \DB::rollBack();
                 return message("处理账户明细失败", false);
             }
+        }
 
-            // 奖励
-            $giveGd = ConfigService::make()->getConfigByCode('enshrine_give_gd');
-            $giveGd = $giveGd? $giveGd : 0;
-            if($giveGd>0){
-                if(!MemberModel::where(['id'=> $userId, 'mark'=> 1])->increment('merits_num', $giveGd)){
-                    \DB::rollBack();
-                    return message("更新功德账户失败", false);
-                }
-
-                $data = [
-                    'user_id'=> $userId,
-                    'source_uid'=> 0,
-                    'type'=> 3,
-                    'coin_type'=> 4,
-                    'pay_type'=> 4,
-                    'money'=> $giveGd,
-                    'change_type'=> 1,
-                    'balance'=> $memberInfo->merits_num,
-                    'create_time'=> time(),
-                    'remark'=> $type==1? "跪拜祈福":'洗手祈福',
-                    'status'=> 1,
-                ];
-                if(!TradeModel::insertGetId($data)){
-                    \DB::rollBack();
-                    return message("处理功德奖励失败", false);
-                }
+        // 奖励
+        $giveGd = ConfigService::make()->getConfigByCode('enshrine_give_gd');
+        $giveGd = $giveGd? $giveGd : 0;
+        if($giveGd>0){
+            if(!MemberModel::where(['id'=> $userId, 'mark'=> 1])->increment('merits_num', $giveGd)){
+                \DB::rollBack();
+                return message("更新功德账户失败", false);
+            }
 
-                \DB::commit();
-                return message("获得功德值{$giveGd}", true, ['num'=> $giveGd]);
+            $data = [
+                'user_id'=> $userId,
+                'source_uid'=> 0,
+                'type'=> 3,
+                'coin_type'=> 4,
+                'pay_type'=> 4,
+                'money'=> $giveGd,
+                'change_type'=> 1,
+                'balance'=> $memberInfo->merits_num,
+                'create_time'=> time(),
+                'remark'=> $type==1? "跪拜祈福":'洗手祈福',
+                'status'=> 1,
+            ];
+            if(!TradeModel::insertGetId($data)){
+                \DB::rollBack();
+                return message("处理功德奖励失败", false);
             }
 
         }
@@ -556,6 +553,10 @@ class EnshrineService extends BaseService
         DynamicNoticeModel::insertGetId($data);
 
 
-        return message("操作成功", true);
+        if($giveGd>0){
+            return message("获得功德值{$giveGd}", true, ['num'=> $giveGd]);
+        }else{
+            return message("操作成功", true);
+        }
     }
 }