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-28 15:43:22 +08:00
parent 63c132b2b6
commit 940dfa27af
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/service/JgPush.php
View File

@ -39,10 +39,11 @@ class JgPush
if (empty($jgRegisterId)) {
continue;
}
echo "jgRegisterId: $jgRegisterId \n";
$msg = $order['pay_type'] == StoreGroupOrder::PAY_TYPE_CREDIT_BUY ? '您有新的订单已结算，请注意查看。' : '您有新的订单，请注意查看。';
$msgType = $order['pay_type'] == StoreGroupOrder::PAY_TYPE_CREDIT_BUY ? 'ORDER_SETTLEMENT' : 'ORDER_CREATE';
$this->addRegistrationId($jgRegisterId);
$this->androidNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
//$this->androidNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
$this->iosNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
$this->push->send();
unset($this->client, $this->push);

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

@ -1464,7 +1464,6 @@ class Auth extends BaseController
'status' => ($status == 1 ? 1 : 2),
'fail_msg' => $remark
];
Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 1)->update($updData);
if ($status == 1) {
$repository->updateStatus($id, $data);
$intention = Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 1)->find();
@ -1482,6 +1481,7 @@ class Auth extends BaseController
'mer_certificate' => $merCertificate
], $intention['mer_id']);
}
Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 1)->update($updData);
} else {
//商户交易申请
$updData = [