From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据,智能匹配是用户没登录前也是获取发布需求最新数据,登录后会根据用户发布的需求,通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错

---
 admin/app/api/service/order/settled/MasterOrderSettledService.php |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/admin/app/api/service/order/settled/MasterOrderSettledService.php b/admin/app/api/service/order/settled/MasterOrderSettledService.php
index cb13949..9c2855a 100644
--- a/admin/app/api/service/order/settled/MasterOrderSettledService.php
+++ b/admin/app/api/service/order/settled/MasterOrderSettledService.php
@@ -2,6 +2,7 @@
 
 namespace app\api\service\order\settled;
 
+use app\api\model\order\OrderProduct;
 use app\common\enum\order\OrderSourceEnum;
 use app\api\model\order\Order as OrderModel;
 /**
@@ -29,6 +30,10 @@
      */
     public function validateProductList()
     {
+        $newcomerNum =(new OrderModel())
+            ->where('user_id', $this->user['user_id'])
+            ->where('is_newcomer', 1)->count();
+
         foreach ($this->supplierData as $supplier) {
             foreach ($supplier['productList'] as $product) {
                 // 判断商品是否下架
@@ -36,6 +41,19 @@
                     $this->error = "很抱歉,商品 [{$product['product_name']}] 已下架";
                     return false;
                 }
+                // 判断商品是否下架
+                if ($product['is_newcomer'] == 1 && $product['total_num'] > 1) {
+                    $this->error = "很抱歉,商品为新人专区商品只能购买1件";
+                    return false;
+                }
+                if ($product['is_newcomer'] == 1 && $newcomerNum > 0) {
+                    $this->error = "很抱歉,您已购买过新人专区商品,不能购买新人专区商品";
+                    return false;
+                }
+                if ($this->user['purchase_count'] <= 0 && $product['is_repurchase'] == 1 ) {
+                    $this->error = "很抱歉,还不是会员,不能购买复购专区商品,请到先到vip专区购买";
+                    return false;
+                }
                 // 判断商品库存
                 if ($product['total_num'] > $product['product_sku']['stock_num']) {
                     $this->error = "很抱歉,商品 [{$product['product_name']}] 库存不足";

--
Gitblit v1.9.2