From 87d120e32cdd891e6d04edf7c9ca44c02afa9fe0 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Fri, 1 Mar 2024 11:49:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/merchant/MerchantIntentionRepository.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
index c8024cbe..780473e6 100755
--- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php
+++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
@@ -201,7 +201,7 @@ class MerchantIntentionRepository extends BaseRepository
                 if ($intention['type'] == 2) {
                     $merId = MerchantIntention::where('uid', $intention['uid'])->where('status', 1)->value('mer_id');
                     if (!empty($merId)) {
-                        Merchant::where('mer_id', $merId)->update(['business_status' => 2]);
+                        Merchant::where('mer_id', $merId)->update(['business_status' => 2, 'mer_settlement_agree_status' => 1]);
                     }
                 }
                 if (!empty($smsData)) {

From 65c49ea80ada9c98c73c6be2cfc75b57a30b27ed Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 1 Mar 2024 13:48:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/product/ProductAttrDao.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/common/dao/store/product/ProductAttrDao.php b/app/common/dao/store/product/ProductAttrDao.php
index 5cfc9cd8..54c05cb7 100755
--- a/app/common/dao/store/product/ProductAttrDao.php
+++ b/app/common/dao/store/product/ProductAttrDao.php
@@ -41,9 +41,6 @@ class ProductAttrDao extends BaseDao
      */
     public function insert(array $data)
     {
-        foreach ($data as &$item) {
-            $item['profit_rate'] = bcdiv(bcsub($item['price'], $item['procure_price'], 2), $item['price'], 2) * 100;
-        }
         return ($this->getModel()::getDB())->insertAll($data);
     }