更新

app/Admin/Controllers/GoodController.php

@@ -152,7 +152,7 @@ protected function form()
                 $form->image('cover_img')
                 $form->image('cover_img')
                     ->url('upload/goods')
                     ->url('upload/goods')
                     ->deleteUrl('upload/delete-public-oss-file')
                     ->deleteUrl('upload/delete-public-oss-file')
-                    ->autoUpload();
+                    ->autoUpload()->help("仅支持jpg、jpeg、png格式图片上传,尺寸大小 280px * 280px");
                 // $form->image('cover_img')
                 // $form->image('cover_img')
                 //     ->accept('jpg,jpeg,png')
                 //     ->accept('jpg,jpeg,png')
                 //     ->maxSize(4096)
                 //     ->maxSize(4096)
@@ -166,11 +166,11 @@ protected function form()
                 //     ->help('仅支持jpg、jpeg、png格式图片上传（尺寸 750px*750px）')
                 //     ->help('仅支持jpg、jpeg、png格式图片上传（尺寸 750px*750px）')
                 //     ->limit(5)
                 //     ->limit(5)
                 //     ->autoUpload()->saveAsJson();
                 //     ->autoUpload()->saveAsJson();
-                $form->multipleImage('carousel', '产品图')
+                $form->multipleImage('carousel', '轮播图')
                     ->accept('jpg,jpeg,png')
                     ->accept('jpg,jpeg,png')
                     ->maxSize(51200)
                     ->maxSize(51200)
                     ->url('upload/goods')
                     ->url('upload/goods')
-                    ->help('仅支持jpg、jpeg、png格式图片上传')
+                    ->help('仅支持jpg、jpeg、png格式图片上传,尺寸大小 750px * 600px')
                     ->limit(9)
                     ->limit(9)
                     ->autoUpload()->saveAsJson();
                     ->autoUpload()->saveAsJson();
                 $form->switch('is_show', '上架状态')->default(1);
                 $form->switch('is_show', '上架状态')->default(1);

app/Admin/Controllers/OrderInfoController.php

@@ -29,7 +29,7 @@ class OrderInfoController extends AdminController
     protected function grid()
     protected function grid()
     {
     {
         return Grid::make(OrderInfo::with(['user', 'merchant']), function (Grid $grid) {
         return Grid::make(OrderInfo::with(['user', 'merchant']), function (Grid $grid) {
-            $grid->model()->orderBy('created_at', 'DESC');
+            $grid->model()->orderBy('id', 'DESC');
             $grid->column('id')->sortable();
             $grid->column('id')->sortable();
             $grid->column('order_sn', '订单号')->width(80);
             $grid->column('order_sn', '订单号')->width(80);
             $grid->column('mobile', '手机号');
             $grid->column('mobile', '手机号');

app/Http/Controllers/Api/OrderController.php

@@ -500,7 +500,7 @@ public function scanCodeVerifi(Request $request)
             return $this->JsonResponse('', '参数错误', 201);
             return $this->JsonResponse('', '参数错误', 201);
         }
         }
 
 
-        Log::add('核销操作5', [$orderObj->verification_at]);
+        Log::add('核销操作', [$orderObj->verification_at]);
         if (!$orderObj->verification_at) {
         if (!$orderObj->verification_at) {
             $orderObj->order_status = 3;
             $orderObj->order_status = 3;
             $orderObj->verifier_id = $verObj->id;
             $orderObj->verifier_id = $verObj->id;
@@ -509,13 +509,14 @@ public function scanCodeVerifi(Request $request)
             //$orderObj->save();
             //$orderObj->save();
             try {
             try {
                 //接入微信小程序发货管理
                 //接入微信小程序发货管理
+                Log::add('是否核销126', []);
                 //付款记录
                 //付款记录
                 $recordObj = PaymentRecord::where('order_sn', $orderObj->order_sn)->first();
                 $recordObj = PaymentRecord::where('order_sn', $orderObj->order_sn)->first();
-                $transaction_id = $recordObj->other_order;
-                $payerOpenid = UserModel::where('id', $recordObj->uid)->value('openid');
-                if (!$transaction_id) {
+                if (!$recordObj) {
                     throw new Exception('该订单尚未支付');
                     throw new Exception('该订单尚未支付');
                 }
                 }
+                $transaction_id = $recordObj->other_order;
+                $payerOpenid = UserModel::where('id', $recordObj->uid)->value('openid');
                 //商品信息
                 //商品信息
                 $ogItem = DB::table('li_order_goods')
                 $ogItem = DB::table('li_order_goods')
                     ->select(DB::raw('GROUP_CONCAT(goods_name) as shipping_goods'))
                     ->select(DB::raw('GROUP_CONCAT(goods_name) as shipping_goods'))
@@ -552,7 +553,7 @@ public function scanCodeVerifi(Request $request)
                 }
                 }
 
 
                 DB::commit();
                 DB::commit();
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 DB::rollBack();
                 DB::rollBack();
                 return  $this->JsonResponse('', $e->getMessage(), 500);
                 return  $this->JsonResponse('', $e->getMessage(), 500);
             }
             }