diff --git a/app/channel/service/system/Feedov.php b/app/channel/service/system/Feedov.php
index dde0c20..b8e84f9 100644
--- a/app/channel/service/system/Feedov.php
+++ b/app/channel/service/system/Feedov.php
@@ -153,10 +153,16 @@ class Feedov extends Core
$data['msg'] = $result['msg'] = $data['info'];
}
+ if(isset($data['cost']) && $data['cost']){
+ $data['channel_cost'] = $result['channel_cost'] = $data['cost'];
+ }
+
$result['yes'] = 'SUCCESS';
$result['data'] = $data;
+ # ['yes' = success,data = array ,msg =1,s_number =32123,channel_cost = 1.2,status = 1]
+
return $result;
}
@@ -276,6 +282,8 @@ class Feedov extends Core
$channel_order_id = $response['array']['data']['order_id'];
}
+ #
+
$this->create($param['order'], $channel_order_id, $param['merchant_order'], $param['cash'], $url, $request, $response, 1, $param['account']);
return $response['msg'];
}
diff --git a/app/channel/service/system/Kuaijiaofei.php b/app/channel/service/system/Kuaijiaofei.php
index 01f0c8e..05d944c 100644
--- a/app/channel/service/system/Kuaijiaofei.php
+++ b/app/channel/service/system/Kuaijiaofei.php
@@ -256,9 +256,7 @@ class kuaijiaofei extends Core
if($stockArray){
$request['tradeMoney']=($stockArray['price']/100)*$param['cash'];
}
-// if($param['cash']==200){
-// $request['tradeMoney']=200;
-// }
+
$request['sign'] = $this->_sign($request,array('memberId','productId','memberOrderId','rechargeAccount','faceValue'));
$url = $this->host . $this->api; //组装地址
diff --git a/app/channel/service/system/Xmoli.php b/app/channel/service/system/Xmoli.php
new file mode 100644
index 0000000..66d5190
--- /dev/null
+++ b/app/channel/service/system/Xmoli.php
@@ -0,0 +1,250 @@
+ 'account',
+ );
+ $this->api='api.giftcard/submit';
+ return $this->submit($param, $check);
+ }
+
+
+
+ # 通知处理 主要返回状态 2是成功 3是失败
+ # 通知处理 主要返回状态 2是成功 3是失败
+ public function notify($data)
+ {
+ $result = array();
+ $result['cash'] = 1;
+ $result['status'] = $data['status'] ;
+ if (isset($data['kami']) && $data['kami']['cardno']) {
+ # 流水号
+ $data['s_nubmer'] = $result['s_nubmer'] = $data['kami']['cardno'];
+ }
+
+
+ $result['yes'] = 'ok';
+
+ $result['data'] = $data;
+
+ return $result;
+ }
+ public function query($order){
+ $request['appid'] = $this->mid;
+ $request['api_product'] = 'query';
+ $request['merchant_order_id'] =$order['order_id'];
+
+ $request['signature'] = $this->_sign($request);
+ $url = $this->host . 'api.giftcard/query';
+ $response = $this->curl('post', $url, $request);
+
+ $log['type'] = 'query_response';
+ $log['data'] = $response;
+ $log['config'] = $this->data;
+ $this->log($log);
+
+ $array = $this->json_decode($response);
+
+
+
+ $result = array();
+
+// var_dump($array);die;
+// $result['status'] = 4;
+ if (isset($array['code']) && $array['code'] == '1') {
+ if(isset($array['data']['status'])){
+
+ if ($array['data']['status'] == 2) {
+ if(isset($array['data']['card'])){
+ $kami = $this->decrypt_3des($array['data']['card'],$order['channel_order_id']);
+ $kami = explode(',', $kami);
+ $kamidata = [
+ 'cardno' => $kami[0],
+ 'cardpwd' => $kami[1],
+ 'expired' => $kami[2],
+
+ ];
+
+ $this->upOrderResponse($kamidata,$order['merchant_order_id'],$order['response']);
+ $result['status'] = 7;
+ $result['kami'] = $kamidata;
+ }else{
+ $result['status'] = 4;
+ }
+ }elseif($array['data']['status'] == 3){
+ $result['status'] = 3;
+ }else{
+ $result['status'] = 4;
+ }
+ }
+
+
+ } else{
+ $result['status'] = 4;
+ }
+
+
+
+
+
+ return $result;
+ }
+ # 数据响应格式处理
+ public function response($data)
+ {
+ $log['type'] = 'response';
+ $log['data'] = $data;
+ $log['config'] = $this->data;
+ $this->log($log);
+
+ #以上不要做任何变动
+
+
+
+ $array = $this->json_decode($data); //响应数据为json
+ #如果响应为XML格式
+// $array = (array) simplexml_load_string($data);
+
+ if (!$array) {
+ $msg = 'error';
+ } elseif (isset($array['code']) && $array['code']=='1') { //修改判断逻辑为确定提交成功即可
+ # 正确
+ $msg = 'ok';
+ #如有其他判断以下
+// if(isset($array['cards'])){
+// $array['kami'] = array
+// (
+// 'cardno' => $array['cards'][0]['card_no'],
+// 'cardpwd' => $array['cards'][0]['card_password'],
+// 'expired' => $array['cards'][0]['expired_at'],
+//// 'value' => $array['data']['count_money'],
+// );
+// }
+ } else {
+ # 错误
+ $msg = $array['info'] ?? 'error'; //前面message根据响应内容改成对应的错误提示
+ }
+
+ return array
+ (
+ 'msg' => $msg,
+ 'data' => $data,
+ 'array' => $array,
+ );
+ }
+
+ # 查询余额接口
+ public function account($day)
+ {
+ $request['customer_id'] = $this->mid;
+ $request['timestamp']=time();
+ $request['sign'] = $this->_sign($request);
+ $url = $this->host . 'api/customer';
+ $response = $this->curl('post', $url, $request);
+ $response = $this->response($response);
+
+ $datas = $response['array']['data'];
+ if(is_array($datas) && isset($datas['balance']) && $datas['balance'] ){
+ $datas['account'] = $datas['balance']; //此处为余额
+ }
+
+ return $datas;
+ }
+
+
+ # 提交数据
+ private function submit($param, $check)
+ {
+ #提交处理
+ $param = $this->param($param, $check);
+ if (is_string($param) || (is_array($param) && $param['status'] == 1)) {
+ return $param;
+ }
+ $request = $param['detail']; //上面替换剩下的
+ #结束初步
+
+ $request['appid']=$this->mid;
+
+// $request['notify']=$this->getNotify($param['order'], 1); //回调方法默认不用改
+ $request['order']=$param['order']; //我方系统订单号
+ $request['proid']=$this->getGid($param['cash']); //此方法为根据面值获取产品id,如无需可注释
+ $request['num']=1;
+// unset($request['cash']);
+ $request['signature'] = $this->_sign($request);
+ $url = $this->host . $this->api; //组装地址
+// var_dump($url);die;
+
+
+
+
+ $response = $this->curl('post', $url, $request);
+ $response = $this->response($response);
+// var_dump($response);die;
+ $channel_order_id = '';
+
+ #如果出现响应有上游订单号,可以如下
+ if (isset($response["array"]['data']['order'])) {
+ $channel_order_id = $response["array"]['data']['order'];
+ }
+
+ $this->create($param['order'], $channel_order_id, $param['merchant_order'], $param['cash'], $url, $request, $response, 1, $param['account']);
+ return $response['msg'];
+ }
+
+ private function _sign($request)
+ {
+ $request['token']=$this->token;
+ ksort($request);
+ $sign_string = '';
+
+ foreach ($request as $k => $v) {
+ if (strlen($v)) {
+ $sign_string .= $k . '=' . $v . '&';
+ }
+ }
+ $sign_string = substr($sign_string, 0, -1);
+
+ return md5($sign_string);
+// unset($request['cash']);
+
+ }
+
+ public function upOrderResponse($kami,$merchant_order_id,$orderResponse)
+ {
+ $orderService = OrderService::instance();
+
+ $response = json_decode($orderResponse,true);
+ $response['kami'] = $kami;
+ $data = ['response' => json_encode($response)];
+
+ $orderService->db()->where(array('merchant_order_id' => $merchant_order_id))->update($data);
+ }
+
+ #3des解密
+ public function decrypt_3des($encrypted_string, $order_id) {
+ // 常量定义
+
+ // 生成密钥
+ $key = md5(md5($this->token) . $order_id);
+ $key= strtolower($key);
+
+ // 解密
+ return openssl_decrypt(base64_decode($encrypted_string), "des-ede3", $key, OPENSSL_RAW_DATA);
+}
+
+}
\ No newline at end of file
diff --git a/app/gateway/controller/api/Notify.php b/app/gateway/controller/api/Notify.php
index 584c63e..f775755 100644
--- a/app/gateway/controller/api/Notify.php
+++ b/app/gateway/controller/api/Notify.php
@@ -455,6 +455,31 @@ class Notify extends Core
}
}
+ # 渠道僧下卡密,主动查询
+ public function xmoli()
+ {
+ $channelService = \app\channel\service\ChannelService::instance();
+ $class = \app\merchant\service\OrderService::instance();
+ $where['cid'] = 9;
+ $where['status'] = 4;
+ $data = $class->db()->where($where)->order('id asc')->limit(100)->select()->toArray();
+
+
+ if ($data) {
+ foreach ($data as $k => $v) {
+ $class->db()->where(array('id' => $v['id']))->update(array('status' => 6));
+// var_dump($v);die;
+ $result = $channelService->call('query', $v['cid'], $v);
+// var_dump($v);die;
+
+ $class->db()->where(array('id' => $v['id']))->update(array('status' => 4));
+ if ($result['status'] == 7) {
+ return $this->notify($v['order_id'], $result, false, false);
+ }
+ }
+ }
+ }
+
# 渠道僧下卡密,主动查询
public function piaopiapjinbi()
{
diff --git a/app/merchant/controller/Merchant.php b/app/merchant/controller/Merchant.php
index 855ff80..6ed1456 100644
--- a/app/merchant/controller/Merchant.php
+++ b/app/merchant/controller/Merchant.php
@@ -493,6 +493,10 @@ class Merchant extends Controller
$this->_form($this->table, 'autoCard','id', [], ['id' => $id]);
} else {
+// var_dump(input());die;
+// array(12) { ["id"]=> string(2) "12" ["other_param"]=> string(113) "{"maSuDa_uid":"AAHamonFAOWtbFuvBodPfaUg","maSuDa_secret_key":"cmf9467r0xpwziym","autoCardSoftware":"3","ss":"11"}" ["spm"]=> string(10) "m-68-71-74" ["open_type"]=> string(5) "modal" ["autoCardSoftware"]=> string(1) "2" ["maSuDa_uid"]=> string(24) "AAHamonFAOWtbFuvBodPfaUg" ["maSuDa_secret_key"]=> string(16) "cmf9467r0xpwziym" ["maSuDa_message_config"]=> string(1) "1" ["maSuDa_trade_buyer_pay"]=> string(2) "on" ["maSuDa_trade_memo_modified"]=> string(2) "on" ["maSuDa_trade_status"]=> string(1) "1" ["maSuDa_afterSales_status"]=> string(1) "2" }
+
+// array(10) { ["id"]=> string(2) "12" ["other_param"]=> string(113) "{"maSuDa_uid":"AAHamonFAOWtbFuvBodPfaUg","maSuDa_secret_key":"cmf9467r0xpwziym","autoCardSoftware":"3","ss":"11"}" ["spm"]=> string(10) "m-68-71-74" ["open_type"]=> string(5) "modal" ["autoCardSoftware"]=> string(1) "2" ["maSuDa_uid"]=> string(24) "AAHamonFAOWtbFuvBodPfaUg" ["maSuDa_secret_key"]=> string(16) "cmf9467r0xpwziym" ["maSuDa_message_config"]=> string(1) "2" ["maSuDa_trade_status"]=> string(1) "2" ["maSuDa_afterSales_status"]=> string(1) "2" }
$id = input('id');
$autoCardSoftware = input('autoCardSoftware');
@@ -511,6 +515,18 @@ class Merchant extends Controller
#消息订阅关闭
if(!empty(input('maSuDa_message_config')) ){
$maSuDa_message_config = input('maSuDa_message_config');
+ $other_param_arr_new['maSuDa_message_config'] = $maSuDa_message_config;
+ $maSuDa_message_config_array = [];
+// if(!empty(input('maSuDa_trade_buyer_pay') )
+
+ }
+
+ if(!empty(input('maSuDa_afterSales_status')) ){
+ $other_param_arr_new['maSuDa_afterSales_status'] = input('maSuDa_afterSales_status');;
+ }
+
+ if(!empty(input('maSuDa_trade_status')) ){
+ $other_param_arr_new['maSuDa_trade_status'] = input('maSuDa_trade_status');
}
}
diff --git a/app/merchant/view/merchant/autoCard.html b/app/merchant/view/merchant/autoCard.html
index 4cded06..1d98fb6 100644
--- a/app/merchant/view/merchant/autoCard.html
+++ b/app/merchant/view/merchant/autoCard.html
@@ -60,12 +60,46 @@
-
+
+
+
+
商户信息 | -授信账户 | +授信账户 | 余额账户 | 订单信息 | @@ -46,7 +46,8 @@
- {$vo.name|default=''}( {$vo.id|default=''} )
+ {$vo.name|default=''}( {$vo.id|default=''}
+ )
{eq name='vo.status' value='0'}已禁用{else}使用中{/eq} - 编 辑 + 编 辑 - 禁 用 - - 启 用 + 禁 + 用 + + 启 + 用 - 秘 钥 + 秘 + 钥 - - 账户设置 - - - - 渠道设置 - - - 折扣设置 - - - - 查看信息 - - - + + 账户设置 - + + - {else} - + - 编 辑 + 编 辑 - 恢 复 + 恢 + 复 - 删 除 + 删 + 除 {/if} - + |
{/foreach}
diff --git a/app/openapi/controller/Coretb.php b/app/openapi/controller/Coretb.php
index f8ba468..b041e7f 100644
--- a/app/openapi/controller/Coretb.php
+++ b/app/openapi/controller/Coretb.php
@@ -365,7 +365,7 @@ class Coretb extends Controller
}else{
# 检测是否超过限制
$new_num = $countS + 1;
- if($new_num >=$num){
+ if($new_num >$num){
#超出,需要退款
$tempNum=2;
while($tempNum>0){
@@ -388,66 +388,148 @@ class Coretb extends Controller
}
}
- #查询 param 中json数据 By_OpenUid 出现次数counO create_at data(Y-
- $count = OrderService::instance()->db()->where(['status'=>'2','mid'=>$this->mid])->whereBetween('create_at',[date('Y-m-d 00:00:00',time()),date('Y-m-d 23:59:59',time())])->whereLike('param',"%".$By_OpenUid."%")->count();
- if(isset($array['limitbuy_num'])){
+ # 检测是否为限购,如果为限购,则需要检测是否超过限制,如果超过限制,则需要退款,如果未超过限制,则需要发货,使用redis进行优化处理
+
+ if(isset($array['limitbuy_num']) || isset($array['limitbuy_amount'])){
+ $redis = RedisService::getInstance();
+ $redis_key = $this->merchant['id'].'_['.$By_OpenUid.']_LimitBuy';
+ $data = $redis->get($redis_key);
+ $n_cash = $this->input['cash']??0;
+ #计算当天还有多少秒
+ $remainingSeconds = 86400 - (time() + 8 * 3600) % 86400;
- if($count>=$array['limitbuy_num']){
+ if(!$data){
+ $new_data = [
+ 'buy_num'=>1,
+ 'buy_cash'=>$n_cash
+ ];
+ $redis->set($redis_key,$new_data,$remainingSeconds);
+ }else{
+ $new_num = $data['buy_num']+1;
+ $new_total_cash = $data['buy_cash']+$n_cash;
- $tempNum=2;
- while($tempNum>0){
- $msg = $this->tradeUpdate("该订单买家今日采购了 {$count} 笔,超过限制 {$array['limitbuy_num']} ,停止发货--REAPI 系统自动化",5);
+ if(isset($array['limitbuy_num'])){
+ if($data['buy_num']>=$array['limitbuy_num']){
+ $tempNum=2;
+ while($tempNum>0){
+ $msg = $this->tradeUpdate("该订单买家今日已采购了 {$data['buy_num']} 笔,本笔超过限制 每天 限制{$array['limitbuy_num']} ,停止发货--REAPI 系统自动化",5);
+
+ if($msg=='error'){
+ $tempNum--;
+ }else{
+ $tempNum=0;
+ }
+ }
+
+ if($is_coop){
+ $this->noTB('0503', 'submit_coop' ,$this->input['order']);
+ }
+
+
+ $this->noTB('0503', 'submit' ,$this->input['order']);
- if($msg=='error'){
- $tempNum--;
}else{
- $tempNum=0;
+ $new_data = [
+ 'buy_num'=>$new_num,
+ 'buy_cash'=>$new_total_cash
+ ];
+ $redis->set($redis_key,$new_data,$remainingSeconds);
}
}
- if($is_coop){
- $this->noTB('0503', 'submit_coop' ,$this->input['order']);
- }
+ if(isset($array['limitbuy_amount'])){
+
+ if($new_total_cash>$array['limitbuy_amount']){
+ $tempNum=2;
+ while($tempNum>0){
+ $msg = $this->tradeUpdate("该订单因为同账号累计金额为{$new_total_cash},超过每天限制{$array['limitbuy_amount']},停止发货--REAPI 系统自动化",5);
+
+ if($msg=='error'){
+ $tempNum--;
+ }else{
+ $tempNum=0;
+ }
+ }
+
+ if($is_coop){
+ $this->noTB('0503', 'submit_coop' ,$this->input['order']);
+ }
- $this->noTB('0503', 'submit' ,$this->input['order']);
- }
- }
+ $this->noTB('0503', 'submit' ,$this->input['order']);
- if(isset($array['limitbuy_amount'])){
- $cash = OrderService::instance()->db()->where(['status'=>'2','mid'=>$this->mid])->whereBetween('create_at',[date('Y-m-d 00:00:00',time()),date('Y-m-d 23:59:59',time())])->whereLike('param',"%".$By_OpenUid."%")->sum('cash');
- if(!$cash){
- $cash = 0;
- }
- $cash = $cash +$this->input['cash'];
-
-
- if($cash>=$array['limitbuy_amount']){
-
- $tempNum=2;
- while($tempNum>0){
- $msg = $this->tradeUpdate("该订单因为同IP累计金额为{$cash},超过限制{$array['limitbuy_amount']},停止发货--REAPI 系统自动化",5);
-
- if($msg=='error'){
- $tempNum--;
}else{
- $tempNum=0;
+ $new_data = [
+ 'buy_num'=>$new_num,
+ 'buy_cash'=>$new_total_cash
+ ];
+ $redis->set($redis_key,$new_data,$remainingSeconds);
}
}
-
- if($is_coop){
- $this->noTB('0503', 'submit_coop' ,$this->input['order']);
- }
-
-
- $this->noTB('0503', 'submit' ,$this->input['order']);
}
}
-
-
}
+ #查询 param 中json数据 By_OpenUid 出现次数counO create_at data(Y-
+// $count = OrderService::instance()->db()->where(['status'=>'2','mid'=>$this->mid])->whereBetween('create_at',[date('Y-m-d 00:00:00',time()),date('Y-m-d 23:59:59',time())])->whereLike('param',"%".$By_OpenUid."%")->count();
+// if(isset($array['limitbuy_num'])){
+//
+// if($count>=$array['limitbuy_num']){
+//
+// $tempNum=2;
+// while($tempNum>0){
+// $msg = $this->tradeUpdate("该订单买家今日采购了 {$count} 笔,超过限制 {$array['limitbuy_num']} ,停止发货--REAPI 系统自动化",5);
+//
+// if($msg=='error'){
+// $tempNum--;
+// }else{
+// $tempNum=0;
+// }
+// }
+//
+// if($is_coop){
+// $this->noTB('0503', 'submit_coop' ,$this->input['order']);
+// }
+//
+//
+// $this->noTB('0503', 'submit' ,$this->input['order']);
+// }
+// }
+//
+// if(isset($array['limitbuy_amount'])){
+// $cash = OrderService::instance()->db()->where(['status'=>'2','mid'=>$this->mid])->whereBetween('create_at',[date('Y-m-d 00:00:00',time()),date('Y-m-d 23:59:59',time())])->whereLike('param',"%".$By_OpenUid."%")->sum('cash');
+// if(!$cash){
+// $cash = 0;
+// }
+// $cash = $cash +$this->input['cash'];
+//
+//
+// if($cash>=$array['limitbuy_amount']){
+//
+// $tempNum=2;
+// while($tempNum>0){
+// $msg = $this->tradeUpdate("该订单因为同IP累计金额为{$cash},超过限制{$array['limitbuy_amount']},停止发货--REAPI 系统自动化",5);
+//
+// if($msg=='error'){
+// $tempNum--;
+// }else{
+// $tempNum=0;
+// }
+// }
+//
+// if($is_coop){
+// $this->noTB('0503', 'submit_coop' ,$this->input['order']);
+// }
+//
+//
+// $this->noTB('0503', 'submit' ,$this->input['order']);
+// }
+// }
+//
+//
+// }
+
}
@@ -625,10 +707,10 @@ class Coretb extends Controller
{
$orderService = OrderService::instance();
$order = $orderService->get($order_id, $merchant_order_id, $this->mid);
- if (!$order) {
- $orderLastweekHistoryService = OrderLastweekHistoryService::instance();
- $order = $orderLastweekHistoryService->get($order_id, $merchant_order_id, $this->mid);
- }
+// if (!$order) {
+// $orderLastweekHistoryService = OrderLastweekHistoryService::instance();
+// $order = $orderLastweekHistoryService->get($order_id, $merchant_order_id, $this->mid);
+// }
// if (!$order) {
// $orderLastHistoryService = OrderLastHistoryService::instance();
// $order = $orderLastHistoryService->get($order_id, $merchant_order_id, $this->mid);
diff --git a/app/openapi/controller/maSuDaApi/App.php b/app/openapi/controller/maSuDaApi/App.php
index 124b356..43d9fbe 100644
--- a/app/openapi/controller/maSuDaApi/App.php
+++ b/app/openapi/controller/maSuDaApi/App.php
@@ -23,10 +23,27 @@ use app\channel\service\ProductService as CProductService;
class App extends Controller
{
- # 是否检测数据
-// protected bool $check = false;
protected $merchant_id;
+ protected string $host_url = 'https://supplier-api.wanmahui.com/api/openplatform/gateway';
+
+ # code码定义
+ protected $code = array
+ (
+ # 成功
+ 1 => 'ok',
+ # 小于0为失败
+ 0 => '暂时未处理',
+
+ 1100 => '商品不存在',
+
+
+ );
+
+ protected string $uid = '';
+ protected string $secretKey = '';
+
+
# code码定义
# 查询接口 一般用于查询数据,同步执行
diff --git a/app/private_api/controller/monitorApi/Channel.php b/app/private_api/controller/monitorApi/Channel.php
new file mode 100644
index 0000000..2c60ffe
--- /dev/null
+++ b/app/private_api/controller/monitorApi/Channel.php
@@ -0,0 +1,86 @@
+getAll();
+
+ $where['is_deleted'] = 0;
+ $where['status'] = 1;
+ $data = MerchantService::instance()->db()->field('name,account_surplus,credit_surplus,appid')->where($where)->select()->toArray();
+ $this->yes($data);
+
+ }
+
+ protected function maketime($v): float|false|int|string
+ {
+ if (!$v) {
+ return '';
+ }
+
+ if (is_numeric($v)) {
+ return $v;
+ }
+
+ if (is_array($v)) {
+ $v = $v[1];
+ }
+
+ if (strstr($v, ' ')) {
+ $t = explode(' ', $v);
+ $v = $t[0];
+ $s = explode(':', $t[1]);
+ } else {
+ $s = array(0, 0, 0);
+ }
+
+ if (!isset($s[1])) {
+ $s[1] = 0;
+ }
+
+ if (!isset($s[2])) {
+ $s[2] = 0;
+ }
+
+ if (strstr($v, '-')) {
+ $t = explode('-', $v);
+ } elseif (strstr($v, '/')) {
+ $u = explode('/', $v);
+ $t[0] = $u[2];
+ $t[1] = $u[0];
+ $t[2] = $u[1];
+ }
+
+ if (!isset($t)) {
+ $t = array(0, 0, 0);
+ }
+
+ if (!isset($t[1])) {
+ $t[1] = 0;
+ }
+
+ if (!isset($t[2])) {
+ $t[2] = 0;
+ }
+
+ $v = mktime($s[0], $s[1], $s[2], $t[1], $t[2], $t[0]);
+
+ return $v;
+ }
+
+}
\ No newline at end of file
diff --git a/app/queue/command/feedov/FeedovHfAuto.php b/app/queue/command/feedov/FeedovHfAuto.php
index a89d4e2..8e42f0b 100644
--- a/app/queue/command/feedov/FeedovHfAuto.php
+++ b/app/queue/command/feedov/FeedovHfAuto.php
@@ -48,11 +48,11 @@ class FeedovHfAuto extends Command
$this->redis = RedisService::getInstance();
- $account_data = $channelService->call('account', 13, '');
+ $account_data = $channelService->call('account', 23, '');
$balance = $account_data['account'];
- $redis_balance = $this->redis->get('channel_account-13');
- if(!$this->redis->get('channel_account-13')){
- $this->redis->set('channel_account-13',$balance,24*60*60);
+ $redis_balance = $this->redis->get('channel_account-23');
+ if(!$this->redis->get('channel_account-23')){
+ $this->redis->set('channel_account-23',$balance,24*60*60);
$stock = intval(bcdiv($balance, '1.002', 3)); // 第三个参数是保留的小数位数,可根据需要调整
$need_update = true;
diff --git a/app/queue/command/kami91order/KamiOrderChanelNotify.php b/app/queue/command/kami91order/KamiOrderChanelNotify.php
index 4422310..94b5848 100644
--- a/app/queue/command/kami91order/KamiOrderChanelNotify.php
+++ b/app/queue/command/kami91order/KamiOrderChanelNotify.php
@@ -64,8 +64,6 @@ class KamiOrderChanelNotify extends Command
$getMerchantInfo = $MerchantService->get($vo['mid']);
if($info['status'] == 4){
-
-
if( $vo['status'] == 7){
$request_data = [];
if(empty($info['cardno'])){
@@ -90,8 +88,6 @@ class KamiOrderChanelNotify extends Command
$result = $kami91server->up($where,$kami);
-
-
}elseif(isset($vo['channel_callback_msg']) && str_contains($vo['channel_callback_msg'], "kami")){
$msg = json_decode($vo['channel_callback_msg'],true);
$cardno = $msg['kami']['cardno'];
@@ -112,8 +108,6 @@ class KamiOrderChanelNotify extends Command
$result =$kami91server->up($where,$kami);
-
-
}
---|