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

修改商户入驻申请审核

Browse Source
This commit is contained in:
luofei 2024-03-20 16:03:17 +08:00
parent d7663328ac
commit 15131252f1
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/store/order/StoreOrderCreateRepository.php
View File

@ -518,7 +518,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
'coupon_price' => $coupon_price, 'coupon_price' => $coupon_price,
'svip_coupon_merge' => $svip_coupon_merge, 'svip_coupon_merge' => $svip_coupon_merge,
'postage_price' => $postage_price, 'postage_price' => $postage_price,
'isTake' => in_array(2, $merchantCart['delivery_way']), 'isTake' => $isTake,
'total_num' => $total_num, 'total_num' => $total_num,
'enabledCoupon' => $enabledCoupon, 'enabledCoupon' => $enabledCoupon,
'useCouponIds' => $useCouponIds, 'useCouponIds' => $useCouponIds,

1
app/common/repositories/store/product/ProductRepository.php
View File

@ -259,6 +259,7 @@ class ProductRepository extends BaseRepository
$activity_id = 0; $activity_id = 0;
$result = $this->dao->create($product); $result = $this->dao->create($product);
$settleParams = $this->setAttrValue($data, $result->product_id, $productType, 0, $data['mer_id']); $settleParams = $this->setAttrValue($data, $result->product_id, $productType, 0, $data['mer_id']);
$data['mer_cate_id'] = is_string($data['mer_cate_id']) && !empty($data['mer_cate_id']) ? explode(',', $data['mer_cate_id']) : [];
$settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $result->product_id, $data['mer_id']); $settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $result->product_id, $data['mer_id']);
$settleParams['attr'] = $this->setAttr($data['attr'], $result->product_id); $settleParams['attr'] = $this->setAttr($data['attr'], $result->product_id);
if ($productType == 0) app()->make(ParameterValueRepository::class)->create($result->product_id, $data['params'] ?? [], $data['mer_id']); if ($productType == 0) app()->make(ParameterValueRepository::class)->create($result->product_id, $data['params'] ?? [], $data['mer_id']);

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

@ -188,6 +188,7 @@ class MerchantIntentionRepository extends BaseRepository
'margin' => $margin['margin'] ?? 0, 'margin' => $margin['margin'] ?? 0,
'mark' => $margin['margin'] ?? 0, 'mark' => $margin['margin'] ?? 0,
'mer_state' => 1, //审核通过自动开启 'mer_state' => 1, //审核通过自动开启
'city_id' => $intention['city_id'],
'area_id' => $intention['area_id'], 'area_id' => $intention['area_id'],
'street_id' => $intention['street_id'], 'street_id' => $intention['street_id'],
'village_id' => $intention['village_id'], 'village_id' => $intention['village_id'],