From d5861347f1a8d04d7601083745ca7eb3da5aa660 Mon Sep 17 00:00:00 2001 From: "zoomtk@126.com" Date: Fri, 7 Apr 2023 17:14:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addon/fenxiao/api/controller/Account.php | 6 +- addon/fenxiao/api/controller/Apply.php | 83 +- addon/fenxiao/api/controller/Config.php | 6 +- addon/fenxiao/api/controller/Fenxiao.php | 71 +- addon/fenxiao/api/controller/Goods.php | 20 +- addon/fenxiao/api/controller/Goodscollect.php | 6 +- addon/fenxiao/api/controller/Level.php | 6 +- addon/fenxiao/api/controller/Order.php | 54 +- addon/fenxiao/api/controller/Withdraw.php | 6 +- .../component/view/goods_list/design.html | 3 +- addon/fenxiao/config/diy_view.php | 54 +- addon/fenxiao/config/event.php | 9 +- addon/fenxiao/config/info.php | 10 +- addon/fenxiao/config/menu_shop.php | 548 ++++++------- addon/fenxiao/event/AddSiteDiyView.php | 6 +- addon/fenxiao/event/AddSiteFenxiaoLevel.php | 6 +- addon/fenxiao/event/AddStat.php | 6 +- addon/fenxiao/event/AlterShareRelation.php | 6 +- addon/fenxiao/event/AutoAreaMonthlyReward.php | 23 - addon/fenxiao/event/DaySettlement.php | 30 - addon/fenxiao/event/FenxiaoUpgrade.php | 6 +- addon/fenxiao/event/GoodsListCategoryIds.php | 6 +- addon/fenxiao/event/GoodsListPromotion.php | 6 +- addon/fenxiao/event/Install.php | 6 +- addon/fenxiao/event/MemberAccountFromType.php | 6 +- addon/fenxiao/event/MemberCancel.php | 9 +- addon/fenxiao/event/MemberRegister.php | 6 +- addon/fenxiao/event/OrderComplete.php | 6 +- addon/fenxiao/event/OrderCreate.php | 6 +- addon/fenxiao/event/OrderGoodsRefund.php | 8 +- addon/fenxiao/event/OrderPay.php | 9 +- addon/fenxiao/event/OrderSettlement.php | 6 +- addon/fenxiao/event/PresaleOrderCreate.php | 6 +- addon/fenxiao/event/PromotionType.php | 6 +- addon/fenxiao/event/ShowPromotion.php | 6 +- addon/fenxiao/event/UnInstall.php | 6 +- addon/fenxiao/event/WchatShareConfig.php | 6 +- addon/fenxiao/event/WchatShareData.php | 6 +- addon/fenxiao/event/WeappShareConfig.php | 6 +- addon/fenxiao/event/WeappShareData.php | 6 +- addon/fenxiao/model/Ageen.php | 125 --- addon/fenxiao/model/AgeenLevel.php | 140 ---- addon/fenxiao/model/Config.php | 213 +++-- addon/fenxiao/model/Fenxiao.php | 146 ++-- addon/fenxiao/model/FenxiaoAccount.php | 56 +- addon/fenxiao/model/FenxiaoApply.php | 300 ++----- addon/fenxiao/model/FenxiaoData.php | 30 +- addon/fenxiao/model/FenxiaoGoods.php | 6 +- addon/fenxiao/model/FenxiaoGoodsCollect.php | 6 +- addon/fenxiao/model/FenxiaoGoodsSku.php | 9 +- addon/fenxiao/model/FenxiaoLevel.php | 6 +- addon/fenxiao/model/FenxiaoOrder.php | 207 +---- addon/fenxiao/model/FenxiaoStat.php | 6 +- addon/fenxiao/model/FenxiaoWithdraw.php | 299 +++---- addon/fenxiao/model/Poster.php | 19 +- addon/fenxiao/model/PosterTemplate.php | 6 +- addon/fenxiao/model/share/WchatShare.php | 6 +- addon/fenxiao/model/share/WeappShare.php | 6 +- addon/fenxiao/shop/controller/Agentlevel.php | 97 --- addon/fenxiao/shop/controller/Area.php | 160 ---- addon/fenxiao/shop/controller/Config.php | 33 +- addon/fenxiao/shop/controller/Fenxiao.php | 172 +--- addon/fenxiao/shop/controller/Goods.php | 8 +- addon/fenxiao/shop/controller/Level.php | 10 +- addon/fenxiao/shop/controller/Market.php | 6 +- addon/fenxiao/shop/controller/Order.php | 8 +- .../shop/controller/Postertemplate.php | 19 +- addon/fenxiao/shop/controller/Withdraw.php | 6 +- addon/fenxiao/shop/view/agentlevel/add.html | 135 ---- addon/fenxiao/shop/view/agentlevel/edit.html | 113 --- addon/fenxiao/shop/view/agentlevel/lists.html | 212 ----- addon/fenxiao/shop/view/area/add.html | 207 ----- addon/fenxiao/shop/view/area/lists.html | 285 ------- addon/fenxiao/shop/view/config/agreement.html | 132 ++-- addon/fenxiao/shop/view/config/basics.html | 191 +---- .../shop/view/config/promote_rule.html | 14 +- .../fenxiao/shop/view/config/settlement.html | 29 +- addon/fenxiao/shop/view/config/words.html | 3 - addon/fenxiao/shop/view/fenxiao/account.html | 207 ----- addon/fenxiao/shop/view/fenxiao/add.html | 5 - addon/fenxiao/shop/view/fenxiao/change.html | 6 +- .../shop/view/fenxiao/change_level.html | 24 +- .../shop/view/fenxiao/fenxiao_account.html | 46 +- .../shop/view/fenxiao/fenxiao_detail.html | 201 +++-- .../shop/view/fenxiao/fenxiao_team.html | 16 +- addon/fenxiao/shop/view/fenxiao/index.html | 113 ++- addon/fenxiao/shop/view/fenxiao/lists.html | 143 +--- .../shop/view/fenxiao/order_lists.html | 39 +- .../shop/view/fenxiao/upgrade_apply.html | 198 ----- addon/fenxiao/shop/view/goods/config.html | 2 +- addon/fenxiao/shop/view/goods/detail.html | 3 - addon/fenxiao/shop/view/goods/lists.html | 10 - addon/fenxiao/shop/view/level/add.html | 40 +- addon/fenxiao/shop/view/level/edit.html | 40 +- addon/fenxiao/shop/view/level/lists.html | 2 - addon/fenxiao/shop/view/order/detail.html | 4 +- addon/fenxiao/shop/view/order/lists.html | 17 - .../shop/view/public/css/order_list.css | 8 +- addon/fenxiao/shop/view/withdraw/lists.html | 1 - addon/futures/api/controller/Futures.php | 77 +- addon/futures/api/controller/Ordercreate.php | 6 + addon/futures/config/event.php | 5 - addon/futures/event/OrderPay.php | 18 +- addon/futures/model/Futures.php | 35 +- addon/futures/model/User.php | 34 +- .../model/order/FuturesOrderCreate.php | 121 +-- addon/futures/shop/controller/User.php | 1 - addon/futures/shop/view/config/basics.html | 61 +- addon/futures/shop/view/user/index.html | 4 +- app/api/controller/Diyview.php | 24 +- app/api/controller/Member.php | 47 +- app/api/controller/Memberaccount.php | 4 + app/api/controller/Order.php | 1 + app/model/member/MemberAccount.php | 9 +- app/model/message/Message.php | 28 +- app/model/system/Pay.php | 4 - app/pay/controller/Test.php | 6 + app/shop/controller/Message.php | 12 +- app/shop/controller/Order.php | 7 +- app/shop/view/base/style2.html | 2 +- app/shop/view/user/user_list.html | 15 +- config/menu_shop.php | 742 +++++++++--------- 122 files changed, 2014 insertions(+), 4887 deletions(-) delete mode 100644 addon/fenxiao/event/AutoAreaMonthlyReward.php delete mode 100644 addon/fenxiao/event/DaySettlement.php delete mode 100644 addon/fenxiao/model/Ageen.php delete mode 100644 addon/fenxiao/model/AgeenLevel.php delete mode 100644 addon/fenxiao/shop/controller/Agentlevel.php delete mode 100644 addon/fenxiao/shop/controller/Area.php delete mode 100644 addon/fenxiao/shop/view/agentlevel/add.html delete mode 100644 addon/fenxiao/shop/view/agentlevel/edit.html delete mode 100644 addon/fenxiao/shop/view/agentlevel/lists.html delete mode 100644 addon/fenxiao/shop/view/area/add.html delete mode 100644 addon/fenxiao/shop/view/area/lists.html delete mode 100644 addon/fenxiao/shop/view/fenxiao/account.html delete mode 100644 addon/fenxiao/shop/view/fenxiao/upgrade_apply.html diff --git a/addon/fenxiao/api/controller/Account.php b/addon/fenxiao/api/controller/Account.php index def55362..2b86bc9b 100644 --- a/addon/fenxiao/api/controller/Account.php +++ b/addon/fenxiao/api/controller/Account.php @@ -1,10 +1,10 @@ checkToken(); - if ($token['code'] < 0) return $this->response($token); + if ($token[ 'code' ] < 0) return $this->response($token); - $fenxiao_name = isset($this->params['fenxiao_name']) ? $this->params['fenxiao_name'] : '';//分销商名称 + $fenxiao_name = isset($this->params[ 'fenxiao_name' ]) ? $this->params[ 'fenxiao_name' ] : '';//分销商名称 if (empty($fenxiao_name)) { return $this->response($this->error('', 'REQUEST_FENXIAO_NAME')); } $apply_model = new FenxiaoApply(); - $res = $apply_model->existFenxiaoName($fenxiao_name, $this->site_id); + $res = $apply_model->existFenxiaoName($fenxiao_name, $this->site_id); return $this->response($res); } @@ -46,17 +45,17 @@ class Apply extends BaseApi public function applyFenxiao() { $token = $this->checkToken(); - if ($token['code'] < 0) return $this->response($token); + if ($token[ 'code' ] < 0) return $this->response($token); - $fenxiao_name = isset($this->params['fenxiao_name']) ? $this->params['fenxiao_name'] : '';//分销商名称 - $mobile = isset($this->params['mobile']) ? $this->params['mobile'] : '';//联系电话 - $fenxiao_condition = isset($this->params['fenxiao_condition']) ? $this->params['fenxiao_condition'] : 0;//申请是否无条件 - - $config = new Config(); - $basics_config = $config->getFenxiaoBasicsConfig($this->site_id)['data']['value']; - if (!$basics_config['level']) return $this->response($this->error('', '未开启分销功能')); - - if($basics_config['is_apply'] == 1){ + $fenxiao_name = isset($this->params[ 'fenxiao_name' ]) ? $this->params[ 'fenxiao_name' ] : $this->params['username'];//分销商名称 + $mobile = isset($this->params[ 'mobile' ]) ? $this->params[ 'mobile' ] : '';//联系电话 + $id_card = isset($this->params[ 'id_card' ]) ? $this->params[ 'id_card' ] : ''; + $id_card_front = isset($this->params[ 'id_card_front' ]) ? $this->params[ 'id_card_front'] : ''; + $id_card_reverse = isset($this->params[ 'id_card_reverse' ]) ? $this->params[ 'id_card_reverse' ] : ''; + $config = new Config(); + $basics_config = $config->getFenxiaoBasicsConfig($this->site_id)[ 'data' ][ 'value' ]; + if (!$basics_config[ 'level' ]) return $this->response($this->error('', '未开启分销功能')); + if ($basics_config[ 'is_apply' ] == 1) { if (empty($fenxiao_name)) { return $this->response($this->error('', 'REQUEST_FENXIAO_NAME')); } @@ -64,10 +63,10 @@ class Apply extends BaseApi return $this->response($this->error('', 'REQUEST_MOBILE')); } $apply_model = new FenxiaoApply(); - $res = $apply_model->applyFenxiao($this->member_id, $this->site_id, $fenxiao_name, $mobile); - } else if ($basics_config['is_apply'] == 0) { + $res = $apply_model->applyFenxiao($this->member_id, $this->site_id, $fenxiao_name, $mobile,$id_card,$id_card_front,$id_card_reverse); + } else if ($basics_config[ 'is_apply' ] == 0) { $apply_model = new Fenxiao(); - $res = $apply_model->autoBecomeFenxiao($this->member_id, $this->site_id); + $res = $apply_model->autoBecomeFenxiao($this->member_id, $this->site_id); } else { return $this->response($this->error('', '未开启分销商申请')); } @@ -78,10 +77,10 @@ class Apply extends BaseApi public function info() { $token = $this->checkToken(); - if ($token['code'] < 0) return $this->response($token); + if ($token[ 'code' ] < 0) return $this->response($token); $apply_model = new Fenxiao(); - $apply_model->getFenxiaoInfo([['member_id', '=', $this->member_id]], 'apply_id,fenxiao_name,parent,member_id,mobile,nickname,headimg,level_id,level_name,status'); + $apply_model->getFenxiaoInfo([ [ 'member_id', '=', $this->member_id ] ], 'apply_id,fenxiao_name,parent,member_id,mobile,nickname,headimg,level_id,level_name,status'); } /** @@ -91,47 +90,11 @@ class Apply extends BaseApi public function status() { $token = $this->checkToken(); - if ($token['code'] < 0) return $this->response($token); + if ($token[ 'code' ] < 0) return $this->response($token); $apply_model = new FenxiaoApply(); - $res = $apply_model->getFenxiaoApplyInfo([['member_id', '=', $this->member_id]], 'status'); + $res = $apply_model->getFenxiaoApplyInfo([ [ 'member_id', '=', $this->member_id ] ], 'status'); return $this->response($res); } - /** - * Common: 用户代理申请基本信息获取 - * Author: wu-hui - * Time: 2023/02/27 10:35 - * @return false|string - */ - public function upgradeBase(){ - // 用户登录 - $token = $this->checkToken(); - if ($token['code'] < 0) return $this->response($token); - // 获取设置信息 - $config = (new Config())->getFenxiaoBasicsConfig($this->site_id)['data']; - $data['upgrade_agree'] = $config['value']['upgrade_agree'] ?? ''; - // 获取申请信息 - $field = "username,phone,id_card,id_card_front,id_card_reverse,status,reject_cause"; - $data['info'] = (new FenxiaoApply())->getFenXiaoUpgradeApplyInfo([['member_id','=',$this->member_id]],$field)['data']; - - - return $this->response($this->success($data)); - } - /** - * Common: 代理申请信息 - * Author: wu-hui - * Time: 2023/02/27 10:31 - * @return false|string - */ - public function upgradeApply(){ - // 用户登录 - $token = $this->checkToken(); - if ($token['code'] < 0) return $this->response($token); - $this->params['member_id'] = $token['data']['member_id']; - - return $this->response((new FenxiaoApply())->upgradeApply($this->params)); - } - - } \ No newline at end of file diff --git a/addon/fenxiao/api/controller/Config.php b/addon/fenxiao/api/controller/Config.php index aec9d162..f82e16ab 100644 --- a/addon/fenxiao/api/controller/Config.php +++ b/addon/fenxiao/api/controller/Config.php @@ -1,10 +1,10 @@ 0){ - $parentLevelNum = Db::name('fenxiao_level')->where('level_id',$info['data']['parent_level_id'])->value('level_num'); - if($parentLevelNum == 1) $info['data']['is_apply_upgrade'] = 1; - } - - - } - - $futures_user_info = model('futures_user')->getInfo([['member_id', '=', $this->member_id]]); - - if(empty($futures_user_info)){ - $data['member_id'] = $this->member_id; - $data['site_id'] = $this->site_id; - $data['created_time'] = time(); - model('futures_user')->add($data); - $futures_user_info = model('futures_user')->getInfo([['member_id', '=', $this->member_id]]); } return $this->response($info); } @@ -169,21 +148,16 @@ class Fenxiao extends BaseApi { $token = $this->checkToken(); if ($token[ 'code' ] < 0) return $this->response($token); - $qrcode_param = isset($this->params[ 'qrcode_param' ]) ? $this->params[ 'qrcode_param' ] : '';//二维码 - if (empty($qrcode_param)) { return $this->response($this->error('', 'REQUEST_QRCODE_PARAM')); } - $qrcode_param = json_decode($qrcode_param, true); $qrcode_param[ 'source_member' ] = $this->member_id; - $poster = new Poster(); $param = $this->params; $param[ 'qrcode_param' ] = $qrcode_param; $res = $poster->getFenxiaoPoster($param); - return $this->response($res); } @@ -217,7 +191,7 @@ class Fenxiao extends BaseApi $page = $this->params[ 'page' ] ?? 1; $page_size = $this->params[ 'page_size' ] ?? PAGE_LIST_ROWS; $level = $this->params[ 'level' ] ?? 1; - $is_pay = $this->params['is_pay'] ?? 0; + $is_pay = $this->params[ 'is_pay' ] ?? 0; $model = new FenxiaoModel(); $fenxiao_info = $model->getFenxiaoInfo([ [ 'member_id', '=', $this->member_id ] ], 'fenxiao_id'); @@ -303,7 +277,8 @@ class Fenxiao extends BaseApi /** * 排行榜 */ - public function rankingList(){ + public function rankingList() + { $token = $this->checkToken(); if ($token[ 'code' ] < 0) return $this->response($token); @@ -314,14 +289,14 @@ class Fenxiao extends BaseApi $model = new FenxiaoModel(); $condition = [ - ['f.site_id', '=', $this->site_id], - ['f.is_delete', '=', 0] + [ 'f.site_id', '=', $this->site_id ], + [ 'f.is_delete', '=', 0 ] ]; $order = $type == 'profit' ? 'f.total_commission desc' : Db::raw('(f.one_child_num + f.one_child_fenxiao_num) desc'); $field = 'f.total_commission, (f.one_child_num + f.one_child_fenxiao_num) as child_num, m.nickname,m.headimg'; - $data = $model->getFenxiaoPageLists($condition, $page, $page_size, $order, $field, 'f', [ ['member m', 'm.member_id = f.member_id', 'inner'] ]); + $data = $model->getFenxiaoPageLists($condition, $page, $page_size, $order, $field, 'f', [ [ 'member m', 'm.member_id = f.member_id', 'inner' ] ]); return $this->response($data); } @@ -343,14 +318,15 @@ class Fenxiao extends BaseApi $order = $type == 'profit' ? 'total_commission' : '(one_child_num + one_child_fenxiao_num)'; - $data = $model->getFenxiaoRanking($this->site_id, $fenxiao_info['fenxiao_id'], $order); + $data = $model->getFenxiaoRanking($this->site_id, $fenxiao_info[ 'fenxiao_id' ], $order); return $this->response($data); } /** * 子级分销商 */ - public function childFenxiao(){ + public function childFenxiao() + { $token = $this->checkToken(); if ($token[ 'code' ] < 0) return $this->response($token); @@ -361,20 +337,29 @@ class Fenxiao extends BaseApi $fenxiao_info = $model->getFenxiaoInfo([ [ 'member_id', '=', $this->member_id ] ], 'fenxiao_id')[ 'data' ]; if (empty($fenxiao_info)) return $this->response($this->error('', 'MEMBER_NOT_IS_FENXIAO')); + $parent_fenxiao_id = [ $fenxiao_info[ 'fenxiao_id' ] ]; // 上级分销商id集合 + + // 查询分销基础配置 $config_model = new Config(); $fenxiao_basic_config = $config_model->getFenxiaoBasicsConfig($this->site_id)[ 'data' ][ 'value' ]; $level = $fenxiao_basic_config[ 'level' ]; - $self_purchase_rebate = $fenxiao_basic_config['self_purchase_rebate']; - if ($level == 1 && $self_purchase_rebate) return $this->response($this->success([ 'page_count' => 1, 'count' => 0, 'list' => [] ])); + if ($level == 2) { + + // 二级分销商id集合 + $one_level_fenxiao = model('fenxiao')->getColumn([ [ 'parent', '=', $fenxiao_info[ 'fenxiao_id' ] ] ], 'fenxiao_id'); + if (!empty($one_level_fenxiao)) { + $parent_fenxiao_id = array_merge($parent_fenxiao_id, $one_level_fenxiao); + } + } $condition = [ - ['f.site_id', '=', $this->site_id ], - ['f.parent', '=', $fenxiao_info['fenxiao_id'] ], - ['m.is_delete', '=', 0] + [ 'f.site_id', '=', $this->site_id ], + [ 'f.parent', 'in', $parent_fenxiao_id ], + [ 'm.is_delete', '=', 0 ] ]; - $field = 'm.nickname,m.headimg,m.member_id,m.order_num,m.order_money,f.audit_time,f.level_name,m.is_fenxiao,m.bind_fenxiao_time,f.one_child_num,f.one_child_fenxiao_num'; - $join = [ ['member m', 'm.member_id = f.member_id', 'inner'] ]; + $field = 'm.nickname,m.headimg,m.member_id,m.order_num,m.order_money,f.fenxiao_id,f.audit_time,f.level_name,m.is_fenxiao,m.bind_fenxiao_time,f.one_child_num,f.one_child_fenxiao_num'; + $join = [ [ 'member m', 'm.member_id = f.member_id', 'inner' ] ]; $res = $model->getFenxiaoPageLists($condition, $page, $page_size, 'f.audit_time desc', $field, 'f', $join); return $this->response($res); diff --git a/addon/fenxiao/api/controller/Goods.php b/addon/fenxiao/api/controller/Goods.php index 58212dd9..3de68383 100644 --- a/addon/fenxiao/api/controller/Goods.php +++ b/addon/fenxiao/api/controller/Goods.php @@ -1,10 +1,10 @@ checkToken(); if ($token[ 'code' ] < 0) return $this->response($token); $sku_id = isset($this->params[ 'sku_id' ]) ? $this->params[ 'sku_id' ] : 0; + if (!empty($id)) { + $sku_id = $id; + } if (empty($sku_id)) { return $this->response($this->error('', 'REQUEST_SKU_ID')); } @@ -52,8 +56,8 @@ class Goods extends BaseApi if (empty($fenxiao_info)) return $this->response($this->error()); $fenxiao_goods_sku_model = new FenxiaoGoodsSkuModel(); - $sku_commission_info = $fenxiao_goods_sku_model->getSkuFenxiaoCommission($sku_id, $fenxiao_info[ 'level_id' ]); - $data[ 'commission_money' ] = $sku_commission_info[ 'data' ]; + $data[ 'commission_money' ] = $fenxiao_goods_sku_model->getSkuFenxiaoCommission($sku_id, $fenxiao_info[ 'level_id' ])[ 'data' ]; + $basics = $config->getFenxiaoBasicsConfig($this->site_id); $data[ 'is_commission_money' ] = $basics[ 'data' ][ 'value' ][ 'is_commission_money' ]; return $this->response($this->success($data)); @@ -131,8 +135,8 @@ class Goods extends BaseApi $fenxiao_model = new FenxiaoModel(); $fenxiao_info = $fenxiao_model->getFenxiaoInfo([ [ 'member_id', '=', $this->member_id ] ], "fenxiao_id,level_id")[ 'data' ]; - $fenxiao_level = new FenxiaoLevel(); - $level_info = $fenxiao_level->getLevelInfo([ [ 'level_id', '=', $fenxiao_info[ 'level_id' ] ] ], 'one_rate')[ 'data' ]; +// $fenxiao_level = new FenxiaoLevel(); +// $level_info = $fenxiao_level->getLevelInfo([ [ 'level_id', '=', $fenxiao_info[ 'level_id' ] ] ], 'one_rate')[ 'data' ]; $fenxiao_goods_sku_model = new FenxiaoGoodsSkuModel(); $list = $fenxiao_goods_sku_model->getFenxiaoGoodsSkuPageList($condition, $page, $page_size, $order_by); diff --git a/addon/fenxiao/api/controller/Goodscollect.php b/addon/fenxiao/api/controller/Goodscollect.php index ae2584aa..c28c835f 100644 --- a/addon/fenxiao/api/controller/Goodscollect.php +++ b/addon/fenxiao/api/controller/Goodscollect.php @@ -1,10 +1,10 @@ response($list); } - public function testDaySettlement(){ - return $this->response(event("DaySettlement")); - } - - public function testAreaMonthlyReward(){ - event("AreaMonthlyReward"); - return $this->response([]); - } - - public function testPointexchangeOrderPayNotify(){ - return $this->response(event("PointexchangeOrderPayNotify",['out_trade_no'=>'16768593884624691000'])); - - $order = new BaseOrder; - - // return $this->response( $order->addOrderLog(["id" => 265, - // "site_id" => 1, - // "out_trade_no" => "16768593884624691000", - // "pay_type" => "POINT", - // "trade_no" => "", - // "pay_no" => "", - // "pay_body" => "测试商品 【商品】", - // "pay_detail" => "测试商品 【商品】", - // "pay_money" => "0.00", - // "pay_addon" => "", - // "pay_voucher" => "", - // "pay_status" => 2, - // "return_url" => "", - // "event" => "PointexchangeOrderPayNotify", - // "mch_info" => "", - // "create_time" => 1676859389, - // "pay_time" => 1676859389, - // "balance" => "0.00", - // "balance_money" => "0.00", - // "member_id" => 0, - // "pay_json" => "", - // "order_id" => 262, - // "action" => "商家对订单进行了线下支付", - // "order_status" => 1, - // "order_status_name" => "待发货"])); - } - - public function testPayType(){ - return $this->response(event('PayType', [])); - } - } \ No newline at end of file diff --git a/addon/fenxiao/api/controller/Withdraw.php b/addon/fenxiao/api/controller/Withdraw.php index 73c1e81f..eef07800 100644 --- a/addon/fenxiao/api/controller/Withdraw.php +++ b/addon/fenxiao/api/controller/Withdraw.php @@ -1,10 +1,10 @@