diff --git a/app/Http/Controllers/Api/AgentProductController.php b/app/Http/Controllers/Api/AgentProductController.php index 300bbcd..68fed42 100644 --- a/app/Http/Controllers/Api/AgentProductController.php +++ b/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 { diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index cc886b5..7bfd176 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/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, diff --git a/app/Http/Controllers/Api/SharePayController.php b/app/Http/Controllers/Api/SharePayController.php index 7c345bf..b83c97f 100644 --- a/app/Http/Controllers/Api/SharePayController.php +++ b/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,