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

更新

Browse Source
This commit is contained in:
mkm 2023-11-25 11:48:13 +08:00
parent a6f088e5f5
commit cf42b7e1d6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -2571,7 +2571,8 @@ class StoreOrderRepository extends BaseRepository
$this->create_product_attr_value($find, $datum, $product_type, $attr, $merId, implode(',', $array_values)); $this->create_product_attr_value($find, $datum, $product_type, $attr, $merId, implode(',', $array_values));
} }
} else { } else {
$cate_id = 0; //默认其他分类
$cate_id = 1726;
$spec_type = 1; $spec_type = 1;
$detail = $attr; $detail = $attr;

4
app/controller/api/store/merchant/MerchantIntention.php
View File

@ -56,9 +56,9 @@ class MerchantIntention extends BaseController
if ($intentionInfo) { if ($intentionInfo) {
throw new ValidateException('此统一社会信用代码已申请商户'); throw new ValidateException('此统一社会信用代码已申请商户');
} }
$merInfo = Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->find(); $merInfo = Db::name('merchant_intention')->where('uid', $this->userInfo->uid)->where('status', 'in',[0,1])->where('is_del',0)->find();
if ($merInfo) { if ($merInfo) {
throw new ValidateException('该用户已存在商户，不可申请'); throw new ValidateException('该用户已申请商户，不可重复申请');
} }
$make = app()->make(MerchantRepository::class); $make = app()->make(MerchantRepository::class);
if ($make->fieldExists('mer_name', $data['mer_name'])) if ($make->fieldExists('mer_name', $data['mer_name']))