From 3ea8e948e6a01ed81dd1d54d9e9e55bd78f046ea Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 00:08:11 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=88=86=E9=94=80=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=80=89=E6=8B=A9=E5=90=88=E4=BC=99=E4=BA=BA?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E7=9A=84=E8=AF=9D=EF=BC=8C=E5=88=99=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/DistributionLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/logic/DistributionLogic.php b/app/api/logic/DistributionLogic.php index 78740403..9c7869a1 100755 --- a/app/api/logic/DistributionLogic.php +++ b/app/api/logic/DistributionLogic.php @@ -115,7 +115,7 @@ class DistributionLogic extends Logic // 'cost_card' => $post['cost_card'], 'partner_id' => $post['partner_id'], 'store_id' => $post['store_id'], - 'own_city' => $post['own_city'], + 'own_city' => $post['own_city'] ?? '', ]; \app\common\logic\DistributionLogic::add($post['user_id']); From c6fc074fd60adc2a9e256accce4132334555d271 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 09:02:06 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8F=82=E6=95=B0=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/view/groupbuy/group_buy/lists.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/view/groupbuy/group_buy/lists.html b/app/admin/view/groupbuy/group_buy/lists.html index 35db7a45..275c7e60 100644 --- a/app/admin/view/groupbuy/group_buy/lists.html +++ b/app/admin/view/groupbuy/group_buy/lists.html @@ -81,28 +81,28 @@
活动开启
- +
活动倒计时(结束)时间
- +
规则说明：
- +
服务：
- +
From 240c721be94ef9cdfe8c7e19580d9dc6f2106cea Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 09:13:21 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/GroupBuyLogic.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/api/logic/GroupBuyLogic.php b/app/api/logic/GroupBuyLogic.php index 1743f27c..4de1b8fd 100644 --- a/app/api/logic/GroupBuyLogic.php +++ b/app/api/logic/GroupBuyLogic.php @@ -54,9 +54,10 @@ class GroupBuyLogic extends Logic $v['value'] = strtotime($v['value']); } - if ($v['name'] == 'service') { + if ($v['name'] == 'service' && $v['value']) { $v['value'] = explode(',', $v['value']); } + $config[$v['name']] = $v['value']; } } From b66ed3c58387a9e19a66ebfef30cad206c7c8d50 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 13:22:14 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E9=A2=84=E7=83=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/Order.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/api/controller/Order.php b/app/api/controller/Order.php index 3125a0f6..0a0c78dd 100755 --- a/app/api/controller/Order.php +++ b/app/api/controller/Order.php @@ -36,11 +36,11 @@ class Order extends Api $post['user_id'] = $this->user_id; $post['client'] = $this->client; (new OrderValidate())->goCheck('add', $post); - if(isset($post['order_type'])){ - if($post['order_type'] == 4){ - return JsonServer::error("活动正在预热，敬请等待"); - } - } +// if(isset($post['order_type'])){ +// if($post['order_type'] == 4){ +// return JsonServer::error("活动正在预热，敬请等待"); +// } +// } $order = OrderLogic::add($post); if (false === $order) { return JsonServer::error(OrderLogic::getError()); From 5e4d66e5d4e825e3f744a105a45fb588ab6aa14d Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 13:52:09 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/GoodsLogic.php | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php index f80af779..d5c944e8 100755 --- a/app/api/logic/GoodsLogic.php +++ b/app/api/logic/GoodsLogic.php @@ -1130,17 +1130,13 @@ class GoodsLogic extends Logic } foreach($GroupbuyGoods as $item) { - // 获取该商品的秒杀信息 - $GroupbuyGoods_info = GroupbuyGoods::where([ - 'goods_id' => $goods['id'], - ])->column('goods_id,item_id,activity_price,stock,limited_num', 'item_id'); - + // 获取该商品的秒杀信息 + $GroupbuyGoods_info = GroupbuyGoods::where([ + 'goods_id' => $goods['id'], + ])->column('goods_id,item_id,activity_price,stock,limited_num', 'item_id'); } - - - // 确定是抢购商品 - // 先将商品市场价换成原SKU最小价 + // 确定是抢购商品 先将商品市场价换成原SKU最小价 $goods['market_price'] = $goods['min_price']; // 替换活动价 foreach($goods['goods_item'] as &$item) { @@ -1159,14 +1155,22 @@ class GoodsLogic extends Logic } // 如果当前用户参与了抢购的活动（则不允许再次抢购） - $in_activity = Order::where(['user_id' => $userId, 'order_type' => 4])->where('order_status', '<', 4)->find(); +// $in_activity = Order::where(['user_id' => $userId, 'order_type' => 4])->where('order_status', '<', 4)->find(); +// +// $goods['activity'] = [ +// 'type' => 4, +// 'type_desc' => '抢购商品', +// 'in_groupbuy_activity' => (bool)$in_activity, +// 'msg' => '您已参与过本次活动，无法再次参与！' +// ]; - $goods['activity'] = [ - 'type' => 4, - 'type_desc' => '抢购商品', - 'in_groupbuy_activity' => (bool)$in_activity, - 'msg' => '您已参与过本次活动，无法再次参与！' - ]; + // 2024-11-29 更改规则：活动中的每件商品用户都能购买，但是只能买一件 + $goods = Order::alias('a') + ->join('order_goods og', 'a.id = order_goods.order_id') + ->where(['a.user_id' => $userId, 'a.order_type' => 4, 'og.goods_id' => $goods['id']]) + ->where('a.order_status', '<', 4) + ->find(); + dump($goods);die; return $goods; } From be345867883caea962ec0d5cfb9daae7b2be5f51 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 13:52:53 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/GoodsLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php index d5c944e8..eac7254e 100755 --- a/app/api/logic/GoodsLogic.php +++ b/app/api/logic/GoodsLogic.php @@ -1166,7 +1166,7 @@ class GoodsLogic extends Logic // 2024-11-29 更改规则：活动中的每件商品用户都能购买，但是只能买一件 $goods = Order::alias('a') - ->join('order_goods og', 'a.id = order_goods.order_id') + ->join('order_goods og', 'a.id = og.order_id') ->where(['a.user_id' => $userId, 'a.order_type' => 4, 'og.goods_id' => $goods['id']]) ->where('a.order_status', '<', 4) ->find(); From ffd01c74d23d01e79b330e49004bbdc855d8b4ec Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 13:55:24 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/GoodsLogic.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php index eac7254e..2d4d7490 100755 --- a/app/api/logic/GoodsLogic.php +++ b/app/api/logic/GoodsLogic.php @@ -1170,8 +1170,16 @@ class GoodsLogic extends Logic ->where(['a.user_id' => $userId, 'a.order_type' => 4, 'og.goods_id' => $goods['id']]) ->where('a.order_status', '<', 4) ->find(); - dump($goods);die; - return $goods; + if (!empty($goods)) { + $goods['activity'] = [ + 'type' => 4, + 'type_desc' => '抢购商品', + 'in_groupbuy_activity' => true, + 'msg' => '您已购买过改商品！' + ]; + + return $goods; + } } } From 9fde3c55d7c076750390c7cefe5c2f00c897cc77 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 14:09:23 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/GoodsLogic.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php index 2d4d7490..6a795e6e 100755 --- a/app/api/logic/GoodsLogic.php +++ b/app/api/logic/GoodsLogic.php @@ -111,7 +111,6 @@ class GoodsLogic extends Logic // 转数组 $goodsDetailArr = $goodsDetail->toArray(); - $goodsDetailArr['poster'] = !empty($goodsDetailArr['poster']) ? UrlServer::getFileUrl($goodsDetailArr['poster']) : ''; foreach ($goodsDetailArr['goods_item'] as &$valItem){ $valItem['limited_num'] = 0; @@ -1165,21 +1164,21 @@ class GoodsLogic extends Logic // ]; // 2024-11-29 更改规则：活动中的每件商品用户都能购买，但是只能买一件 - $goods = Order::alias('a') + $in_activity = Order::alias('a') ->join('order_goods og', 'a.id = og.order_id') ->where(['a.user_id' => $userId, 'a.order_type' => 4, 'og.goods_id' => $goods['id']]) ->where('a.order_status', '<', 4) ->find(); - if (!empty($goods)) { + if (!empty($in_activity)) { $goods['activity'] = [ 'type' => 4, 'type_desc' => '抢购商品', 'in_groupbuy_activity' => true, 'msg' => '您已购买过改商品！' ]; - - return $goods; } + + return $goods; } } From 1df6789afc83b35f5941c6fdd6e13ceade75eb08 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 14:19:40 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/GoodsLogic.php | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php index 6a795e6e..ff24d096 100755 --- a/app/api/logic/GoodsLogic.php +++ b/app/api/logic/GoodsLogic.php @@ -1154,30 +1154,30 @@ class GoodsLogic extends Logic } // 如果当前用户参与了抢购的活动（则不允许再次抢购） -// $in_activity = Order::where(['user_id' => $userId, 'order_type' => 4])->where('order_status', '<', 4)->find(); -// -// $goods['activity'] = [ -// 'type' => 4, -// 'type_desc' => '抢购商品', -// 'in_groupbuy_activity' => (bool)$in_activity, -// 'msg' => '您已参与过本次活动，无法再次参与！' -// ]; + $in_activity = Order::where(['user_id' => $userId, 'order_type' => 4])->where('order_status', '<', 4)->find(); + + $goods['activity'] = [ + 'type' => 4, + 'type_desc' => '抢购商品', + 'in_groupbuy_activity' => (bool)$in_activity, + 'msg' => '您已参与过本次活动，无法再次参与！' + ]; // 2024-11-29 更改规则：活动中的每件商品用户都能购买，但是只能买一件 - $in_activity = Order::alias('a') - ->join('order_goods og', 'a.id = og.order_id') - ->where(['a.user_id' => $userId, 'a.order_type' => 4, 'og.goods_id' => $goods['id']]) - ->where('a.order_status', '<', 4) - ->find(); - - if (!empty($in_activity)) { - $goods['activity'] = [ - 'type' => 4, - 'type_desc' => '抢购商品', - 'in_groupbuy_activity' => true, - 'msg' => '您已购买过改商品！' - ]; - } +// $in_activity = Order::alias('a') +// ->join('order_goods og', 'a.id = og.order_id') +// ->where(['a.user_id' => $userId, 'a.order_type' => 4, 'og.goods_id' => $goods['id']]) +// ->where('a.order_status', '<', 4) +// ->find(); +// +// if (!empty($in_activity)) { +// $goods['activity'] = [ +// 'type' => 4, +// 'type_desc' => '抢购商品', +// 'in_groupbuy_activity' => true, +// 'msg' => '您已购买过改商品！' +// ]; +// } return $goods; } From 58f804a379e1c2e4848a643d087d9296a5a6d005 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 14:24:01 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/GoodsLogic.php | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php index ff24d096..5faa4f27 100755 --- a/app/api/logic/GoodsLogic.php +++ b/app/api/logic/GoodsLogic.php @@ -1154,31 +1154,29 @@ class GoodsLogic extends Logic } // 如果当前用户参与了抢购的活动（则不允许再次抢购） - $in_activity = Order::where(['user_id' => $userId, 'order_type' => 4])->where('order_status', '<', 4)->find(); +// $in_activity = Order::where(['user_id' => $userId, 'order_type' => 4])->where('order_status', '<', 4)->find(); +// +// $goods['activity'] = [ +// 'type' => 4, +// 'type_desc' => '抢购商品', +// 'in_groupbuy_activity' => (bool)$in_activity, +// 'msg' => '您已参与过本次活动，无法再次参与！' +// ]; + + // 2024-11-29 更改规则：活动中的每件商品用户都能购买，但是只能买一件 + $in_activity = Order::alias('a') + ->join('order_goods og', 'a.id = og.order_id') + ->where(['a.user_id' => $userId, 'a.order_type' => 4, 'og.goods_id' => $goods['id']]) + ->where('a.order_status', '<', 4) + ->find(); $goods['activity'] = [ 'type' => 4, 'type_desc' => '抢购商品', - 'in_groupbuy_activity' => (bool)$in_activity, - 'msg' => '您已参与过本次活动，无法再次参与！' + 'in_groupbuy_activity' => !empty($in_activity) ? true : false, + 'msg' => '您已购买过改商品！' ]; - // 2024-11-29 更改规则：活动中的每件商品用户都能购买，但是只能买一件 -// $in_activity = Order::alias('a') -// ->join('order_goods og', 'a.id = og.order_id') -// ->where(['a.user_id' => $userId, 'a.order_type' => 4, 'og.goods_id' => $goods['id']]) -// ->where('a.order_status', '<', 4) -// ->find(); -// -// if (!empty($in_activity)) { -// $goods['activity'] = [ -// 'type' => 4, -// 'type_desc' => '抢购商品', -// 'in_groupbuy_activity' => true, -// 'msg' => '您已购买过改商品！' -// ]; -// } - return $goods; } } From a220a46d0282c4235ce8893ff8098de13d131ea4 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 14:28:14 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/GoodsLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php index 5faa4f27..9138da91 100755 --- a/app/api/logic/GoodsLogic.php +++ b/app/api/logic/GoodsLogic.php @@ -1173,7 +1173,7 @@ class GoodsLogic extends Logic $goods['activity'] = [ 'type' => 4, 'type_desc' => '抢购商品', - 'in_groupbuy_activity' => !empty($in_activity) ? true : false, + 'in_groupbuy_activity' => !empty($in_activity), 'msg' => '您已购买过改商品！' ]; From e03534469a49030e625f7f7c7bf86ffc878f9978 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 14:35:59 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=98=AF=E5=90=A6=E8=B4=AD=E4=B9=B0=E8=BF=87?= =?UTF-8?q?=E5=A5=BD=E7=89=A9=E7=9B=B4=E9=99=8D=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/OrderLogic.php | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/app/api/logic/OrderLogic.php b/app/api/logic/OrderLogic.php index 633c6486..91d6f08a 100755 --- a/app/api/logic/OrderLogic.php +++ b/app/api/logic/OrderLogic.php @@ -120,22 +120,31 @@ class OrderLogic extends Logic Db::startTrans(); try { - if ($post['order_type'] == 4) { - $in_activity = Order::where(['user_id' => $post['user_id'], 'order_type' => 4])->where('order_status', '<', 4)->find(); - if ($in_activity) { - throw new Exception('每位用户只能限抢一件商品'); - } + if ($post['order_type'] == OrderEnum::GROUP_BUY) { +// $in_activity = Order::where(['user_id' => $post['user_id'], 'order_type' => 4])->where('order_status', '<', 4)->find(); +// if ($in_activity) { +// throw new Exception('每位用户只能限抢一件商品'); +// } - foreach ($goods as $activ) { - $isOrder = Db::name('order')->where([ - 'activity_sn' => $activ['activity_sn'], - 'user_id' => $post['user_id'] - ]) - ->where('order_status', '<>', 4) - ->find(); - if($isOrder){ + foreach ($goods as $v) { + $in_activity = Order::alias('a') + ->join('order_goods og', 'a.id = og.order_id') + ->where(['a.user_id' => $post['user_id'], 'a.order_type' => 4, 'og.goods_id' => $v['goods_id']]) + ->where('a.order_status', '<', 4) + ->find(); + + if ($in_activity) { throw new Exception('您已抢购过此商品'); } +// $isOrder = Db::name('order')->where([ +// 'activity_sn' => $activ['activity_sn'], +// 'user_id' => $post['user_id'] +// ]) +// ->where('order_status', '<>', 4) +// ->find(); +// if($isOrder){ +// throw new Exception('您已抢购过此商品'); +// } } } From 230e6f4ce88d4ecad9f50492214b83dea12094e4 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 14:38:05 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=98=AF=E5=90=A6=E8=B4=AD=E4=B9=B0=E8=BF=87?= =?UTF-8?q?=E5=A5=BD=E7=89=A9=E7=9B=B4=E9=99=8D=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/OrderLogic.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/api/logic/OrderLogic.php b/app/api/logic/OrderLogic.php index 91d6f08a..e1c606a6 100755 --- a/app/api/logic/OrderLogic.php +++ b/app/api/logic/OrderLogic.php @@ -126,6 +126,7 @@ class OrderLogic extends Logic // throw new Exception('每位用户只能限抢一件商品'); // } + // 2024-11-29 更改规则：活动中的每件商品用户都能购买，但是只能买一件 foreach ($goods as $v) { $in_activity = Order::alias('a') ->join('order_goods og', 'a.id = og.order_id') From 53d2dac4d223c5a788e2c09d8678d5999a6d086f Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 14:50:47 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/GoodsLogic.php | 2 +- app/api/logic/OrderLogic.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php index 9138da91..1f1ec1be 100755 --- a/app/api/logic/GoodsLogic.php +++ b/app/api/logic/GoodsLogic.php @@ -1174,7 +1174,7 @@ class GoodsLogic extends Logic 'type' => 4, 'type_desc' => '抢购商品', 'in_groupbuy_activity' => !empty($in_activity), - 'msg' => '您已购买过改商品！' + 'msg' => '您已购买过此商品！' ]; return $goods; diff --git a/app/api/logic/OrderLogic.php b/app/api/logic/OrderLogic.php index e1c606a6..bdf8e1b8 100755 --- a/app/api/logic/OrderLogic.php +++ b/app/api/logic/OrderLogic.php @@ -135,7 +135,7 @@ class OrderLogic extends Logic ->find(); if ($in_activity) { - throw new Exception('您已抢购过此商品'); + throw new Exception('您已购买过此商品'); } // $isOrder = Db::name('order')->where([ // 'activity_sn' => $activ['activity_sn'], From 457889d47339b925243cb27734ab365b25ba6ddc Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Fri, 29 Nov 2024 15:08:29 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=A5=BD=E7=89=A9=E7=9B=B4=E9=99=8D?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/order/Order.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/common/model/order/Order.php b/app/common/model/order/Order.php index 19ff8b90..291ac586 100755 --- a/app/common/model/order/Order.php +++ b/app/common/model/order/Order.php @@ -315,9 +315,9 @@ class Order extends Models return $btn; } - if(($data['pay_status'] == PayEnum::ISPAID && $data['order_type'] == '4') || ($data['pay_status'] == PayEnum::ISPAID && $data['order_type'] == '抢购订单')){ - return $btn; - } +// if(($data['pay_status'] == PayEnum::ISPAID && $data['order_type'] == '4') || ($data['pay_status'] == PayEnum::ISPAID && $data['order_type'] == '抢购订单')){ +// return $btn; +// } if (($data['order_status'] == OrderEnum::ORDER_STATUS_NO_PAID && $data['pay_status'] == PayEnum::UNPAID) || ($data['pay_status'] == PayEnum::ISPAID && $data['order_status'] == OrderEnum::ORDER_STATUS_DELIVERY)) {