commit

app/admin/model/order/StoreOrder.php

@@ -259,6 +259,7 @@ HTML;
                         $suk = '(' . $v['productInfo']['attrInfo']['suk'] . ')';
                     }
                 }
+                $bar_code = $v['productInfo']['attrInfo']['bar_code'];
                 $goodsName[] = implode(
                     [$v['productInfo']['store_name'],
                         $suk,
@@ -273,7 +274,7 @@ HTML;
             else $sex_name = '未知';
             $export[] = [
                 $item['order_id'],
-                $sex_name,
+                $bar_code,
                 $item['phone'],
                 $item['real_name'],
                 $item['user_phone'],
@@ -291,7 +292,7 @@ HTML;
                 $item['mark']
             ];
         }
-        PHPExcelService::setExcelHeader(['订单号', '性别', '电话', '收货人姓名', '收货人电话', '收货地址', '商品信息', '商品总件数',
+        PHPExcelService::setExcelHeader(['订单号', '商品编号', '电话', '收货人姓名', '收货人电话', '收货地址', '商品信息', '商品总件数',
             '总价格', '实际支付', '邮费', '优惠金额', '支付状态', '支付时间', '订单状态', '下单时间', '用户备注'])
             ->setExcelTile('订单导出' . date('YmdHis', time()), '订单信息' . time(), ' 生成时间：' . date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)

app/api/controller/auction/AuctionController.php

@@ -59,7 +59,7 @@ class AuctionController
         $data = UtilService::postMore([
             ['id']
         ]);
-        User::beginTrans();
+        Auction::beginTrans();
         if (!$data['id']) return app('json')->fail('数据传入错误');
         if (cache($request->uid())) return app('json')->fail('请勿频繁点击');
         $auctionModel = new Auction();
@@ -116,11 +116,11 @@ class AuctionController
             AuctionBooking::booking($user['uid'], $auction);
             UserBill::expend('预约场馆', $user['uid'], 'anticipate','reduce_anticipate', $auction['anticipate'], 0, $user['anticipate'], '预约扣除易趣卷'); // 写入记录
 
-            User::commitTrans();
+            Auction::commitTrans();
             return app('json')->successful('预约成功');
         }else{
 
-            User::rollbackTrans();
+            Auction::rollbackTrans();
             return app('json')->fail('预约失败');
         }