From 6986c2360234e1d6919ae9cf67447c9ceb82f19c Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 14 Aug 2025 10:28:56 +0800 Subject: [PATCH] update --- .../v2/user/UserSearchController.php | 2 +- .../order/OrderPaySuccessListener.php | 2 +- .../listener/order/OrderShippingListener.php | 5 ++-- crmeb/app/listener/user/RegisterListener.php | 2 +- .../combination/StorePinkServices.php | 2 +- .../activity/seckill/StoreSeckillServices.php | 17 ++++++------ .../order/StoreOrderCreateServices.php | 1 + .../app/services/pay/OrderOfflineServices.php | 2 +- .../product/product/StoreProductServices.php | 5 ++++ .../services/wechat/WechatQrcodeServices.php | 2 +- .../uni-app/pages/index/components/coupon.vue | 26 ++++++++----------- 11 files changed, 34 insertions(+), 32 deletions(-) diff --git a/crmeb/app/api/controller/v2/user/UserSearchController.php b/crmeb/app/api/controller/v2/user/UserSearchController.php index 0a299f43..89a82f04 100644 --- a/crmeb/app/api/controller/v2/user/UserSearchController.php +++ b/crmeb/app/api/controller/v2/user/UserSearchController.php @@ -43,7 +43,7 @@ class UserSearchController public function cleanUserSearch(Request $request) { $uid = (int)$request->uid(); - $this->services->update(['uid' => $uid], ['is_del' => 1]); + $this->services->delete(['uid' => $uid]); return app('json')->success(100002); } } diff --git a/crmeb/app/listener/order/OrderPaySuccessListener.php b/crmeb/app/listener/order/OrderPaySuccessListener.php index e6c66b75..8da3ef3c 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 6ae49a08..430fc87f 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 783dbc32..3b4740eb 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 71a09279..d70d4b29 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 1d2dccef..55444214 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); } @@ -861,9 +861,9 @@ class StoreSeckillServices extends BaseServices if (!isset($sattr['price']) || !$sattr['price']) { throw new AdminException('请填写商品（' . $product['store_name'] . ' | ' . $sattr['suk'] . '）活动价'); } - if ($sattr['price'] > $sattr['ot_price']) { - throw new AdminException('商品（' . $product['store_name'] . ' | ' . $sattr['suk'] . '）活动价不能大于原价'); - } +// if ($sattr['price'] > $sattr['ot_price']) { +// throw new AdminException('商品（' . $product['store_name'] . ' | ' . $sattr['suk'] . '）活动价不能大于原价'); +// } if (!isset($sattr['quota']) || !$sattr['quota']) { throw new AdminException('请填写商品（' . $product['store_name'] . ' | ' . $sattr['suk'] . '）限量'); } @@ -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 938f9467..79c91087 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 a0af4fbc..ee941fb7 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/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php index 3512abff..bd7cb0ee 100644 --- a/crmeb/app/services/product/product/StoreProductServices.php +++ b/crmeb/app/services/product/product/StoreProductServices.php @@ -33,6 +33,7 @@ use app\services\system\SystemUserLevelServices; use app\services\user\UserLabelServices; use app\services\user\member\MemberCardServices; use app\services\user\UserLevelServices; +use app\services\user\UserSearchServices; use app\services\user\UserServices; use crmeb\exceptions\AdminException; use app\jobs\ProductLogJob; @@ -1188,6 +1189,10 @@ class StoreProductServices extends BaseServices $where['is_show'] = 1; $where['is_del'] = 0; $where['star'] = 1; + $ifKeyword = isset($where['store_name']) && $where['store_name']; + if ($ifKeyword) { + app()->make(UserSearchServices::class)->saveUserSearch($uid, $where['store_name'], [$where['store_name']], []); + } [$page, $limit] = $this->getPageValue(); $where['vip_user'] = $uid ? app()->make(UserServices::class)->value(['uid' => $uid], 'is_money_level') : 0; $list = $this->dao->getSearchList($where, $page, $limit, ['id,store_name,cate_id,image,IFNULL(sales, 0) + IFNULL(ficti, 0) as sales,price,stock,activity,ot_price,spec_type,recommend_image,unit_name,is_vip,vip_price,is_virtual,presale,custom_form,virtual_type,min_qty,label_list']); diff --git a/crmeb/app/services/wechat/WechatQrcodeServices.php b/crmeb/app/services/wechat/WechatQrcodeServices.php index f2694bae..1e270da0 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']; } diff --git a/template/uni-app/pages/index/components/coupon.vue b/template/uni-app/pages/index/components/coupon.vue index fe1454ea..1041657d 100644 --- a/template/uni-app/pages/index/components/coupon.vue +++ b/template/uni-app/pages/index/components/coupon.vue @@ -17,9 +17,8 @@ {{ $t(`无门槛券`) }} - {{ $t(`已领取`) }} - {{ $t(`去领取`) }} - {{ $t(`已过期`) }} + {{ $t(`已领取`) }} + {{ $t(`去领取`) }} @@ -40,9 +39,8 @@ {{ $t(`无门槛券`) }} - {{ $t(`已领取`) }} - {{ $t(`去领取`) }} - {{ $t(`已过期`) }} + {{ $t(`已领取`) }} + {{ $t(`去领取`) }} @@ -63,9 +61,8 @@ {{ $t(`无门槛券`) }} - {{ $t(`已领取`) }} - {{ $t(`立即领取`) }} - {{ $t(`已过期`) }} + {{ $t(`已领取`) }} + {{ $t(`立即领取`) }} @@ -74,7 +71,7 @@ - + {{ item.type | typeFilter }} @@ -115,9 +112,8 @@ {{ $t(`无门槛券`) }} - {{ $t(`已领取`) }} - {{ $t(`领取`) }} - {{ $t(`已过期`) }} + {{ $t(`已领取`) }} + {{ $t(`领取`) }} @@ -157,7 +153,7 @@ }, filters:{ typeFilter(val){ - let obj = { + let obj = { 0: '通用券', 1: '品类券', 2: '商品券', @@ -700,4 +696,4 @@ color: var(--coupon4-color); } } - \ No newline at end of file +