mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除支付后的活动商品判断

Browse Source
This commit is contained in:
mkm 2024-01-28 15:57:49 +08:00
parent d6a56e119f
commit fb5d12d93c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/common/dao/store/StoreActivityDao.php
View File

@ -23,6 +23,7 @@ use app\common\repositories\store\product\SpuRepository;
use think\db\Query; use think\db\Query;
use think\exception\ValidateException; use think\exception\ValidateException;
use think\facade\Db; use think\facade\Db;
use think\facade\Log;
/** /**
* *
@ -147,18 +148,19 @@ class StoreActivityDao extends BaseDao
if (empty($productIds)) { if (empty($productIds)) {
return; return;
} }
$find = StoreActivityOrderProduct::where('user_id', $order['uid'])->where('status', 1)->find(); // $find = StoreActivityOrderProduct::where('user_id', $order['uid'])->where('status', 1)->find();
foreach ($productIds as $productId) { foreach ($productIds as $productId) {
if (!empty($find['product_id']) && $find['product_id'] == $productId && $activityId == 2) { // if (!empty($find['product_id']) && $find['product_id'] == $productId && $activityId == 2) {
throw new ValidateException('活动商品限购1个'); // throw new ValidateException('活动商品限购1个');
} // }
$model = new StoreActivityOrderProduct(); $model = new StoreActivityOrderProduct();
$model->user_id = $order['uid']; $model->user_id = $order['uid'];
$model->activity_id = $activityId; $model->activity_id = $activityId;
$model->product_id = $productId; $model->product_id = $productId;
$model->number = 1; $model->number = 1;
if (!$model->save()) { if (!$model->save()) {
throw new ValidateException('活动商品数据保存失败'); Log::error('活动商品数据保存失败productId'.$productId);
// throw new ValidateException('活动商品数据保存失败');
} }
} }
} }

3
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -164,8 +164,7 @@ class StoreOrderRepository extends BaseRepository
Db::commit(); Db::commit();
} catch (Exception $e) { } catch (Exception $e) {
Db::rollback(); Db::rollback();
halt($e); throw new ValidateException('余额支付失败'.$e->getMessage());
throw new ValidateException('余额支付失败');
} }
return app('json')->status('success', '余额支付成功', ['order_id' => $groupOrder['group_order_id']]); return app('json')->status('success', '余额支付成功', ['order_id' => $groupOrder['group_order_id']]);