diff --git a/addon/fenxiao/api/controller/Order.php b/addon/fenxiao/api/controller/Order.php index 23280b4..6059eb0 100644 --- a/addon/fenxiao/api/controller/Order.php +++ b/addon/fenxiao/api/controller/Order.php @@ -115,49 +115,49 @@ class Order extends BaseApi return $this->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', [])); - } + // 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/model/FenxiaoOrder.php b/addon/fenxiao/model/FenxiaoOrder.php index 443bb1a..5e40fd3 100644 --- a/addon/fenxiao/model/FenxiaoOrder.php +++ b/addon/fenxiao/model/FenxiaoOrder.php @@ -47,8 +47,8 @@ class FenxiaoOrder extends BaseModel foreach ($fenxiao as $fenxiao_id => $item) { $fenxiao_agent_level = Db::name('fenxiao_agent_level')->where('level_id', '=', $item['agent_level_id'])->field('type,flower_multiple,status')->find(); $where = [ - // ['fo.create_time', 'BETWEEN', [$begin_time, $end_time]], - ['fo.create_time', 'BETWEEN', [$beginThismonth, $endThismonth]], + ['fo.create_time', 'BETWEEN', [$begin_time, $end_time]], + // ['fo.create_time', 'BETWEEN', [$beginThismonth, $endThismonth]], ['o.'.$fenxiao_agent_level['type'].'_id', '=', $item[$fenxiao_agent_level['type'].'_id']] ]; $fenxia_area_order_info = Db::name('fenxiao_order')