Merge branch 'develop'

# Conflicts: # app/listener/CommunityAddress.php
2023-03-23 10:00:42 +08:00 · 2023-03-23 10:00:42 +08:00 · 8e0b2b6ae0
commit 8e0b2b6ae0
parent ec389163d0 c6b415d1db
1 changed files with 4 additions and 0 deletions
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@ -159,6 +159,10 @@ class Merchant extends BaseController
                'lat',
                ['delivery_way',[2]],
            ]);
+
+            // 如果手机号不存在，则使用入驻时的手机号
+            $data['service_phone'] = empty($data['service_phone'])?$merchant['mer_phone']:$data['service_phone'];
+
            $validate->check($data);
            $sys_bases_status = systemConfig('sys_bases_status') === '0' ? 0 : 1;
            if ($sys_bases_status && empty($data['mer_certificate']))