From 4a822460f35e84cc63b25d35efe00b8f4d257a7a Mon Sep 17 00:00:00 2001 From: wuhaotian <442384644@qq.com> Date: Thu, 14 Aug 2025 10:27:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/listener/order/OrderPaySuccessListener.php | 2 +- crmeb/app/listener/order/OrderShippingListener.php | 5 ++--- crmeb/app/listener/user/RegisterListener.php | 2 +- .../activity/combination/StorePinkServices.php | 2 +- .../activity/seckill/StoreSeckillServices.php | 11 ++++++----- crmeb/app/services/order/StoreOrderCreateServices.php | 1 + crmeb/app/services/pay/OrderOfflineServices.php | 2 +- crmeb/app/services/wechat/WechatQrcodeServices.php | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/crmeb/app/listener/order/OrderPaySuccessListener.php b/crmeb/app/listener/order/OrderPaySuccessListener.php index e6c66b75d..8da3ef3cd 100644 --- a/crmeb/app/listener/order/OrderPaySuccessListener.php +++ b/crmeb/app/listener/order/OrderPaySuccessListener.php @@ -67,7 +67,7 @@ class OrderPaySuccessListener implements ListenerInterface } //虚拟商品自动发货 - if ($orderInfo['virtual_type'] > 0 && $orderInfo['combination_id'] == 0) { + if (in_array($orderInfo['virtual_type'], [1, 2]) && $orderInfo['combination_id'] == 0) { /** @var StoreOrderDeliveryServices $orderDeliveryServices */ $orderDeliveryServices = app()->make(StoreOrderDeliveryServices::class); $orderDeliveryServices->virtualSend($orderInfo); diff --git a/crmeb/app/listener/order/OrderShippingListener.php b/crmeb/app/listener/order/OrderShippingListener.php index 6ae49a08d..430fc87f7 100644 --- a/crmeb/app/listener/order/OrderShippingListener.php +++ b/crmeb/app/listener/order/OrderShippingListener.php @@ -16,7 +16,7 @@ class OrderShippingListener implements ListenerInterface public function handle($event): void { /** @var StoreOrder $order */ - [$order_type, $order, $delivery_type, $delivery_id, $delivery_name] = $event; + [$order_type, $order, $delivery_type, $delivery_id, $delivery_code] = $event; $order_shipping_open = sys_config('order_shipping_open', 0); // 小程序发货信息管理服务开关 $secs = 0; if ($order && $order_shipping_open) { @@ -87,8 +87,7 @@ class OrderShippingListener implements ListenerInterface $shipping_list = [ [ 'tracking_no' => $delivery_id ?? '', -// 'express_company' => $delivery_name ? $expressData[$delivery_name] : '', - 'express_company' => $delivery_name, + 'express_company' => $delivery_code, 'item_desc' => $item_desc, 'contact' => [ 'receiver_contact' => $order['user_phone'] diff --git a/crmeb/app/listener/user/RegisterListener.php b/crmeb/app/listener/user/RegisterListener.php index 783dbc32d..3b4740ebb 100644 --- a/crmeb/app/listener/user/RegisterListener.php +++ b/crmeb/app/listener/user/RegisterListener.php @@ -50,7 +50,7 @@ class RegisterListener implements ListenerInterface //自定义消息-下级用户绑定成功 if ($res) { - $phone = app()->make(UserServices::class)->value($uid, 'phone'); + $phone = app()->make(UserServices::class)->value($spreadUid, 'phone'); event('CustomNoticeListener', [$spreadUid, ['nickname' => $name, 'time' => date('Y-m-d H:i:s'), 'phone' => $phone], 'spread_success']); } } diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php index 71a092790..d70d4b296 100644 --- a/crmeb/app/services/activity/combination/StorePinkServices.php +++ b/crmeb/app/services/activity/combination/StorePinkServices.php @@ -413,7 +413,7 @@ class StorePinkServices extends BaseServices //拼团卡密和优惠券商品，成团后发放 $orderInfos = $orderService->getColumn([['order_id', 'in', $order_ids]], '*', 'order_id'); foreach ($orderInfos as $orderInfo) { - if ($orderInfo['virtual_type'] > 0) { + if (in_array($orderInfo['virtual_type'], [1, 2])) { $orderInfo['cart_id'] = json_decode($orderInfo['cart_id'], true); /** @var StoreOrderDeliveryServices $orderDeliveryServices */ $orderDeliveryServices = app()->make(StoreOrderDeliveryServices::class); diff --git a/crmeb/app/services/activity/seckill/StoreSeckillServices.php b/crmeb/app/services/activity/seckill/StoreSeckillServices.php index 3a865fbe7..554442147 100644 --- a/crmeb/app/services/activity/seckill/StoreSeckillServices.php +++ b/crmeb/app/services/activity/seckill/StoreSeckillServices.php @@ -117,11 +117,11 @@ class StoreSeckillServices extends BaseServices } } //限制编辑 - if ($data['copy'] == 0 && $seckill) { - if ($seckill['stop_time'] + 86400 < time()) { - throw new AdminException(400508); - } - } +// if ($data['copy'] == 0 && $seckill) { +// if ($seckill['stop_time'] + 86400 < time()) { +// throw new AdminException(400508); +// } +// } if ($data['num'] < $data['once_num']) { throw new AdminException(400500); } @@ -888,6 +888,7 @@ class StoreSeckillServices extends BaseServices } } $seckillId = $this->dao->value(['activity_id' => $id, 'product_id' => $seckillData['product_id']], 'id') ?? 0; + $seckillData['description'] = app()->make(StoreDescriptionServices::class)->getDescription(['product_id' => $seckillData['product_id'], 'type' => 1]); $this->saveData($seckillId, $seckillData); } return true; diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php index 938f9467c..79c91087e 100644 --- a/crmeb/app/services/order/StoreOrderCreateServices.php +++ b/crmeb/app/services/order/StoreOrderCreateServices.php @@ -548,6 +548,7 @@ class StoreOrderCreateServices extends BaseServices $uni_integral_price = (string)bcdiv((string)$integral_price, (string)$cart['cart_num'], 4); $cart['truePrice'] = $cart['truePrice'] > $uni_integral_price ? bcsub((string)$cart['truePrice'], $uni_integral_price, 2) : 0; } + if ($cart['sum_true_price'] < 0) $cart['sum_true_price'] = '0.00'; } try { [$cartInfo, $spread_ids] = $this->computeOrderProductBrokerage($uid, $cartInfo); diff --git a/crmeb/app/services/pay/OrderOfflineServices.php b/crmeb/app/services/pay/OrderOfflineServices.php index a0af4fbc7..ee941fb71 100644 --- a/crmeb/app/services/pay/OrderOfflineServices.php +++ b/crmeb/app/services/pay/OrderOfflineServices.php @@ -78,7 +78,7 @@ class OrderOfflineServices extends BaseServices } //虚拟商品自动发货 - if ($orderInfo['virtual_type'] > 0) { + if (in_array($orderInfo['virtual_type'], [1, 2])) { /** @var StoreOrderDeliveryServices $orderDeliveryServices */ $orderDeliveryServices = app()->make(StoreOrderDeliveryServices::class); $orderDeliveryServices->virtualSend($orderInfo); diff --git a/crmeb/app/services/wechat/WechatQrcodeServices.php b/crmeb/app/services/wechat/WechatQrcodeServices.php index f2694bae3..1e270da0c 100644 --- a/crmeb/app/services/wechat/WechatQrcodeServices.php +++ b/crmeb/app/services/wechat/WechatQrcodeServices.php @@ -155,7 +155,7 @@ class WechatQrcodeServices extends BaseServices } if (!$res) throw new AdminException(400237); $imageInfo = $this->downloadImage($resCode['url'], $name); - $systemAttachment->attachmentAdd($name, $imageInfo['size'], $imageInfo['type'], $imageInfo['att_dir'], $imageInfo['att_dir'], 1, $imageInfo['image_type'], time(), 2); + $systemAttachment->attachmentAdd($name, $imageInfo['size'], $imageInfo['type'], $imageInfo['att_dir'], $imageInfo['att_dir'], 1, $imageInfo['image_type'], time(), 1); } return strpos($imageInfo['att_dir'], 'http') === false ? $siteUrl . $imageInfo['att_dir'] : $imageInfo['att_dir']; }