mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#159) from dev into master

Browse Source 
Reviewed-on: #159
This commit is contained in:
mkm 2024-03-01 13:51:49 +08:00
commit fae9e71d3c
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/dao/store/product/ProductAttrDao.php
View File

@ -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);
}

2
app/common/repositories/system/merchant/MerchantIntentionRepository.php
View File

@ -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)) {