完善订单导出

app/admin/controller/order/GoodsController.php

@@ -22,6 +22,7 @@ use app\model\PayDetail;
 use app\model\SysDept;
 use support\Db;
 use support\exception\BusinessException;
+use support\Log;
 use support\Redis;
 use support\Request;
 use support\Response;
@@ -582,14 +583,12 @@ class GoodsController extends Curd
             return json_success('创建订单成功');
         } catch (BusinessException $e) {
             Db::rollBack();
-            dump($e->getMessage());
-            dump($e->getTrace());
+            Log::error('创建订单失败', ['msg' => $e->getMessage()]);
             _syslog("订单", $e->getMessage());
             return json_fail($e->getMessage());
         } catch (\Exception $e) {
             Db::rollBack();
-            dump($e->getMessage());
-            dump($e->getTrace());
+            Log::error('创建订单失败', ['msg' => $e->getMessage()]);
             _syslog("订单", "创建订单失败");
             return json_fail('创建订单失败');
         }

app/admin/controller/order/PayDetailController.php

@@ -3,6 +3,8 @@
 namespace app\admin\controller\order;
 
 use app\admin\controller\notify\RechargeController;
+use app\admin\service\goods\GoodsService;
+use app\admin\service\goods\GoodsSkuService;
 use app\admin\service\member\MemberService;
 use app\controller\Curd;
 use app\model\Goods;
@@ -36,7 +38,7 @@ class PayDetailController extends Curd
 //        $where['pay_status'] = 'SUCCESS';
         if ($where['pay_category'] == 'OTHER') {
             $where['pay_status'] = 'SUCCESS';
-            $where['pay_category'] = ['<>', 'RECHARGE'];
+            $where['pay_category'] = ['not in', ['RECHARGE','REFUND','ROLE_REFUND','CROWN_CONTINUE','CLEAR','GIVE']];
         } elseif ($where['pay_category'] == 'RECHARGE') {
             $where['pay_category'] = ['in', ['RECHARGE', 'VIP']];
         }
@@ -304,7 +306,7 @@ class PayDetailController extends Curd
                 $query->select('order_id', 'order_amount_total', 'order_amount_pay', 'order_is_complete', 'order_category', 'order_status_system', 'order_status_payment', 'order_status_storage', 'order_addtimes');
             },
             'goods' => function ($query) {
-                $query->select('goods_id', 'goods_name', 'goods_status', 'goods_market_price', 'goods_sales_price', 'goods_addtimes');
+                $query->select('goods_id', 'goods_name', 'goods_status', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_addtimes');
             },
             'sku' => function ($query) {
                 $query->select('goods_sku_id', 'goods_sku_specs_json', 'goods_sku_market_price', 'goods_sku_sales_price');
@@ -339,6 +341,15 @@ class PayDetailController extends Curd
             ->select('pay_status', 'pay_amount', 'pay_paytimes', 'pay_prepayid')
             ->get();
 
+        foreach ($orderSheet as &$item) {
+            if (!empty($item['goods']) && !empty($item['goods']['goods_cover'])) {
+                $item['goods']['goods_cover'] = getenv("STORAGE_DOMAIN") . $item['goods']['goods_cover'];
+            }
+            if (!empty($item['sku']) && !empty($item['sku']['goods_sku_specs_json'])){
+                $item['sku']['goods_sku_title'] = GoodsSkuService::getSkuTitle($item['sku']['goods_sku_specs_json']);
+            }
+        }
+
         $data = [
             'payDetails' => $payDetails,
             'goodsOrder' => $orderSheet,

app/admin/service/goods/GoodsService.php

@@ -1178,7 +1178,7 @@ class GoodsService
     {
         try {
             // 商品主表
-            $main = Goods::where('goods_id', $goodsId)->first();
+            $main = Goods::with('category')->where('goods_id', $goodsId)->first();
             if (!empty($main)) {
                 $main = $main->toArray();
                 $main['goods_sku_json'] = json_decode($main['goods_sku_json'], true);
@@ -1189,7 +1189,6 @@ class GoodsService
                         'tags' => $sku
                     ];
                 }
-
             } else {
                 $main = [];
             }
@@ -1278,6 +1277,16 @@ class GoodsService
             $data = array_merge($main, $detail, $label, $running, $componentArr);
             $data['goods_sku_json_label'] = [];
 
+            // 创建者
+            $data['creator_username'] = '';
+            if (!empty($data['creator_user_id'])) {
+                $data['creator_username'] = SysUser::where('user_id', $data['creator_user_id'])->value('user_name');
+            }
+            $data['updator_username'] = '';
+            if (!empty($data['updator_user_id'])) {
+                $data['updator_username'] = SysUser::where('user_id', $data['updator_user_id'])->value('user_name');
+            }
+
             $data['goods_label'] = !empty($data['goods_label']) ? explode(',', $data['goods_label']) : [];
             $data['goods_cover'] = getenv('STORAGE_DOMAIN') . $data['goods_cover'];
             if (!empty($data['goods_detail_slider_json'])) {