9-28更新
This commit is contained in:
mzeros
parent
6222b7b484
commit
684e87c577
@ -139,10 +139,6 @@ class Core
|
||||
}
|
||||
}
|
||||
|
||||
#关于商户限额
|
||||
|
||||
|
||||
|
||||
if (isset($param['s']) && $param['s']) {
|
||||
$this->channel['order_limit'] = 0;
|
||||
unset($param['s']);
|
||||
|
||||
@ -155,21 +155,6 @@ class Taobao extends Coretb
|
||||
$this->yesTB($data, 'submit_coop', $this->order);
|
||||
}
|
||||
|
||||
# 提交接口 一般用于提交数据，异步执行
|
||||
public function tb_charge_test()
|
||||
{
|
||||
|
||||
$this->input_coop();
|
||||
$settingStatus = sysconf('settingStatus');
|
||||
if ($settingStatus == 1) {
|
||||
$this->noTB(401003);
|
||||
}
|
||||
$data = $this->channel($this->mid, $this->product);
|
||||
var_dump($data);die;
|
||||
|
||||
$this->yesTB($data, 'submit_coop', $this->order);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -15,11 +15,7 @@
|
||||
|
||||
namespace app\order\controller;
|
||||
|
||||
use app\channel\service\ChannelService;
|
||||
use app\kami\service\LockCardService;
|
||||
use app\merchant\service\OrderAutoService;
|
||||
use app\merchant\service\OrderLastHistoryService;
|
||||
use app\merchant\service\OrderLastweekHistoryService;
|
||||
use app\merchant\service\OrderTwoHistoryService;
|
||||
use app\openapi\controller\Coretb;
|
||||
use app\setting\service\BlackCardService;
|
||||
@ -59,11 +55,11 @@ class Order extends Controller
|
||||
$config['cash'] = [5,10,20,30,50,100,200,300,500,1000,2000];
|
||||
$config['status'] = [''=>'-- 全部 --','1'=>'下单','2'=>'成功', '3'=> '失败', '4' => '处理中', '5' => '存疑', '7' => '提卡成功待处理','-1' => '队列中', '-2' => '失败待处理', '-3' => '排队中', '-4' => '复充排队中', '-5' => '已暂停', '-6' => '已冻结'];
|
||||
$config['time'] = ['1'=>'小于1分钟','2'=>'1分钟-10分钟', '3' => '10分钟-20分钟','4' => '20分钟-30分钟','5' => '30分钟-40分钟','6' => '40分钟-50分钟','7' => '50分钟-60分钟','8' => '1小时-24小时','9' => '24小时-36小时','10' => '36小时-48小时','11' => '大于48小时'];
|
||||
$config['data_type'] = ['1'=>'今日','7'=>'最近一周','5'=>'最近一个月','6'=>'最近二到三个月','2'=>'历史'];
|
||||
$config['data_type'] = ['1'=>'今日','5'=>'最近一个月','6'=>'最近二到三个月','2'=>'历史'];
|
||||
$config['is_number'] = [''=>'-- 全部 --','1'=>'有流水号','2'=>'无流水号'];
|
||||
$config['buy_back'] = [''=>'-- 全部 --','1'=>'返销订单','0'=>'正常订单'];
|
||||
$config['kami_hinged'] = [''=>'-- 全部 --','1'=>'卡密二销返销订单','2'=>'正常订单'];
|
||||
$config['apply_refund'] = [''=>'-- 全部 --','0'=>'未申请','1'=>'已申请'];
|
||||
$config['apply_refund'] = [''=>'-- 全部 --','0'=>'未申请','1'=>'登记申请退单','2'=>'退单成功','3'=>'退单失败已成功','4'=>'退单处理中'];
|
||||
|
||||
return $config;
|
||||
}
|
||||
@ -77,8 +73,6 @@ class Order extends Controller
|
||||
$this->table = 'merchant_order_two_history';
|
||||
}else if ($data_type == 2) {
|
||||
$this->table = 'merchant_order_history';
|
||||
}else if ($data_type == 7) {
|
||||
$this->table = 'merchant_order_lastweek_history';
|
||||
}
|
||||
$this->data_type = $data_type;
|
||||
$this->isp = PercentService::instance()->getIsp();
|
||||
@ -319,30 +313,16 @@ class Order extends Controller
|
||||
|
||||
#添加锁卡功能
|
||||
if(isset($vo['cinfo']['suoka_status']) && $vo['cinfo']['suoka_status'] > 0){
|
||||
if(isset($vo['lockcard_id']) && $vo['lockcard_id']){
|
||||
$lockCardInfo = LockCardService::instance()->getInfo($vo['order_id']);
|
||||
if($lockCardInfo && isset($lockCardInfo['lock_type'])){
|
||||
if($lockCardInfo['lock_type'] == 1){
|
||||
$vo['suoka_status'] = 2;
|
||||
}else{
|
||||
$vo['suoka_status'] = 1;
|
||||
}
|
||||
|
||||
}else{
|
||||
$vo['suoka_status'] = 1;
|
||||
}
|
||||
|
||||
}else{
|
||||
$vo['suoka_status'] = 1;
|
||||
}
|
||||
|
||||
}else{
|
||||
$vo['suoka_status'] = 0;
|
||||
}
|
||||
#添加黑名单设置功能
|
||||
if(isset($vo['minfo']['merchant_type']) && $vo['minfo']['merchant_type'] == 8 || $vo['minfo']['merchant_type'] == 9){
|
||||
if(isset($vo['minfo']['merchant_type']) && $vo['minfo']['merchant_type'] == 8){
|
||||
|
||||
$check = BlackCardService::instance()->checkorderid($vo['order_id'],$vo['minfo']['merchant_type']);
|
||||
$check = BlackCardService::instance()->checkorderid($vo['order_id']);
|
||||
|
||||
if(!$check){
|
||||
$vo['set_black_status'] = 2;
|
||||
@ -405,13 +385,9 @@ class Order extends Controller
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// $this->total = OrderService::instance()->total();
|
||||
$this->total = OrderService::instance()->total();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 实时统计
|
||||
* @login true
|
||||
@ -432,19 +408,6 @@ class Order extends Controller
|
||||
$this->_form($this->table, 'stat');
|
||||
}
|
||||
|
||||
#异步实时统计
|
||||
public function stats()
|
||||
{
|
||||
$query = $this->getDb();
|
||||
|
||||
$config = $this->getConfig();
|
||||
|
||||
$this->total = OrderService::instance()->total();
|
||||
$this->success('ok',$this->total);
|
||||
|
||||
// $this->_form($this->table, 'stat');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查看详细数据
|
||||
@ -466,8 +429,6 @@ class Order extends Controller
|
||||
$this->table = 'merchant_order_two_history';
|
||||
}elseif ($data_type == 2) {
|
||||
$this->table = 'merchant_order_history';
|
||||
}elseif ($data_type == 7) {
|
||||
$this->table = 'merchant_order_lastweek_history';
|
||||
}
|
||||
$this->_applyFormToken();
|
||||
$this->verify = false;
|
||||
@ -533,6 +494,8 @@ class Order extends Controller
|
||||
}
|
||||
} elseif ($product == 'dhcz') {
|
||||
$param['mobile'] = $temp[0];
|
||||
} elseif ($product == 'ltcz' || $product == 'ydcz' || $product == 'dxcz') {
|
||||
$param['mobile'] = $temp[0];
|
||||
} else {
|
||||
$param['card'] = $temp[0];
|
||||
if (isset($temp[1]) && $temp[1]) {
|
||||
@ -609,8 +572,6 @@ class Order extends Controller
|
||||
$order = OrderTwoHistoryService::instance();
|
||||
}else if ($data_type == 2) {
|
||||
$order = OrderHistoryService::instance();
|
||||
}else if ($data_type == 7) {
|
||||
$order = OrderLastweekHistoryService::instance();
|
||||
}else {
|
||||
$order = OrderBase::instance();
|
||||
}
|
||||
@ -660,8 +621,6 @@ class Order extends Controller
|
||||
$order = OrderTwoHistoryService::instance();
|
||||
}else if ($data_type == 2) {
|
||||
$order = OrderHistoryService::instance();
|
||||
}else if ($data_type == 7) {
|
||||
$order = OrderLastweekHistoryService::instance();
|
||||
} else {
|
||||
$order = OrderBase::instance();
|
||||
}
|
||||
@ -799,8 +758,6 @@ class Order extends Controller
|
||||
$order = OrderLastHistoryService::instance();
|
||||
} else if($data['data_type'] == 6){
|
||||
$order = OrderTwoHistoryService::instance();
|
||||
} else if($data['data_type'] == 7){
|
||||
$order = OrderLastweekHistoryService::instance();
|
||||
} else {
|
||||
$order = OrderBase::instance();
|
||||
}
|
||||
@ -813,9 +770,6 @@ class Order extends Controller
|
||||
$param = json_decode($info['param'],true);
|
||||
if(isset($param['By_OpenUid']) && $param['By_OpenUid'] != 'error'){
|
||||
$value = $param['By_OpenUid'];;
|
||||
}elseif(isset($param['buyerId']) && $param['buyerId'] != 'error'){
|
||||
$value = $param['buyerId'];;
|
||||
|
||||
}else{
|
||||
$value = $this->get_nick($info['merchant_order_id'], $info['mid']);
|
||||
if(!isset($value) || $value == 'error'){
|
||||
@ -859,14 +813,6 @@ class Order extends Controller
|
||||
$request = [];
|
||||
$request['agentId'] = $merchant['agentId'];
|
||||
$request['agentkey'] = $merchant['agentkey'];
|
||||
if(isset($merchant['other_param']) && $merchant['other_param'] && str_contains($this->merchant['other_param'], "reapi_appkey"))
|
||||
{
|
||||
$other_param = json_decode($this->merchant['other_param'], true);
|
||||
$request['agentId'] = $other_param['reapi_appkey'];
|
||||
$request['agentkey'] = $other_param['reapi_appsecret'];
|
||||
$Seesionkey = $this->merchant['access_token'];
|
||||
|
||||
}
|
||||
$request['tid'] = $merchant_order_id;
|
||||
$request['access_token'] = $Seesionkey;
|
||||
$response = Coretb::taobaosdk('getByTrade',$request);
|
||||
@ -914,118 +860,7 @@ class Order extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
# 锁卡功能优化
|
||||
public function suoka()
|
||||
{
|
||||
$order_id = input('order_id');
|
||||
if (!$order_id) {
|
||||
$this->error('请选择订单');
|
||||
}
|
||||
$type = input('type');
|
||||
$msg = input('msg');
|
||||
$data_type = input('data_type', 1);
|
||||
|
||||
$channelService = ChannelService::instance();
|
||||
$LockCardService = LockCardService::instance();
|
||||
|
||||
$order = OrderService::instance();
|
||||
|
||||
|
||||
$orderInfo = $order->getOrder($data_type,$order_id);
|
||||
|
||||
$response = json_decode($orderInfo['response'],true);
|
||||
|
||||
$channelInfo = $channelService->get($orderInfo['cid']);
|
||||
|
||||
if ($data_type == 5) {
|
||||
$order = OrderLastHistoryService::instance();
|
||||
}else if ($data_type == 6) {
|
||||
$order = OrderTwoHistoryService::instance();
|
||||
}else if ($data_type == 7) {
|
||||
$order = OrderLastweekHistoryService::instance();
|
||||
}elseif ($data_type == 2) {
|
||||
$order = OrderHistoryService::instance();
|
||||
}elseif ($data_type == 3) {
|
||||
$order = OrderAutoService::instance();
|
||||
}
|
||||
|
||||
$where = ['order_id' => $order_id];
|
||||
|
||||
|
||||
if($channelInfo['suoka_status'] == 1){
|
||||
|
||||
if (isset($response['kami'])) {
|
||||
if($type == 1){
|
||||
$suoka = $channelService->call('lockCard', $orderInfo['cid'], $orderInfo);
|
||||
if($suoka == 'ok' || $suoka == 'old_ok'){
|
||||
$lockcard_id = $LockCardService->lockcard_log(1,$orderInfo,$response['kami'],'锁卡');
|
||||
if($lockcard_id){
|
||||
$order->db()->where($where)->update(['lockcard_id'=>$lockcard_id]);
|
||||
$this->success('锁卡成功！', '');
|
||||
}else{
|
||||
$this->error('锁卡成功！登记失败', '');
|
||||
}
|
||||
|
||||
|
||||
}else{
|
||||
Log::write('kami', 'lockCard', $orderInfo['order_id'].'锁卡失败');#写入到日志里
|
||||
$this->error('锁卡失败！请自行核对', '');
|
||||
}
|
||||
}else{
|
||||
$this->error('暂不支持解锁', '');
|
||||
}
|
||||
|
||||
}
|
||||
}elseif($channelInfo['suoka_status'] == 2){
|
||||
if (isset($response['kami'])) {
|
||||
if($type == 1) {
|
||||
$suoka = $LockCardService->call('suoka', $orderInfo['cid'], $response['kami']['cardno'], $response['kami']['cardpwd'], $orderInfo['pid'], $orderInfo['cash']);
|
||||
if ($suoka == 'ok' || $suoka == 'old_ok') {
|
||||
$lockcard_id = $LockCardService->lockcard_log(1,$orderInfo,$response['kami'],'锁卡');
|
||||
if($lockcard_id){
|
||||
$order->db()->where($where)->update(['lockcard_id'=>$lockcard_id]);
|
||||
$this->success('锁卡成功！', '');
|
||||
}else{
|
||||
$this->error('锁卡成功！登记失败', '');
|
||||
}
|
||||
|
||||
|
||||
} elseif ($suoka == 'use_error') {
|
||||
$lockcard_id = $LockCardService->lockcard_log(2,$orderInfo,$response['kami'],'锁卡');
|
||||
Log::write('kami', 'lockCard', $orderInfo['order_id'].'锁卡失败，已经被使用');#写入到日志里
|
||||
if($lockcard_id){
|
||||
$order->db()->where($where)->update(['lockcard_id'=>$lockcard_id]);
|
||||
$this->error('已经被使用！', '');
|
||||
}else{
|
||||
$this->error('锁卡失败！已经被使用', '');
|
||||
}
|
||||
|
||||
} else {
|
||||
Log::write('kami', 'lockCard', $orderInfo['order_id'].'锁卡失败');#写入到日志里
|
||||
$this->error('锁卡失败！请自行核对', '');
|
||||
|
||||
}
|
||||
}else{
|
||||
$this->error('暂不支持解锁', '');
|
||||
}
|
||||
//
|
||||
|
||||
}
|
||||
|
||||
|
||||
} else{
|
||||
$this->error('锁卡', '');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#
|
||||
# 设置订单状态
|
||||
/**
|
||||
* 设置订单状态
|
||||
* @login true
|
||||
* @auth true
|
||||
*/
|
||||
public function set()
|
||||
{
|
||||
$order_id = input('order_id');
|
||||
@ -1088,8 +923,6 @@ class Order extends Controller
|
||||
$order = OrderLastHistoryService::instance();
|
||||
}else if($data_type == 6){
|
||||
$order = OrderTwoHistoryService::instance();
|
||||
}else if($data_type == 7){
|
||||
$order = OrderLastweekHistoryService::instance();
|
||||
}else {
|
||||
$order = OrderBase::instance();
|
||||
}
|
||||
@ -1141,8 +974,6 @@ class Order extends Controller
|
||||
$order = OrderLastHistoryService::instance();
|
||||
} else if ($data_type == 6) {
|
||||
$order = OrderTwoHistoryService::instance();
|
||||
} else if ($data_type == 7) {
|
||||
$order = OrderLastweekHistoryService::instance();
|
||||
} else {
|
||||
$order = OrderBase::instance();
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user