diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php index 479e50b..e629066 100644 --- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php +++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php @@ -122,20 +122,22 @@ class MerchantIntentionRepository extends BaseRepository $smsData = []; if($create == 1){ $password = substr($intention['phone'],-6); - $merData = [ - 'mer_name' => $intention['mer_name'], - 'mer_phone' => $intention['phone'], - 'mer_account' => $intention['phone'], - 'category_id' => $intention['merchant_category_id'], - 'type_id' => $intention['mer_type_id'], - 'real_name' => $intention['name'], - 'status' => 1, - 'is_audit' => 1, - 'is_bro_room' => $config['broadcast_room_type'] == 1 ? 0 : 1, - 'is_bro_goods' => $config['broadcast_goods_type'] == 1 ? 0 : 1, - 'mer_password' => $password, - 'is_margin' => $margin['is_margin'] ?? -1, - 'margin' => $margin['margin'] ?? 0 + $merData = [ + 'mer_name' => $intention['mer_name'], + 'mer_phone' => $intention['phone'], + 'mer_account' => $intention['phone'], + 'category_id' => $intention['merchant_category_id'], + 'type_id' => $intention['mer_type_id'], + 'real_name' => $intention['name'], + 'status' => 1, + 'is_audit' => 1, + 'is_bro_room' => $config['broadcast_room_type'] == 1 ? 0 : 1, + 'is_bro_goods' => $config['broadcast_goods_type'] == 1 ? 0 : 1, + 'mer_password' => $password, + 'is_margin' => $margin['is_margin'] ?? -1, + 'margin' => $margin['margin'] ?? 0, + 'agent_id' => $intention['agent_id'] ?? 0, + 'merchant_type' => $intention['merchant_type'] ?? 0 ]; $data['fail_msg'] = ''; $smsData = [ diff --git a/app/controller/admin/system/merchant/MerchantIntention.php b/app/controller/admin/system/merchant/MerchantIntention.php index c910571..3a8ff37 100644 --- a/app/controller/admin/system/merchant/MerchantIntention.php +++ b/app/controller/admin/system/merchant/MerchantIntention.php @@ -30,7 +30,7 @@ class MerchantIntention extends BaseController public function lst() { [$page, $limit] = $this->getPage(); - $where = $this->request->params(['mer_name', 'status', 'date', 'keyword', 'mer_intention_id', 'category_id', 'type_id']); + $where = $this->request->params(['mer_name', 'status', 'date', 'keyword', 'mer_intention_id', 'category_id', 'type_id',['merchant_type', 0]]); return app('json')->success($this->repository->getList($where, $page, $limit)); }