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

更新自动审核

Browse Source
This commit is contained in:
yaooo 2023-09-13 17:39:06 +08:00
parent 3791235e22
commit 4318149bb7
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controller/api/Auth.php
View File

@ -1311,6 +1311,18 @@ class Auth extends BaseController
//获取app版本更新信息 //获取app版本更新信息
public function appVersion() public function appVersion()
{ {
$brandArray = [
'HUAWEI',
'HUAWEI',
'HUAWEI',
'HUAWEI',
'HUAWEI',
'HUAWEI',
'HUAWEI',
'HUAWEI',
'HUAWEI',
'HUAWEI'
];
$type = $this->request->param('type', '-1'); $type = $this->request->param('type', '-1');
$version = $this->request->param('version', ''); $version = $this->request->param('version', '');
$phoneBrand = $this->request->param('phone_brand', ''); $phoneBrand = $this->request->param('phone_brand', '');

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

@ -67,19 +67,19 @@ class MerchantIntention extends BaseController
'id' => $intention->mer_intention_id 'id' => $intention->mer_intention_id
] ]
]); ]);
$areaInfo = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find(); // $areaInfo = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find();
$cityId = Db::name('geo_city')->where('city_code', $areaInfo['city_code'] ?? '')->value('city_id', 0); // $cityId = Db::name('geo_city')->where('city_code', $areaInfo['city_code'] ?? '')->value('city_id', 0);
$streetId = Db::name('geo_street')->where('street_code', $data['street_id'] ?? '')->value('street_id', 0); // $streetId = Db::name('geo_street')->where('street_code', $data['street_id'] ?? '')->value('street_id', 0);
$sendData = [ // $sendData = [
'company_name' => $data['mer_name'], // 'company_name' => $data['mer_name'],
'organization_code' => $data['social_credit_code'] ?? '', // 'organization_code' => $data['social_credit_code'] ?? '',
'master_name' => $data['name'], // 'master_name' => $data['name'],
'master_phone' => $data['phone'], // 'master_phone' => $data['phone'],
'city' => $cityId, // 'city' => $cityId,
'area' => $areaInfo['area_id'] ?? 0, // 'area' => $areaInfo['area_id'] ?? 0,
'street' => $streetId, // 'street' => $streetId,
'mer_intention_id' => $intention->mer_intention_id // 'mer_intention_id' => $intention->mer_intention_id
]; // ];
// $res = $this->sendMerIntentionApply($sendData); // $res = $this->sendMerIntentionApply($sendData);
// if (!$res) { // if (!$res) {
// Db::name('merchant_intention')->where('mer_intention_id', $intention->mer_intention_id)->delete(); // Db::name('merchant_intention')->where('mer_intention_id', $intention->mer_intention_id)->delete();