fix:最新的

application/admin/controller/shop/Report.php

@@ -31,14 +31,28 @@ class Report extends Backend
         }
 
         //今日订单和会员
-        $totalOrderAmount = round(Order::where('order_status', 'IN', [OrderEnum::STATUS_PAY, OrderEnum::STATUS_SHIP, OrderEnum::STATUS_CONFIRM, OrderEnum::STATUS_AUTO_CONFIRM])->where('pay_time', '>', 0)->sum('pay_amount'), 2);
-        $totalRefundAmount = round(OrderAftersales::where('status', 2)->where('type', '<>', 3)->sum('refund'), 2); //退款的
-
-        $yesterdayOrderAmount = round(Order::where('order_status', 'IN', [OrderEnum::STATUS_PAY, OrderEnum::STATUS_SHIP, OrderEnum::STATUS_CONFIRM, OrderEnum::STATUS_AUTO_CONFIRM])->whereTime('pay_time', 'yesterday')->sum('pay_amount'), 2);
-        $yesterdayRefundAmount = round(OrderAftersales::where('status', 2)->where('type', '<>', 3)->whereTime('createtime', 'yesterday')->sum('refund'), 2);
-
-        $todayOrderAmount = round(Order::where('order_status', 'IN', [OrderEnum::STATUS_PAY, OrderEnum::STATUS_SHIP, OrderEnum::STATUS_CONFIRM, OrderEnum::STATUS_AUTO_CONFIRM])->whereTime('pay_time', 'today')->sum('pay_amount'), 2);
-        $todayRefundAmount = round(OrderAftersales::where('status', 2)->where('type', '<>', 3)->whereTime('createtime', 'today')->sum('refund'), 2);
+        $totalOrderAmount = round(Order::where('order_status', 'IN', [OrderEnum::STATUS_PAY, OrderEnum::STATUS_SHIP, OrderEnum::STATUS_CONFIRM, OrderEnum::STATUS_AUTO_CONFIRM])
+        ->where('pay_time', '>', 0)
+        ->sum('pay_amount'), 2);
+        $totalRefundAmount = round(OrderAftersales::where('status', 2)
+        ->where('type', '<>', 3)
+        ->sum('refund'), 2); //退款的
+
+        $yesterdayOrderAmount = round(Order::where('order_status', 'IN', [OrderEnum::STATUS_PAY, OrderEnum::STATUS_SHIP, OrderEnum::STATUS_CONFIRM, OrderEnum::STATUS_AUTO_CONFIRM])
+        ->whereTime('pay_time', 'yesterday')
+        ->sum('pay_amount'), 2);
+        $yesterdayRefundAmount = round(OrderAftersales::where('status', 2)
+        ->where('type', '<>', 3)
+        ->whereTime('createtime', 'yesterday')
+        ->sum('refund'), 2);
+
+        $todayOrderAmount = round(Order::where('order_status', 'IN', [OrderEnum::STATUS_PAY, OrderEnum::STATUS_SHIP, OrderEnum::STATUS_CONFIRM, OrderEnum::STATUS_AUTO_CONFIRM])
+        ->whereTime('pay_time', 'today')
+        ->sum('pay_amount'), 2);
+        $todayRefundAmount = round(OrderAftersales::where('status', 2)
+        ->where('type', '<>', 3)
+        ->whereTime('createtime', 'today')
+        ->sum('refund'), 2);
 
         $todayOrderRatio = $yesterdayOrderAmount > 0 ? ceil((($todayOrderAmount - $yesterdayOrderAmount) / $yesterdayOrderAmount) * 100) : ($todayOrderAmount > 0 ? 100 : 0);
 
@@ -481,7 +495,6 @@ class Report extends Backend
     }
 
     //订单按分类分布
