From cfef324f101ae6da7633c662a5a09f8a2523c2df Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 23 Feb 2022 13:41:58 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0?=
=?UTF-8?q?=E6=8B=92=E7=BB=9D=E6=94=B6=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Admin/Forms/DealerOrderRefuse.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/app/Admin/Forms/DealerOrderRefuse.php b/app/Admin/Forms/DealerOrderRefuse.php
index c7e0ec34..0525e799 100644
--- a/app/Admin/Forms/DealerOrderRefuse.php
+++ b/app/Admin/Forms/DealerOrderRefuse.php
@@ -40,6 +40,10 @@ class DealerOrderRefuse extends Form
$order->update([
'status' => DealerOrderStatus::Paying,
+ //置空已支付的信息
+ 'pay_way'=> null,
+ 'pay_image'=> null,
+ 'pay_info' => null,
'pay_time' => null,
]);
From 65e34484074876991d8135e3663b44b1375466ca Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 23 Feb 2022 13:43:43 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8B=92=E7=BB=9D?=
=?UTF-8?q?=E6=94=B6=E6=AC=BE=E7=9A=84=E8=A1=A8=E5=8D=95=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Admin/Forms/DealerOrderRefuse.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/Admin/Forms/DealerOrderRefuse.php b/app/Admin/Forms/DealerOrderRefuse.php
index 0525e799..e852922c 100644
--- a/app/Admin/Forms/DealerOrderRefuse.php
+++ b/app/Admin/Forms/DealerOrderRefuse.php
@@ -71,7 +71,7 @@ class DealerOrderRefuse extends Form
*/
public function form()
{
- $this->textarea('reason', '原因')->rules('required|max:255');
+ $this->textarea('reason', '原因')->required()->rules('required|max:255');
}
/**
From 55400515e5fd936ad5f539a265affdc3397e69f1 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 23 Feb 2022 14:52:27 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Admin/Controllers/DealerController.php | 3 ++-
app/Admin/Controllers/DealerOrderController.php | 6 +++++-
app/Admin/Metrics/StatisticsTotal.php | 6 ++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/Admin/Controllers/DealerController.php b/app/Admin/Controllers/DealerController.php
index 42c0251c..3bc35c43 100644
--- a/app/Admin/Controllers/DealerController.php
+++ b/app/Admin/Controllers/DealerController.php
@@ -88,8 +88,9 @@ class DealerController extends AdminController
$grid->filter(function (Grid\Filter $filter) {
$filter->panel();
$filter->equal('user.phone')->width(3);
- $filter->equal('userInfo.nickname')->width(3);
$filter->equal('userInfo.inviterInfo.user.phone')->width(3);
+ $filter->equal('userInfo.realInviterInfo.user.phone')->width(3);
+ $filter->equal('userInfo.nickname')->width(4);
});
});
}
diff --git a/app/Admin/Controllers/DealerOrderController.php b/app/Admin/Controllers/DealerOrderController.php
index 1181807c..2b52bdcd 100644
--- a/app/Admin/Controllers/DealerOrderController.php
+++ b/app/Admin/Controllers/DealerOrderController.php
@@ -107,7 +107,11 @@ class DealerOrderController extends AdminController
$actions->append(new DealerOrderShipping());
}
}
- if ($actions->row->isPending() && Admin::user()->can('dcat.admin.dealer_orders.cancel')) {
+ if ((
+ $actions->row->isPending() //待确认
+ || $actions->row->isPay() //待付款
+ || $actions->row->isPaid() //待收款
+ ) && Admin::user()->can('dcat.admin.dealer_orders.cancel')) {
$actions->append(new DealerOrderCancel());
}
});
diff --git a/app/Admin/Metrics/StatisticsTotal.php b/app/Admin/Metrics/StatisticsTotal.php
index 16a095a4..22741b72 100644
--- a/app/Admin/Metrics/StatisticsTotal.php
+++ b/app/Admin/Metrics/StatisticsTotal.php
@@ -3,6 +3,7 @@
namespace App\Admin\Metrics;
use App\Models\Balance;
+use App\Models\DealerWallet;
use App\Models\DistributionPreIncome;
use App\Models\UserInfo;
use App\Models\Wallet;
@@ -40,6 +41,7 @@ class StatisticsTotal extends RadialBar
'total_distribution'=> DistributionPreIncome::unsettlement()->sum('total_revenue'),
'total_quota_v2' => UserInfo::sum('quota_v2'),
'total_quota_v1' => UserInfo::sum('quota_v1'),
+ 'total_dealer_wallet' => bcdiv(DealerWallet::sum('balance'), 100, 2),
]);
}
@@ -82,6 +84,10 @@ class StatisticsTotal extends RadialBar
{$content['total_quota_v1']}
老配额
+
+
{$content['total_dealer_wallet']}
+ 批零余额
+
HTML
);
From d0ca429c4c692d5dfa2009173a60578f239e34c1 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 23 Feb 2022 14:53:17 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Admin/Metrics/StatisticsTotal.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/Admin/Metrics/StatisticsTotal.php b/app/Admin/Metrics/StatisticsTotal.php
index 22741b72..ca6649a6 100644
--- a/app/Admin/Metrics/StatisticsTotal.php
+++ b/app/Admin/Metrics/StatisticsTotal.php
@@ -41,7 +41,7 @@ class StatisticsTotal extends RadialBar
'total_distribution'=> DistributionPreIncome::unsettlement()->sum('total_revenue'),
'total_quota_v2' => UserInfo::sum('quota_v2'),
'total_quota_v1' => UserInfo::sum('quota_v1'),
- 'total_dealer_wallet' => bcdiv(DealerWallet::sum('balance'), 100, 2),
+ 'total_dealer_wallet' => bcdiv(DealerWallet::sum('balance'), 1, 2),
]);
}