Browse Source

去掉TODO及1分测试

master
李可松 4 years ago
parent
commit
9b4db28075
  1. 1
      app/Http/Controllers/Api/AgentProductController.php
  2. 2
      app/Http/Controllers/Api/OrderController.php
  3. 2
      app/Http/Controllers/Api/SharePayController.php

1
app/Http/Controllers/Api/AgentProductController.php

@ -58,7 +58,6 @@ class AgentProductController extends Controller
{
$id = (int)request()->input('id');
// TODO 优惠券查询待优化
if (AgentProduct::withTrashed()->where('agent_id', $this->agent_id)->count() === 0) { //演示产品用
$where = ['id' => $id, 'status' => ProductStatus::ON_SALE];
} else {

2
app/Http/Controllers/Api/OrderController.php

@ -322,7 +322,7 @@ class OrderController extends Controller
'info' => $order_info,
]);
//存入订单产品表,TODO 此处不考虑组合产品
//存入订单产品表
OrderProductItem::insert([
'order_id' => $order->id,
'agent_id' => $this->agent_id,

2
app/Http/Controllers/Api/SharePayController.php

@ -76,7 +76,7 @@ class SharePayController extends Controller
$result = $app->order->unify([
'body' => mb_strcut($order->title, 0, 127),
'out_trade_no' => $order->order_no . '-' . $order->status, //后面加status,主要是为了方便微信支付回调时区分定金(首付款)和尾款支付
'total_fee' => 1, //TODO 测试专用 round($price * 100), //支付金额单位为分
'total_fee' => round($price * 100), //支付金额单位为分
'notify_url' => route('wxpay_notify', ['agent_id' => $this->agent_id]), // 支付结果通知网址,如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI',
'openid' => $openid,

Loading…
Cancel
Save