-    //订单按分类分布
     protected function getCategoryOrder($date = '')
     {
         if ($date) {

application/admin/model/shop/OrderGoods.php

@@ -26,33 +26,15 @@ class OrderGoods extends Model
         'commentstate_text'
     ];
 
-
-    public function getUrlAttr($value, $data)
-    {
-        return $this->buildUrl($value, $data);
-    }
-
-    private function buildUrl($value, $data, $domain = false)
-    {
-        $diyname = isset($data['diyname']) && $data['diyname'] ? $data['diyname'] : $data['goods_id'];
-        $time = $data['publishtime'] ?? time();
-        $vars = [
-            ':id'      => $data['goods_id'],
-            ':cateid'  => '0',
-            ':diyname' => $diyname,
-            ':year'    => date("Y", $time),
-            ':month'   => date("m", $time),
-            ':day'     => date("d", $time),
-        ];
-        $config = get_addon_config('shop');
-        $suffix = $config['moduleurlsuffix']['goods'] ?? $config['urlsuffix'];
-        return addon_url('shop/goods/index', $vars, $suffix, $domain);
-    }
-
-
     public function getSalestateList()
     {
-        return ['0' => __('Salestate 0'), '1' => __('Salestate 1'), '2' => __('Salestate 2'), '3' => __('Salestate 3'), '4' => __('Salestate 4'), '5' => __('Salestate 5'), '6' => __('Salestate 6')];
+        return [
+        '0' => __('Salestate 0'),
+         '1' => __('Salestate 1'),
+         '2' => __('Salestate 2'), 
+         '3' => __('Salestate 3'), 
+         '4' => __('Salestate 4'), 
+         '5' => __('Salestate 5'), '6' => __('Salestate 6')];
     }
 
     public function getCommentstateList()

application/admin/view/shop/report/index.html

@@ -100,72 +100,7 @@
         </div>
     </div>
 </div>
-<div class="row" style="margin-top:15px;">
-    <div class="col-xs-6 col-sm-3">
-        <div class="panel panel-default panel-intro panel-statistics">
-            <div class="panel-body">
-                <div class="pull-left">
-                    <h4>总利润</h4>
-                    <h3>
-                        ￥
-                        <span id="totalProfitAmount">{$totalProfitAmount|sprintf='%.2f',###}</span>
-                    </h3>
-                </div>
-                <div class="pull-right" style="color:#c8e3ff;">
-                    <i class="fa fa-gift fa-4x"></i>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="col-xs-6 col-sm-3">
-        <div class="panel panel-default panel-intro panel-statistics">
-            <div class="panel-body">
-                <div class="pull-left">
-                    <h4>总退款金额</h4>
-                    <h3>
-                        ￥
-                        <span id="totalRefundAmount">{$totalRefundAmount|sprintf='%.2f',###}</span>
-                    </h3>
-                </div>
-                <div class="pull-right" style="color:#c8cfff;">
-                    <i class="fa fa-reply-all fa-4x"></i>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="col-xs-6 col-sm-3">
-        <div class="panel panel-default panel-intro panel-statistics">
-            <div class="panel-body">
-                <div class="pull-left">
-                    <h4>今日退款金额</h4>
-                    <h3>
-                        ￥
-                        <span id="todayRefundAmount">{$todayRefundAmount|sprintf='%.2f',###}</span>
-                    </h3>
-                </div>
-                <div class="pull-right" style="color:#ffc8c8;">
-                    <i class="fa fa-calendar-times-o fa-4x"></i>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="col-xs-6 col-sm-3">
-        <div class="panel panel-default panel-intro panel-statistics">
-            <div class="panel-body">
-                <div class="pull-left">
-                    <h4>昨天退款金额</h4>
-                    <h3>
-                        ￥
-                        <span id="yesterdayRefundAmount">{$yesterdayRefundAmount|sprintf='%.2f',###}</span>
-                    </h3>
-                </div>
-                <div class="pull-right" style="color:#c8e3ff;">
-                    <i class="fa fa-calendar-minus-o fa-4x"></i>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
+
 
 <!-- 订单金额 -->
 <div class="row" style="margin-top:15px;">

application/common/Enum/OrderEnum.php

@@ -133,7 +133,7 @@ class OrderEnum
         self::STATUS_CANCEL => "已取消",
         self::STATUS_AUTO_CANCEL => "已取消(系统)",
         self::STATUS_ADMIN_CANCEL => "已取消(管理员)",
-        self::STATUS_PAY => "已付款",
+        self::STATUS_PAY => "待发货",
         // self::STATUS_REFUND => "订单取消，退款中",
         // self::STATUS_REFUND_CONFIRM => "已退款",
         // self::STATUS_GROUPON_TIMEOUT => "已超时团购",