diff --git a/app/common/dao/store/StoreActivityDao.php b/app/common/dao/store/StoreActivityDao.php index b3f9628b..b8289bc4 100644 --- a/app/common/dao/store/StoreActivityDao.php +++ b/app/common/dao/store/StoreActivityDao.php @@ -119,11 +119,12 @@ class StoreActivityDao extends BaseDao public function canBuy($userId, $productId) { $activityId = Db::name('cloud_product')->where('product_id', $productId)->value('activity_id'); - $find = Db::name('store_activity_order_product')->where('user_id', $userId)->where('status', 1)->find(); + $find = Db::name('store_activity_order_product')->where('user_id', $userId)->where('product_id',$productId)->where('status', 1)->find(); + $data=['activityId'=>$activityId,'is_true'=>true]; if ($find && $activityId == 2) { - return false; + $data['is_true']=false; } - return $activityId; + return $data; } /** diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 4362247e..0551cade 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -104,13 +104,13 @@ class StoreOrderCreateRepository extends StoreOrderRepository $source = $cart['source']; if($source==103){ $canBuy = (new StoreActivityDao())->canBuy($cart['uid'], $cart['product_id']); - if (!$canBuy) { - throw new ValidateException('活动商品限购1个'); + if ($canBuy['is_true']==false) { + throw new ValidateException('活动商品限购13个'); } - if ($canBuy == 2) { + if ($canBuy['activityId']== 2) { $activityProductCount += $cart['cart_num']; if ($activityProductCount > 1){ - throw new ValidateException('活动商品限购1个'); + throw new ValidateException('活动商品限购12个'); } } }