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('用户领取数量不能大于优惠券发布数量');
}
}
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;
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']
];
}
}
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 @@
-
+
领取后多少天内有效