完善功能

app/admin/controller/member/BenefitController.php

@@ -138,8 +138,8 @@ class BenefitController extends Curd
             $times = date('Y-m-d H:i:s', strtotime($times));
         }
 
+        Db::beginTransaction();
         try {
-            Db::beginTransaction();
             // 减额度
             $benefit->member_benefit_used_count = $benefit->member_benefit_used_count + $nbr;
             $benefit->save();
@@ -195,8 +195,8 @@ class BenefitController extends Curd
             $times = date('Y-m-d H:i:s', strtotime($paramsData['times']));
         }
 
+        Db::beginTransaction();
         try {
-            Db::beginTransaction();
             // 减额度
             $benefit->member_benefit_used_count = $benefit->member_benefit_used_count + $paramsData['nbr'];
             if($benefit->member_benefit_used_count == $benefit->member_benefit_limit_count){

app/admin/controller/member/QuotaController.php

@@ -374,6 +374,7 @@ class QuotaController extends Curd
                 ->toArray();
                 
                 if ($quotas[0]['member_quota_nbr'] != '-99.00' && count($quotas) < intval($nbr)) {
+                    Db::rollBack();
                     return json_fail("可核销数量不足");
                 }
                 // 生成核销数据

app/admin/controller/notify/RechargeController.php

@@ -92,8 +92,8 @@ class RechargeController
             }
         }
 
+        Db::beginTransaction();
         try {
-            Db::beginTransaction();
             $extendJson['notify'] = 'success';
             $payDetail->pay_extend_json = json_encode($extendJson);
             $payDetail->save();

app/admin/controller/order/PayDetailController.php

@@ -119,8 +119,8 @@ class PayDetailController extends Curd
             return json_fail('充值密码错误');
         }
 
+        Db::beginTransaction();
         try {
-            Db::beginTransaction();
             $data = $this->insertRechargeInput($request);
             $payDetailId = $this->doInsert($data);
             (new RechargeController)->disposePaySuccess($payDetailId);
@@ -152,8 +152,8 @@ class PayDetailController extends Curd
             return json_fail('充值密码错误');
         }
 
+        Db::beginTransaction();
         try {
-            Db::beginTransaction();
             $data = $this->insertRechargeInput($request);
             $data['pay_prepayid'] = 'WELFARE';
             
@@ -193,8 +193,8 @@ class PayDetailController extends Curd
         $goods = Goods::find($params['goods_id']);
         $extendJson = [];
         // if (!$params['is_custom']) {
+        Db::beginTransaction();
             try {
-                Db::beginTransaction();
                 if (!$params['is_custom']){
                     $data['pay_amount'] = $goods->goods_sales_price;
                 }

app/admin/controller/order/WholeController.php

@@ -386,8 +386,8 @@ class WholeController extends Curd
     {
         $params = $request->post();
 
+        Db::beginTransaction();
         try {
-            Db::beginTransaction();
 
             // 修改主订单
             // $this->updateMain($params);
@@ -444,8 +444,8 @@ class WholeController extends Curd
     {
         $params = $request->post();
 
+        Db::beginTransaction();
         try {
-            Db::beginTransaction();
 
             $order = Order::where('order_id', $params['order_id'])
                 ->where('order_status_system', 'CANCEL')
@@ -502,8 +502,8 @@ class WholeController extends Curd
     public function insert(Request $request): Response
     {
         $params = $request->post();
+        Db::beginTransaction();
         try {
-            Db::beginTransaction();
             // 余额支付
             if ($params['pay_category'] == 'CASH') {
                 $account = MemberAccount::where('join_account_member_id', $params['join_order_member_id'])
@@ -879,8 +879,8 @@ class WholeController extends Curd
 
         $params = $request->post();
 
+        Db::beginTransaction();
         try {
-            Db::beginTransaction();
             if ($params['express_type'] == '自提') {
                 $premises = SysDept::where('dept_name', $params['order_express_premises'])->first();
                 if (!$premises) {
@@ -1015,8 +1015,8 @@ class WholeController extends Curd
             $times = date('Y-m-d H:i:s', strtotime($times));
         }
 
+        Db::beginTransaction();
         try {
-            Db::beginTransaction();
             // 减额度
             $benefit->member_benefit_used_count = $benefit->member_benefit_used_count + $nbr;
             // 用完了