From 76f8ec8202b57f3b0e38213e72dcc798bc2f67e5 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 17 Jan 2024 13:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/product/ProductRepository.php       | 20 +++++++++----------
 .../merchant/store/product/Product.php        |  1 -
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php
index 683f8cde..fa3c25e0 100644
--- a/app/common/repositories/store/product/ProductRepository.php
+++ b/app/common/repositories/store/product/ProductRepository.php
@@ -639,13 +639,13 @@ class ProductRepository extends BaseRepository
                 $ot_price = !$ot_price ? $ot_price_ : (($ot_price > $ot_price_) ? $ot_price : $ot_price_);
 
                 $unique = $this->setUnique($productId, $sku, $productType);
-                $single_number=$value['single_number']??0;
-                $single_procure_price=0;
-                $single_price=0;
-                if(isset($value['single_number']) && $value['single_number']>1){
-                   $single_procure_price= bcdiv($procure_price,$value['single_number'],2);
-                   $single_price= bcdiv($price,$value['single_number'],2);
-                }
+                // $single_number=$value['single_number']??0;
+                // $single_procure_price=0;
+                // $single_price=0;
+                // if(isset($value['single_number']) && $value['single_number']>1){
+                //    $single_procure_price= bcdiv($procure_price,$value['single_number'],2);
+                //    $single_price= bcdiv($price,$value['single_number'],2);
+                // }
                 $result['attrValue'][] = [
                     'detail' => json_encode($value['detail'] ?? ''),
                     "bar_code" => $value["bar_code"] ?? '',
@@ -666,9 +666,9 @@ class ProductRepository extends BaseRepository
                     'svip_price' => $_svip_price,
                     'mer_id' => $merId,
                     'procure_price' => $procure_price,
-                    'single_number'=>$single_number,
-                    'single_procure_price'=>$single_procure_price,
-                    'single_price'=>$single_price
+                    'single_number'=>$value['single_number']??0,
+                    'single_procure_price'=>$value['single_procure_price']??0,
+                    'single_price'=>$value['single_price']??0
                 ];
                 $stock = $stock + intval($value['stock']);
             }
diff --git a/app/controller/merchant/store/product/Product.php b/app/controller/merchant/store/product/Product.php
index 54a5c341..e810819a 100644
--- a/app/controller/merchant/store/product/Product.php
+++ b/app/controller/merchant/store/product/Product.php
@@ -55,7 +55,6 @@ class Product extends BaseController
         $type = $this->request->merchant()['type_id'];
         $typeCode = Db::name('merchant_type')->where('mer_type_id', $type)->value('type_code');
         $product_type = 0;
-
         // if ($type==12){
         if ($typeCode == Merchant::TypeCode['TypeSupplyChain']) {
             $where['product_type'] = 98; //供应链