Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into equity-m

app/adminapi/lists/goods/GoodsLists.php

@@ -42,7 +42,7 @@ class GoodsLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['goods_status','is_agent','is_activity'],
+            '=' => ['goods_status','is_agent','is_activity','goods_payment_type'],
             '%like%' => ['goods_name','goods_brand'],
             'between' => ['service_total', 'service_fee'],
         ];

app/api/logic/ServiceOrderLogic.php

@@ -225,6 +225,7 @@ class ServiceOrderLogic extends BaseLogic
             ]);
             Db::commit();
         } catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }
@@ -314,6 +315,7 @@ class ServiceOrderLogic extends BaseLogic
             $order->save();
             Db::commit();
         } catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }
@@ -365,6 +367,7 @@ class ServiceOrderLogic extends BaseLogic
             }
             Db::commit();
         } catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }
@@ -764,6 +767,7 @@ class ServiceOrderLogic extends BaseLogic
             }
         }
         catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }
@@ -805,6 +809,7 @@ class ServiceOrderLogic extends BaseLogic
             Db::commit();
         }
         catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }
@@ -860,6 +865,7 @@ class ServiceOrderLogic extends BaseLogic
             Db::commit();
         }
         catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }
@@ -884,6 +890,7 @@ class ServiceOrderLogic extends BaseLogic
             Db::commit();
         }
         catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }
@@ -919,6 +926,7 @@ class ServiceOrderLogic extends BaseLogic
             Db::commit();
         }
         catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }
@@ -977,6 +985,7 @@ class ServiceOrderLogic extends BaseLogic
             Db::commit();
         }
         catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }
@@ -1167,6 +1176,7 @@ class ServiceOrderLogic extends BaseLogic
             ]);
             Db::commit();
         } catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }
@@ -1208,6 +1218,7 @@ class ServiceOrderLogic extends BaseLogic
             $work->save();
             Db::commit();
         } catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }

app/workerapi/logic/ReturnWorkLogic.php

@@ -108,6 +108,7 @@ class ReturnWorkLogic extends BaseLogic
             Db::commit();
            return true;
         }catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }

app/workerapi/logic/shops/ShopOrderLogic.php

@@ -106,6 +106,7 @@ class ShopOrderLogic extends BaseLogic
             ShopCart::whereIn('id',$params['shop_cart_id'])->delete();
             Db::commit();
         } catch (\Exception $e) {
+            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }