完善功能

app/admin/service/goods/GoodsService.php

@@ -138,7 +138,7 @@ class GoodsService
      * @param Request $request
      * @return Response
      */
-    public static function selectList(Request $request, $goodsClassify)
+    public static function selectList(Request $request, $goodsClassify="SERVICE")
     {
         $keywords = $request->get('keywords', '');
 //        if (!$keywords){

app/admin/service/order/OrderService.php

@@ -3,6 +3,8 @@
 namespace app\admin\service\order;
 
 use app\model\Order;
+use app\model\OrderSheet;
+use support\Db;
 use support\Redis;
 
 class OrderService
@@ -22,11 +24,16 @@ class OrderService
         if (!$redis->exists($key)) {
             return;
         }
+        Db::beginTransaction();
         try {
             $orderIds = $redis->smembers($key);
             Order::whereIn('order_id', $orderIds)->update(['order_is_complete' => 'Y', 'order_status_system' => 'CONFIRM']);
+            OrderSheet::whereIn('join_sheet_order_id', $orderIds)->update(['order_sheet_status' => 'CONFIRM']);
             $redis->del($key);
+
+            Db::commit();
         } catch (\Exception $e) {
+            Db::rollBack();
         }
     }
 }