diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index efa94ab2..89aaa991 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2571,7 +2571,8 @@ class StoreOrderRepository extends BaseRepository $this->create_product_attr_value($find, $datum, $product_type, $attr, $merId, implode(',', $array_values)); } } else { - $cate_id = 0; + //默认其他分类 + $cate_id = 1726; $spec_type = 1; $detail = $attr; diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index 9f563322..b812fc36 100644 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -56,9 +56,9 @@ class MerchantIntention extends BaseController if ($intentionInfo) { 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) { - throw new ValidateException('该用户已存在商户,不可申请'); + throw new ValidateException('该用户已申请商户,不可重复申请'); } $make = app()->make(MerchantRepository::class); if ($make->fieldExists('mer_name', $data['mer_name']))