GCDAT/REAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复多渠道切换渠道异常问题

Browse Source
This commit is contained in:
mzeros 2024-10-01 01:02:05 +08:00
parent 3f874513ad
commit 4e5dce1d25
2 changed files with 189 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

352
app/gateway/controller/api/Core.php
View File

@ -293,28 +293,18 @@ class Core extends Controller
# 发送通知 # 发送通知
protected function notify($order_id, $request, $status = false, $die = true) protected function notify($order_id, $request, $status = false, $die = true)
{ {
$orderService = OrderService::instance(); $orderService = OrderService::instance();
$order = $orderService->get($order_id); $order = $orderService->get($order_id);
if (!$order) { if (!$order) {
$oldOrder = OrderLastHistoryService::instance()->get($order_id); $oldorder = OrderHistoryService::instance()->get($order_id);
if(!$oldOrder){ if ($oldorder) {
$oldOrder = OrderTwoHistoryService::instance()->get($order_id);
}
if(!$oldOrder){
$oldOrder = OrderHistoryService::instance()->get($order_id);
}
if ($oldOrder) {
$channelService = ChannelService::instance(); $channelService = ChannelService::instance();
$oldupdate = $channelService->call('notify', $oldOrder['cid'], $request, false, $oldOrder); $oldupdate = $channelService->call('notify', $oldorder['cid'], $request, false, $oldorder);
$merchant = MerchantService::instance()->get($oldOrder['mid']); $merchant = MerchantService::instance()->get($oldorder['mid']);
if ($oldupdate['status'] == 3 && $oldOrder['status'] == 2 && isset($merchant['callback_repeat']) && $merchant['callback_repeat'] > 2) { if ($oldupdate['status'] == 3 && $oldorder['status'] == 2 && isset($merchant['callback_repeat']) && $merchant['callback_repeat'] > 2) {
// # TODO 暂时写死渠道，后续需修改为可以自主选择 if ($oldorder['cid'] == '2') {
if ($oldOrder['cid'] == '2') {
OrderHistoryService::instance()->db()->where(array('order_id' => $order_id))->update(['status' => '3', 'buy_back' => '1']); OrderHistoryService::instance()->db()->where(array('order_id' => $order_id))->update(['status' => '3', 'buy_back' => '1']);
if (isset($oldupdate['yes']) && $oldupdate['yes']) { if (isset($oldupdate['yes']) && $oldupdate['yes']) {
echo $oldupdate['yes']; echo $oldupdate['yes'];
@ -324,43 +314,42 @@ class Core extends Controller
die; die;
} }
} }
} }
} }
if ($order) { if ($order) {
$up = $nup = false; $up = $nup = false;
if ($order['status'] != 2 && $order['status'] != 3 && $order['status'] != 5 && $order['status'] != -6) { if ($order['status'] != 2 && $order['status'] != 3 && $order['status'] != 5 && $order['status'] != -6) {
$up = true; $up = true;
} }
if(isset($order['channel_order_id']) && $order['channel_order_id'] && isset($request['channel_order_id']) && $request['channel_order_id'] && $order['channel_order_id'] != $request['channel_order_id']) { if(isset($order['channel_order_id']) && $order['channel_order_id'] && isset($request['channel_order_id']) && $request['channel_order_id'] && $order['channel_order_id'] != $request['channel_order_id']) {
$this->no(-104); $this->no(-104);
} }
// var_dump($order);die;
#识别是否重复回调 #识别是否重复回调
// $repeated // $repeated
// if ($order['']) // if ($order[''])
if (!$status && $request) { if (!$status && $request) {
$channelService = ChannelService::instance();
$update = $channelService->call('notify', $order['cid'], $request, false, $order); $channelService = ChannelService::instance();
$merchant = MerchantService::instance()->get($order['mid']); $update = $channelService->call('notify', $order['cid'], $request, false, $order);
if (isset($order['param']) && $order['param']) { $merchant = MerchantService::instance()->get($order['mid']);
$order['param'] = json_decode($order['param'], true); if (isset($order['param']) && $order['param']) {
} else { $order['param'] = json_decode($order['param'], true);
$order['param'] = false; } else {
} $order['param'] = false;
}
#渠道返销 #渠道返销
if ($update['status'] == 3 && $order['status'] == 2 && isset($merchant['callback_repeat']) && $merchant['callback_repeat'] >= 2) { if ($update['status'] == 3 && $order['status'] == 2 && isset($merchant['callback_repeat']) && $merchant['callback_repeat'] >= 2) {
// # TODO 暂时写死渠道，后续需修改为可以自主选择 // # TODO 暂时写死渠道，后续需修改为可以自主选择
if ($order['cid'] == '2') { if ($order['cid'] == '2') {
$order->db()->where(array('order_id' => $order_id))->update(['status' => '3', 'buy_back' => '1']); $order->db()->where(array('order_id' => $order_id))->update(['status' => '3', 'buy_back' => '1']);
if (isset($update['yes']) && $update['yes']) { if (isset($update['yes']) && $update['yes']) {
echo $update['yes']; echo $update['yes'];
@ -370,167 +359,174 @@ class Core extends Controller
die; die;
} }
} }
// echo '123';die;
if (isset($order['merchant_callback_at']) && $order['merchant_callback_at']) { if (isset($order['merchant_callback_at']) && $order['merchant_callback_at']) {
echo 'fail';
die; die;
} }
$where[] = [ $where[] = [
'order_id', 'like', $order_id 'order_id', 'like', $order_id
]; ];
$is_lj_order = Db::name('merchant_order_lj')->where($where)->find(); // $is_lj_order = Db::name('merchant_order_lj')->where($where)->find();
if ($is_lj_order) { // if ($is_lj_order) {
$is_lj_status = false; // $is_lj_status = false;
} else { // } else {
$is_lj_status = true; // $is_lj_status = true;
} // }
if ($update['status'] == 3 && isset($merchant['stop']) && $merchant['stop'] > 2) { if ($update['status'] == 3 && isset($merchant['stop']) && $merchant['stop'] > 2) {
# 是否暂停 # 是否暂停
$num = $order['num'] + 1; $num = $order['num'] + 1;
$order_id = $order['order_id'] . '_' . $num; $order_id = $order['order_id'] . '_' . $num;
# 该渠道下单失败，重新下单，并暂停，等待手动启动 # 该渠道下单失败，重新下单，并暂停，等待手动启动
# 记录失败的订单信息 # 记录失败的订单信息
$orderAutoService = OrderAutoService::instance(); $orderAutoService = OrderAutoService::instance();
$estate = $orderAutoService->up($order); $estate = $orderAutoService->up($order);
if ($estate) { if ($estate) {
$orderAutoService->upChannelMsg($order['order_id'], $update['status'], $update['data'], $order['num']); $orderAutoService->upChannelMsg($order['order_id'], $update['status'], $update['data'], $order['num']);
# 修改状态 # 修改状态
$orderService->upStatus($order['order_id'], -5, '', false, $num); $orderService->upStatus($order['order_id'], -5, '', false, $num);
} }
if ($die) { if ($die) {
if (isset($update['yes']) && $update['yes']) { if (isset($update['yes']) && $update['yes']) {
echo $update['yes'];die; echo $update['yes'];die;
} }
echo 'success';die; echo 'success';die;
} else { } else {
return true; return true;
} }
} elseif ($update['status'] == 3 && isset($merchant['callback_fc']) && $merchant['callback_fc'] > $order['num']) { } elseif ($update['status'] == 3 && isset($merchant['callback_fc']) && $merchant['callback_fc'] > $order['num']) {
$num = $order['num'] + 1; $num = $order['num'] + 1;
# 该渠道下单失败，开始复充 # 该渠道下单失败，开始复充
# 记录失败的订单信息 # 记录失败的订单信息
$orderAutoService = OrderAutoService::instance(); $orderAutoService = OrderAutoService::instance();
$estate = $orderAutoService->up($order); $estate = $orderAutoService->up($order);
if ($estate) { if ($estate) {
$orderAutoService->upChannelMsg($order['order_id'], $update['status'], $update['data'], $order['num']); $orderAutoService->upChannelMsg($order['order_id'], $update['status'], $update['data'], $order['num']);
# 修改状态 # 修改状态
$orderService->upStatus($order['order_id'], -4, '', $merchant['callback_fc_time'], $num); $orderService->upStatus($order['order_id'], -4, '', $merchant['callback_fc_time'], $num);
} }
if ($die) { if ($die) {
if (isset($update['yes']) && $update['yes']) { if (isset($update['yes']) && $update['yes']) {
echo $update['yes'];die; echo $update['yes'];die;
} }
echo 'success';die; echo 'success';die;
} else { } else {
return true; return true;
} }
} elseif ($update['status'] == 3 && $merchant['callback_auto'] == 2 && $is_lj_status) { } elseif ($update['status'] == 3 && $merchant['callback_auto'] == 2 && !$order['apply_refund']) {
# 该渠道下单失败，重新开始找另外一个渠道 # 该渠道下单失败，重新开始找另外一个渠道
$orderAutoService = OrderAutoService::instance(); $num = $order['num'] + 1;
$use = $orderAutoService->get($order['order_id']); $new_order_id = $order['order_id'] . '_' . $num;
$this->use_product[] = $order['pid']; //
foreach ($use as $k => $v) { $orderAutoService = OrderAutoService::instance();
$this->use_product[] = $v['pid']; $use = $orderAutoService->get($order['order_id']);
} $this->use_product[] = $order['pid'];
$isp = false; foreach ($use as $k => $v) {
if (isset($order['isp']) && $order['isp'] && $order['isp'] > 0) { $this->use_product[] = $v['pid'];
$isp_config = \app\merchant\service\PercentService::instance()->getIsp(); }
$isp = $isp_config[$order['isp']]; $isp = false;
} if (isset($order['isp']) && $order['isp'] && $order['isp'] > 0) {
$new_product = $this->getProduct($order['mid'], $order['product_key'], $this->use_product, $order['cash'], $isp); $isp_config = \app\merchant\service\PercentService::instance()->getIsp();
if ($new_product && $order['param']) { $isp = $isp_config[$order['isp']];
# 记录失败的订单信息 }
$orderAutoService->up($order); $new_product = $this->getProduct($order['mid'], $order['product_key'], $this->use_product, $order['cash'], $isp);
$orderAutoService->upChannelMsg($order_id, $update['status'], $update['data']); if ($new_product && $order['param']) {
$channelService->use($order['mid'], $new_product, $order['param'], false, $order_id, $this->use_product); # 记录失败的订单信息
if ($die) { $orderAutoService->up($order);
if (isset($update['yes']) && $update['yes']) { $orderAutoService->upChannelMsg($order_id, $update['status'], $update['data'], $order['num']);
echo $update['yes'];die; $channelService->use($order['mid'], $new_product, $order['param'], false, $new_order_id, $this->use_product);
} if ($die) {
echo 'success';die; if (isset($update['yes']) && $update['yes']) {
} else { echo $update['yes'];die;
return true; }
} echo 'success';die;
} } else {
} return true;
if ($update && $up) { }
$nup = true; }
$orderService->upChannelMsg($order['id'], $update['status'], $update['data']); }
} if ($update && $up) {
} elseif ($status) { $nup = true;
$update['status'] = $status; $orderService->upChannelMsg($order['id'], $update['status'], $update['data']);
$update['data'] = $request; }
} } elseif ($status) {
$update['status'] = $status;
$update['data'] = $request;
}
if ($update && $order['merchant_callback_error'] != 1) {
//$update['order'] = $order;
$update['project_id'] = false;
if (isset($order['project_id'])) {
$update['project_id'] = $order['project_id'];
}
if (isset($order['card_id'])) {
$update['card_id'] = $order['card_id'];
}
$update['account'] = $order['account'];
$update['cash'] = $order['cash'];
$update['merchant_order_id'] = $order['merchant_order_id'];
$update['order_id'] = $order_id;
$update['notify_num'] = $order['merchant_callback_num'];
if (isset($order['isp']) && $order['isp']) {
$update['isp'] = $order['isp'];
}
if ($order['param'] && isset($order['param']['notify']) && $order['param']['notify']) {
$update['notify'] = $order['param']['notify'];
}
if ($order['mid'] == 33 && $order['cid'] == 10026) {
if (isset($update['s_nubmer'])) {
unset($update['s_nubmer']);
}
if (isset($update['msg'])) {
unset($update['msg']);
}
}
# 商户后续操作 if ($update && $order['merchant_callback_error'] != 1) {
if ($up) { //$update['order'] = $order;
if (isset($order['error_account_oper']) && $order['error_account_oper'] == 1) { $update['project_id'] = false;
# 需要进行扣费 if (isset($order['project_id'])) {
MerchantService::instance()->up($order['id'], $order['mid'], $order['pid'], $order['product_key'], $update); $update['project_id'] = $order['project_id'];
} else { }
# 直接发送 if (isset($order['card_id'])) {
MerchantService::instance()->notify($order['id'], $order['mid'], $order['pid'], $order['product_key'], $update); $update['card_id'] = $order['card_id'];
} }
} $update['account'] = $order['account'];
} $update['cash'] = $order['cash'];
$update['merchant_order_id'] = $order['merchant_order_id'];
$update['order_id'] = $order_id;
$update['notify_num'] = $order['merchant_callback_num'];
if (isset($order['isp']) && $order['isp']) {
$update['isp'] = $order['isp'];
}
if ($order['param'] && isset($order['param']['notify']) && $order['param']['notify']) {
$update['notify'] = $order['param']['notify'];
}
if ($order['mid'] == 33 && $order['cid'] == 10026) {
if (isset($update['s_nubmer'])) {
unset($update['s_nubmer']);
}
if (isset($update['msg'])) {
unset($update['msg']);
}
}
if ($update) { # 商户后续操作
if ($up && $nup) { if ($up) {
$orderService->upChannelMsg($order['id'], $update['status'], $update['data']); if (isset($order['error_account_oper']) && $order['error_account_oper'] == 1) {
} # 需要进行扣费
if ($die) { MerchantService::instance()->up($order['id'], $order['mid'], $order['pid'], $order['product_key'], $update);
if (isset($update['yes']) && $update['yes']) { } else {
echo $update['yes'];die; # 直接发送
} MerchantService::instance()->notify($order['id'], $order['mid'], $order['pid'], $order['product_key'], $update);
echo 'success';die; }
} else { }
return true; }
}
} if ($update) {
} if ($up && $nup) {
if ($die) { $orderService->upChannelMsg($order['id'], $update['status'], $update['data']);
echo 'fail';die; }
} else { if ($die) {
return false; if (isset($update['yes']) && $update['yes']) {
} echo $update['yes'];die;
} }
echo 'success';die;
} else {
return true;
}
}
}
if ($die) {
echo 'fail';die;
} else {
return false;
}
}
private function getProduct($mid, $product, $use_product, $cash, $isp = false) private function getProduct($mid, $product, $use_product, $cash, $isp = false)
{ {

21
app/gateway/controller/v4/Core.php
View File

@ -385,12 +385,12 @@ class Core extends Controller
'order_id', 'like', $order_id 'order_id', 'like', $order_id
]; ];
$is_lj_order = Db::name('merchant_order_lj')->where($where)->find(); // $is_lj_order = Db::name('merchant_order_lj')->where($where)->find();
if ($is_lj_order) { // if ($is_lj_order) {
$is_lj_status = false; // $is_lj_status = false;
} else { // } else {
$is_lj_status = true; // $is_lj_status = true;
} // }
if ($update['status'] == 3 && isset($merchant['stop']) && $merchant['stop'] > 2) { if ($update['status'] == 3 && isset($merchant['stop']) && $merchant['stop'] > 2) {
@ -439,8 +439,11 @@ class Core extends Controller
} else { } else {
return true; return true;
} }
} elseif ($update['status'] == 3 && $merchant['callback_auto'] == 2 && $is_lj_status) { } elseif ($update['status'] == 3 && $merchant['callback_auto'] == 2 && !$order['apply_refund']) {
# 该渠道下单失败，重新开始找另外一个渠道 # 该渠道下单失败，重新开始找另外一个渠道
$num = $order['num'] + 1;
$new_order_id = $order['order_id'] . '_' . $num;
//
$orderAutoService = OrderAutoService::instance(); $orderAutoService = OrderAutoService::instance();
$use = $orderAutoService->get($order['order_id']); $use = $orderAutoService->get($order['order_id']);
$this->use_product[] = $order['pid']; $this->use_product[] = $order['pid'];
@ -456,8 +459,8 @@ class Core extends Controller
if ($new_product && $order['param']) { if ($new_product && $order['param']) {
# 记录失败的订单信息 # 记录失败的订单信息
$orderAutoService->up($order); $orderAutoService->up($order);
$orderAutoService->upChannelMsg($order_id, $update['status'], $update['data']); $orderAutoService->upChannelMsg($order_id, $update['status'], $update['data'], $order['num']);
$channelService->use($order['mid'], $new_product, $order['param'], false, $order_id, $this->use_product); $channelService->use($order['mid'], $new_product, $order['param'], false, $new_order_id, $this->use_product);
if ($die) { if ($die) {
if (isset($update['yes']) && $update['yes']) { if (isset($update['yes']) && $update['yes']) {
echo $update['yes'];die; echo $update['yes'];die;