diff --git a/addon/alipay/config/event.php b/addon/alipay/config/event.php index 591f9848..f8e93cb5 100644 --- a/addon/alipay/config/event.php +++ b/addon/alipay/config/event.php @@ -21,7 +21,7 @@ return [ //支付方式，后台查询 'PayType' => [ 'addon\alipay\event\PayType', - 'addon\alipay\event\ZMPayType' +// 'addon\alipay\event\ZMPayType' ], //支付，前台应用 'Pay' => [ diff --git a/addon/cashier/event/TradePayType.php b/addon/cashier/event/TradePayType.php index 3215ab90..2ff9be19 100644 --- a/addon/cashier/event/TradePayType.php +++ b/addon/cashier/event/TradePayType.php @@ -25,6 +25,7 @@ class TradePayType $info = [ 'cash' => '现金支付', + 'back_transfer' => '银行转账', 'own_wechatpay' => '个人微信', 'own_alipay' => '个人支付宝', 'own_pos' => '个人pos刷卡', diff --git a/addon/fenxiao/model/Poster.php b/addon/fenxiao/model/Poster.php index 004ef0ae..e780b0dc 100644 --- a/addon/fenxiao/model/Poster.php +++ b/addon/fenxiao/model/Poster.php @@ -186,7 +186,7 @@ class Poster extends BaseModel $upload = new Upload($site_id); $cloud_res = $upload->fileCloud($res[ 'data' ][ 'path' ]); if ($cloud_res[ 'code' ] >= 0) { - return $this->success([ "path" => $cloud_res[ 'data' ] ]); + return $this->success([ "path" => $cloud_res[ 'data' ].'?v='.time() ]); } else { return $this->error(); } diff --git a/addon/fenxiao/shop/controller/Fenxiao.php b/addon/fenxiao/shop/controller/Fenxiao.php index 1e9838c9..a8577b69 100644 --- a/addon/fenxiao/shop/controller/Fenxiao.php +++ b/addon/fenxiao/shop/controller/Fenxiao.php @@ -428,11 +428,9 @@ class Fenxiao extends BaseShop { $model = new FenxiaoApply(); if (request()->isAjax()) { - $condition[] = [ 'fa.site_id', '=', $this->site_id ]; $condition[] = [ 'fa.status', '=', 1 ]; $condition[] = [ 'm.is_delete', '=', 0 ]; - $fenxiao_name = input('fenxiao_name', ''); if ($fenxiao_name) { $condition[] = [ 'fenxiao_name', 'like', '%' . $fenxiao_name . '%' ]; @@ -455,11 +453,9 @@ class Fenxiao extends BaseShop $condition[] = [ 'fa.create_time', 'between', [ strtotime($create_start_time), strtotime($create_end_time) ] ]; } elseif (!$create_start_time && $create_end_time) { $condition[] = [ 'fa.create_time', '<=', strtotime($create_end_time) ]; - } elseif ($create_start_time && !$create_end_time) { $condition[] = [ 'fa.create_time', '>=', strtotime($create_start_time) ]; } - $rg_start_time = input('rg_start_time', ''); $rg_end_time = input('rg_end_time', ''); if ($rg_start_time && $rg_end_time) { @@ -470,23 +466,18 @@ class Fenxiao extends BaseShop } elseif ($rg_start_time && !$rg_end_time) { $condition[] = [ 'fa.reg_time', '>=', strtotime($rg_start_time) ]; } - $join = [ [ 'member m', 'fa.member_id = m.member_id', 'inner' ] ]; - $field = 'fa.apply_id,fa.fenxiao_name,fa.parent,fa.member_id,fa.level_id,fa.level_name,fa.order_complete_money,fa.order_complete_num,fa.reg_time,fa.create_time,fa.status,m.mobile,m.nickname,m.headimg'; - + $field = 'fa.apply_id,fa.fenxiao_name,fa.parent,fa.member_id,fa.level_id,fa.level_name,fa.order_complete_money,fa.order_complete_num,fa.reg_time,fa.create_time,fa.status,fa.id_card,fa.id_card_front,fa.id_card_reverse,m.mobile,m.nickname,m.headimg'; $page = input('page', 1); $page_size = input('page_size', PAGE_LIST_ROWS); $list = $model->getFenxiaoApplyPageList($condition, $page, $page_size, 'fa.create_time desc', $field, 'fa', $join); return $list; - } else { - $level_model = new FenxiaoLevelModel(); $level_list = $level_model->getLevelList([ [ 'status', '=', 1 ] ], 'level_id,level_name'); $this->assign('level_list', $level_list[ 'data' ]); - $this->forthMenu(); return $this->fetch('fenxiao/apply'); } @@ -498,7 +489,6 @@ class Fenxiao extends BaseShop public function applyPass() { $apply_id = input('apply_id'); - $model = new FenxiaoApply(); $res = $model->pass($apply_id, $this->site_id); return $res; diff --git a/addon/fenxiao/shop/view/fenxiao/apply.html b/addon/fenxiao/shop/view/fenxiao/apply.html index 111e8113..911262f2 100644 --- a/addon/fenxiao/shop/view/fenxiao/apply.html +++ b/addon/fenxiao/shop/view/fenxiao/apply.html @@ -99,6 +99,22 @@ + + + + {/block} \ No newline at end of file diff --git a/addon/memberrecharge/shop/view/memberrecharge/order_detail.html b/addon/memberrecharge/shop/view/memberrecharge/order_detail.html index dfd22e7f..cb082d2d 100644 --- a/addon/memberrecharge/shop/view/memberrecharge/order_detail.html +++ b/addon/memberrecharge/shop/view/memberrecharge/order_detail.html @@ -17,7 +17,15 @@
- {$info.status == 1 ? '待支付' : '已支付'} + + {if $info.status == 1 && $info.relate_type=='back_transfer' } + 待审核 + {elseif $info.status == 3 && $info.relate_type=='back_transfer'} + 拒绝 + {else/} + {$info.status == 1 ? '待支付' : '已支付'} + {/if} +
@@ -33,6 +41,15 @@ {$info.buy_price}
+ +
+ + {$info.back_transfer} +
+
+ + {$info.remark} +
{$info.point} @@ -67,7 +84,6 @@ {/if}
- {if !empty($info.coupon_list)}
@@ -82,12 +98,66 @@
{/if} +{if $info.status == 1 && $info.relate_type=='back_transfer' } +
+
+
+ 打款信息 +
+
+ +
+ + + +
+
用户入账金额金额,注入实际收到金额一致
+
+ +
+ +
+ {$info.back_transfer} +
+
+ +
+ +
+ {$info.remark} +
+
+ +
+ +
+
+ + +
+
+
+ + + +
+
+ + +
+
+{/if} {/block} + {block name="script"} {/block} \ No newline at end of file diff --git a/addon/memberrecharge/shop/view/public/js/order_list.js b/addon/memberrecharge/shop/view/public/js/order_list.js index 600a8d33..2e907f81 100644 --- a/addon/memberrecharge/shop/view/public/js/order_list.js +++ b/addon/memberrecharge/shop/view/public/js/order_list.js @@ -60,6 +60,9 @@ Order.prototype.cols = [ h += '
'; h += '1件'; h += '
'; + h += '
'; + h += '转账' + order.back_transfer + ''; + h += '
'; h += ''; return h; } @@ -115,7 +118,14 @@ Order.prototype.cols = [ className: "transaction-status", merge: true, template: function (orderitem, order) { - var html = '
' + (order.status == 2 ? '已支付' : '未支付') + '
'; + + if(order.relate_type=='back_transfer'&&order.status == 1){ + var html = '
待审核
'; + }else if(order.relate_type=='back_transfer'&&order.status == 3){ + var html = '
拒绝
'; + }else { + var html = '
' + (order.status == 2 ? '已支付' : '未支付') + '
'; + } return html; } }, diff --git a/app/api/controller/Login.php b/app/api/controller/Login.php index 916a2936..239ecc7b 100644 --- a/app/api/controller/Login.php +++ b/app/api/controller/Login.php @@ -431,11 +431,4 @@ class Login extends BaseApi{ return $this->response($this->error('',$e->getMessage())); } } - - - - - - - } \ No newline at end of file diff --git a/app/api/controller/Member.php b/app/api/controller/Member.php index c328f088..43d906cf 100644 --- a/app/api/controller/Member.php +++ b/app/api/controller/Member.php @@ -165,15 +165,16 @@ class Member extends BaseApi return $this->response($this->error("", "当前手机号已存在")); } else { $code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);// 生成4位随机数，左侧补0 - $code = 6666;// 生成4位随机数，左侧补0 + $message_model = new Message(); -// $res = $message_model->sendMessage([ -// 'type' => 'code', "mobile" => $mobile, -// "site_id" => $this->site_id, "code" => $code, "support_type" => [ "sms" ], -// "keywords" => "MEMBER_BIND" -// ] -// ); - $res['code']=0; + $res = $message_model->sendMessage([ + 'type' => 'code', "mobile" => $mobile, + "site_id" => $this->site_id, "code" => $code, "support_type" => [ "sms" ], + "keywords" => "MEMBER_BIND" + ] + ); + // $code = 6666;// 生成4位随机数，左侧补0 + // $res['code']=0; if ($res[ "code" ] >= 0) { //将验证码存入缓存 $key = 'bind_mobile_code_' . md5(uniqid(null, true)); @@ -201,11 +202,11 @@ class Member extends BaseApi if (empty($info[ 'data' ])) return $this->response($this->error([], '未获取到会员信息！')); if (empty($info[ 'data' ][ 'mobile' ])) return $this->response($this->error([], '会员信息尚未绑定手机号！')); $mobile = $info[ 'data' ][ 'mobile' ]; -// $code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);// 生成4位随机数，左侧补0 -// $message_model = new Message(); -// $res = $message_model->sendMessage([ 'type' => 'code', "mobile" => $mobile, "site_id" => $this->site_id, "code" => $code, "support_type" => [ "sms" ], "keywords" => "SET_PASSWORD" ]); - $res['code']=0; - $code=6666; + $code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);// 生成4位随机数，左侧补0 + $message_model = new Message(); + $res = $message_model->sendMessage([ 'type' => 'code', "mobile" => $mobile, "site_id" => $this->site_id, "code" => $code, "support_type" => [ "sms" ], "keywords" => "SET_PASSWORD" ]); +// $res['code']=0; +// $code=6666; if (isset($res[ "code" ]) && $res[ "code" ] >= 0) { //将验证码存入缓存 $key = 'password_mobile_code_' . md5(uniqid(null, true)); @@ -295,12 +296,11 @@ class Member extends BaseApi { $token = $this->checkToken(); if ($token[ 'code' ] < 0) return $this->response($token); - $code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);// 生成4位随机数，左侧补0 - $code=6666; -// $message_model = new Message(); -// $res = $message_model->sendMessage([ 'type' => 'code', "member_id" => $this->member_id, "site_id" => $this->site_id, "code" => $code, "support_type" => [ "sms" ], "keywords" => "MEMBER_PAY_PASSWORD" ]); - $res['code']=0; + $message_model = new Message(); + $res = $message_model->sendMessage([ 'type' => 'code', "member_id" => $this->member_id, "site_id" => $this->site_id, "code" => $code, "support_type" => [ "sms" ], "keywords" => "MEMBER_PAY_PASSWORD" ]); + // $code=6666; + // $res['code']=0; if ($res[ "code" ] >= 0) { //将验证码存入缓存 $key = 'pay_password_code_' . md5(uniqid(null, true)); @@ -317,7 +317,6 @@ class Member extends BaseApi public function verifypaypwdcode() { $key = isset($this->params[ 'key' ]) ? trim($this->params[ 'key' ]) : ''; - $verify_data = Cache::get($key); if ($verify_data[ "code" ] == $this->params[ "code" ]) { $res = $this->success([]); diff --git a/app/api/controller/Memberwithdraw.php b/app/api/controller/Memberwithdraw.php index b7d760bf..22f59010 100644 --- a/app/api/controller/Memberwithdraw.php +++ b/app/api/controller/Memberwithdraw.php @@ -164,16 +164,16 @@ class Memberwithdraw extends BaseApi if($to_username){ $member_model = new MemberModel(); // 获取接收者信息 - $to_member_info = $member_model->getMemberInfo($to_where, 'member_id,site_id,balance,balance_withdraw_apply,balance_withdraw,nickname,status,pay_password'); + $to_member_info = $member_model->getMemberInfo($to_where, 'member_id,site_id,balance_money,balance_withdraw_apply,balance_withdraw,nickname,status,pay_password'); if(empty($to_member_info['data'])||$to_member_info['data']['status']!=1) return $this->response($this->error('会员账号不存在')); if($this->member_id==$to_member_info['data']['member_id']) return $this->response($this->error('不能转账给自己')); // 获取转让人信息 - $member_info_result = $member_model->getMemberInfo([['member_id', '=', $token['data']['member_id']]], 'balance,username,nickname,status,pay_password'); + $member_info_result = $member_model->getMemberInfo([['member_id', '=', $token['data']['member_id']]], 'balance_money,username,nickname,status,pay_password'); if($member_info_result['data']['pay_password'] == ''){ return $this->response(error(-801,'您未设置支付密码，需设置支付密码后进行转账，点击确定前往支付密码设置')); } if(data_md5($password) != $member_info_result['data']['pay_password']) return $this->response($this->error('支付密码错误')); - if($apply_money>$member_info_result['data']['balance']) return $this->response($this->error('账号余额不足')); + if($apply_money>$member_info_result['data']['balance_money']) return $this->response($this->error('账号余额不足')); if($member_info_result['data']['status']!=1) return $this->response($this->error('未知错误')); $withdraw_model = new WithdrawModel(); diff --git a/app/cron/controller/Task.php b/app/cron/controller/Task.php index a02935b1..ff37f0c2 100644 --- a/app/cron/controller/Task.php +++ b/app/cron/controller/Task.php @@ -43,9 +43,9 @@ class Task extends Controller Cache::set("cron_last_load_time", time()); $cron_model = new \app\model\system\Cron(); $cron_model->execute(); - // sleep(60); - // $url = url('cron/task/execute'); - // http($url, 1); + sleep(60); + $url = url('cron/task/execute'); + http($url, 1); exit(); } diff --git a/app/event.php b/app/event.php index 5e4854c8..6c4c2df1 100644 --- a/app/event.php +++ b/app/event.php @@ -18,12 +18,13 @@ return [ 'AppInit' => [ 'app\event\InitConfig', 'app\event\InitAddon', -// 'app\event\InitCron', ], 'HttpRun' => [ 'app\event\InitRoute', ], - 'HttpEnd' => [], + 'HttpEnd' => [ + 'app\event\InitCron', + ], 'LogLevel' => [], 'LogWrite' => [], diff --git a/app/model/member/MemberAccount.php b/app/model/member/MemberAccount.php index 128c2f7a..e2047b96 100644 --- a/app/model/member/MemberAccount.php +++ b/app/model/member/MemberAccount.php @@ -131,10 +131,13 @@ class MemberAccount extends BaseModel $from_type[ 'point' ][ 'sell' ] = [ 'type_name' => '秒杀赠送积分', 'type_url' => '' ]; - $from_type[ 'balance' ][ 'transfer' ] = [ 'type_name' => '转账', 'type_url' => '' ]; - $from_type[ 'diamond' ]['diamond'] = [ 'type_name' => '赠送猕猴桃', 'type_url' => '' ]; $from_type[ 'balance' ]['diamond'] = [ 'type_name' => '赠送猕猴桃', 'type_url' => '' ]; + $from_type[ 'balance' ]['intdiamond'] = [ 'type_name' => '提前秒杀猕猴桃', 'type_url' => '' ]; + + $from_type[ 'diamond' ]['diamond'] = [ 'type_name' => '赠送猕猴桃', 'type_url' => '' ]; + $from_type[ 'diamond' ]['intdiamond'] = [ 'type_name' => '提前秒杀猕猴桃', 'type_url' => '' ]; + $this->from_type = $from_type; } diff --git a/app/model/member/Withdraw.php b/app/model/member/Withdraw.php index dbbdadae..60dcad6f 100644 --- a/app/model/member/Withdraw.php +++ b/app/model/member/Withdraw.php @@ -211,9 +211,9 @@ class Withdraw extends BaseModel try { //减少可提现余额 $member_account = new MemberAccount(); - $member_account->addMemberAccount($site_id, $member_id, 'balance', -$apply_money, 'transfer', "{$to_member_id}_会员转账", "给会员{$to_member_info['data']['nickname']}转账" . (-$apply_money)); + $member_account->addMemberAccount($site_id, $member_id, 'balance_money', -$apply_money, 'transfer', "{$to_member_id}_会员转账", "给会员{$to_member_info['data']['nickname']}转账" . (-$apply_money)); //增加转账余额 - $account_res = $member_account->addMemberAccount($site_id, $to_member_id, 'balance', $apply_money, 'transfer', "{$member_id}_会员转账", $memberInfo['data']['nickname'] . '转账' . (+$apply_money)); + $account_res = $member_account->addMemberAccount($site_id, $to_member_id, 'balance_money', $apply_money, 'transfer', "{$member_id}_会员转账", $memberInfo['data']['nickname'] . '转账' . (+$apply_money)); if ($account_res['code'] != 0) return $account_res; return $this->success(); } catch (\Exception $e) { diff --git a/app/model/system/SystemConfig.php b/app/model/system/SystemConfig.php index fd9f8d9e..4ef912ca 100644 --- a/app/model/system/SystemConfig.php +++ b/app/model/system/SystemConfig.php @@ -24,7 +24,7 @@ class SystemConfig extends BaseModel * @param $site_id */ public function getSystemConfig($site_id = 0){ - return $this->success(['is_open_queue' => 0]); + return $this->success(['is_open_queue' => 1]); } } \ No newline at end of file diff --git a/app/pay/controller/Test.php b/app/pay/controller/Test.php index d2a2022d..8fc07b29 100644 --- a/app/pay/controller/Test.php +++ b/app/pay/controller/Test.php @@ -16,6 +16,7 @@ use addon\aliapp\model\CloudPay; use addon\aliapp\model\OpenPay; use addon\futures\model\Forder; use app\Controller; +use think\facade\Queue; use think\Validate; use think\facade\Db; use addon\futures\model\User; @@ -24,9 +25,27 @@ class Test extends Controller public function order(){ - $order=model('order')->getInfo(['order_id'=>2]); - $res=event('OrderPay',$order); - var_dump($res); +// $order=model('order')->getInfo(['order_id'=>2]); +// $res=event('OrderPay',$order); +// $order['relate_id']=254; +// $res=event('CronOrderClose',$order); +// var_dump($res); + $params=[ + [ + 'relate_id'=>'264', + 'name'=>'264', + 'event'=>'Cronexecute', + ], + [ + 'name'=>'265', + 'event'=>'Cronexecute', + 'relate_id'=>'265' + ] + ]; + foreach ($params as $item){ + var_dump($item); + Queue::push('Cronexecute', $item); + } } public function s(){ diff --git a/app/shop/controller/Delivery.php b/app/shop/controller/Delivery.php index d81074f7..d1f1e1f3 100644 --- a/app/shop/controller/Delivery.php +++ b/app/shop/controller/Delivery.php @@ -60,6 +60,7 @@ class Delivery extends BaseShop $condition = [ [ 'order_type', '=', 1 ], [ 'site_id', '=', $this->site_id ], + [ "promotion_type", "<>", 'futures'], [ 'is_delete', '=', 0 ] ]; //订单状态 diff --git a/app/shop/controller/Orderimportfile.php b/app/shop/controller/Orderimportfile.php index 4f0b48f0..882b63fc 100644 --- a/app/shop/controller/Orderimportfile.php +++ b/app/shop/controller/Orderimportfile.php @@ -62,6 +62,7 @@ class Orderimportfile extends BaseShop [ 'order_status', 'in', array_keys($order_status_list) ], [ 'order_type', '=', 1 ], [ 'site_id', '=', $this->site_id ], + [ "promotion_type", "<>", 'futures'], [ 'is_delete', '=', 0 ] ];