github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-31 06:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

Browse Source
This commit is contained in:
From-wh 2023-07-03 17:49:05 +08:00
commit 70af5b77c9
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
View File

@ -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('用户领取数量不能大于优惠券发布数量');
}
}

17
crmeb/app/services/order/StoreCartServices.php
View File

@ -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;

2
crmeb/app/services/system/SystemRouteServices.php
View File

@ -295,7 +295,7 @@ class SystemRouteServices extends BaseServices
$delete[] = $item['id'];
$deleteData[] = [
'path' => $item['path'],
'methods' => $item['method']
'method' => $item['method']
];
}
}

2
template/admin/src/pages/marketing/storeCouponIssue/create.vue
View File

@ -81,7 +81,7 @@
</RadioGroup>
</FormItem>
<FormItem v-show="isCouponTime" label="">
<InputNumber :min="1" v-model="formData.coupon_time" :precision="0"></InputNumber>
<InputNumber :min="1" :max="99999" v-model="formData.coupon_time" :precision="0"></InputNumber>
<div class="info">领取后多少天内有效</div>
</FormItem>
<FormItem v-show="!isCouponTime" label="">