From 1197d9dc23fad2c88eeb3917004d12595bd7b41c Mon Sep 17 00:00:00 2001
From: phantom <563789445@qq.com>
Date: Mon, 3 Jul 2023 04:44:15 +0000
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=87=BD=E6=95=B0=E4=B8=AD=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E8=B7=AF=E7=94=B1=E6=97=B6=E7=B4=A2?=
=?UTF-8?q?=E5=BC=95=E4=B8=8D=E5=AD=98=E5=9C=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: phantom <563789445@qq.com>
---
crmeb/app/services/system/SystemRouteServices.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmeb/app/services/system/SystemRouteServices.php b/crmeb/app/services/system/SystemRouteServices.php
index 077a9d903..4d496df46 100644
--- a/crmeb/app/services/system/SystemRouteServices.php
+++ b/crmeb/app/services/system/SystemRouteServices.php
@@ -295,7 +295,7 @@ class SystemRouteServices extends BaseServices
$delete[] = $item['id'];
$deleteData[] = [
'path' => $item['path'],
- 'methods' => $item['method']
+ 'method' => $item['method']
];
}
}
From 44f4c3ba3b82c990e4f589359b59619193c385b7 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 3 Jul 2023 14:39:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=98=E8=B4=B9?=
=?UTF-8?q?=E4=BC=9A=E5=91=98=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/services/order/StoreCartServices.php | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/crmeb/app/services/order/StoreCartServices.php b/crmeb/app/services/order/StoreCartServices.php
index d00842ef8..5b0ce37ad 100644
--- a/crmeb/app/services/order/StoreCartServices.php
+++ b/crmeb/app/services/order/StoreCartServices.php
@@ -556,14 +556,7 @@ class StoreCartServices extends BaseServices
*/
public function handleCartList(int $uid, array $cartList, array $addr = [], int $shipping_type = 1)
{
- if (!$cartList) {
- return [$cartList, [], []];
- }
- /** @var StoreProductServices $productServices */
- $productServices = app()->make(StoreProductServices::class);
- /** @var MemberCardServices $memberCardService */
- $memberCardService = app()->make(MemberCardServices::class);
- $vipStatus = $memberCardService->isOpenMemberCard('vip_price', false);
+ if (!$cartList) return [$cartList, [], []];
$tempIds = [];
$userInfo = [];
$discount = 100;
@@ -578,6 +571,12 @@ class StoreCartServices extends BaseServices
$discount = $systemLevel->value(['id' => $userInfo['level'], 'is_del' => 0, 'is_show' => 1], 'discount') ?: 100;
}
}
+
+ //付费会员是否开启，用户是否是付费会员，两个都满足，订单计算金额才会按照付费会员计算。
+ /** @var MemberCardServices $memberCardService */
+ $memberCardService = app()->make(MemberCardServices::class);
+ $vipStatus = $memberCardService->isOpenMemberCard('vip_price', false) && $userInfo['is_money_level'] > 0;
+
//不送达运费模板
if ($shipping_type == 1 && $addr) {
$cityId = (int)($addr['city_id'] ?? 0);
@@ -596,6 +595,8 @@ class StoreCartServices extends BaseServices
}
}
+ /** @var StoreProductServices $productServices */
+ $productServices = app()->make(StoreProductServices::class);
$valid = $invalid = [];
foreach ($cartList as &$item) {
$item['productInfo']['express_delivery'] = false;
From 0ef2a5d1af7a1a9be84a536f269abdc6e344984e Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 3 Jul 2023 16:06:21 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=86=E5=8F=96?=
=?UTF-8?q?=E5=90=8E=E5=A4=9A=E5=B0=91=E5=A4=A9=E5=86=85=E6=9C=89=E6=95=88?=
=?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
template/admin/src/pages/marketing/storeCouponIssue/create.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/template/admin/src/pages/marketing/storeCouponIssue/create.vue b/template/admin/src/pages/marketing/storeCouponIssue/create.vue
index cc5cef09a..15403433f 100644
--- a/template/admin/src/pages/marketing/storeCouponIssue/create.vue
+++ b/template/admin/src/pages/marketing/storeCouponIssue/create.vue
@@ -81,7 +81,7 @@
-
+
领取后多少天内有效
From e92d41c9bc86e3d6d8e8e52ee417319c2b1cd3dd Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 3 Jul 2023 16:06:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/services/activity/coupon/StoreCouponIssueServices.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
index 383bd7ed7..bb667dabc 100644
--- a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
+++ b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
@@ -118,7 +118,7 @@ class StoreCouponIssueServices extends BaseServices
if ($data['end_time'] && $data['end_use_time']) {
if ($data['end_use_time'] < $data['end_time']) {
- throw new AdminException(400514);
+ throw new AdminException('用户领取数量不能大于优惠券发布数量');
}
}