正在显示
3 个修改的文件
包含
6 行增加
和
12 行删除
@@ -137,12 +137,12 @@ class Classification extends Api | @@ -137,12 +137,12 @@ class Classification extends Api | ||
137 | // 如果sku是空数组 为单规格商品 只需要用list的值 | 137 | // 如果sku是空数组 为单规格商品 只需要用list的值 |
138 | "list": [ | 138 | "list": [ |
139 | { | 139 | { |
140 | - "goods_spec_id": 103, | 140 | + "goods_spec_id": 103, // 规格列表id |
141 | "goods_id": 22, | 141 | "goods_id": 22, |
142 | "goods_no": "SNHW001", | 142 | "goods_no": "SNHW001", |
143 | "goods_price": "4499.00", | 143 | "goods_price": "4499.00", |
144 | "line_price": "0.00", | 144 | "line_price": "0.00", |
145 | - "stock_num": 941, 库存 | 145 | + "stock_num": 941, // 库存 |
146 | "goods_sales": 58, | 146 | "goods_sales": 58, |
147 | "goods_weight": 500, | 147 | "goods_weight": 500, |
148 | "spec_sku_id": "44_46", // 搜索字段 组合sku里面的id搜索 从小到大排序 | 148 | "spec_sku_id": "44_46", // 搜索字段 组合sku里面的id搜索 从小到大排序 |
@@ -75,12 +75,12 @@ class Goods extends Api | @@ -75,12 +75,12 @@ class Goods extends Api | ||
75 | // 规格组合完毕的列表 | 75 | // 规格组合完毕的列表 |
76 | "list": [ | 76 | "list": [ |
77 | { | 77 | { |
78 | - "goods_spec_id": 103, | 78 | + "goods_spec_id": 103, // 规格列表id |
79 | "goods_id": 22, | 79 | "goods_id": 22, |
80 | "goods_no": "SNHW001", | 80 | "goods_no": "SNHW001", |
81 | "goods_price": "4499.00", | 81 | "goods_price": "4499.00", |
82 | "line_price": "0.00", | 82 | "line_price": "0.00", |
83 | - "stock_num": 941, | 83 | + "stock_num": 941, // 库存 |
84 | "goods_sales": 58, | 84 | "goods_sales": 58, |
85 | "goods_weight": 500, | 85 | "goods_weight": 500, |
86 | "spec_sku_id": "44_46", // 搜索字段 组合sku里面的id搜索 从小到大排序 | 86 | "spec_sku_id": "44_46", // 搜索字段 组合sku里面的id搜索 从小到大排序 |
@@ -497,7 +497,6 @@ class Order extends Api | @@ -497,7 +497,6 @@ class Order extends Api | ||
497 | * @ApiMethod (POST) | 497 | * @ApiMethod (POST) |
498 | * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") | 498 | * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") |
499 | * @ApiParams (name="id", type="integer", required=true, description="订单ID") | 499 | * @ApiParams (name="id", type="integer", required=true, description="订单ID") |
500 | - * @ApiParams (name="user_id", type="string", required=true, description="代付用户id 默认传0") | ||
501 | * @ApiReturn ({ | 500 | * @ApiReturn ({ |
502 | 'code':'1', | 501 | 'code':'1', |
503 | 'msg':'返回成功' | 502 | 'msg':'返回成功' |
@@ -512,12 +511,7 @@ class Order extends Api | @@ -512,12 +511,7 @@ class Order extends Api | ||
512 | $model = new \app\api\model\Order(); | 511 | $model = new \app\api\model\Order(); |
513 | $order = $model::get($order_id); | 512 | $order = $model::get($order_id); |
514 | if (!$order) $this->error('订单不存在'); | 513 | if (!$order) $this->error('订单不存在'); |
515 | - if ($friend_id){ | ||
516 | - $openid = Third::get(['user_id'=>$friend_id]); | ||
517 | - }else{ | ||
518 | - if ($order['user_id'] != $this->auth->id) $this->error('当前用户不可支付'); | ||
519 | - $openid = Third::get(['user_id'=>$this->auth->id]); | ||
520 | - } | 514 | + $openid = Third::get(['user_id'=>$this->auth->id]); |
521 | if (!$openid) $this->error('未注册用户'); | 515 | if (!$openid) $this->error('未注册用户'); |
522 | $params = [ | 516 | $params = [ |
523 | 'type' => 'wechat', | 517 | 'type' => 'wechat', |
@@ -531,7 +525,7 @@ class Order extends Api | @@ -531,7 +525,7 @@ class Order extends Api | ||
531 | 'returnurl' => '', | 525 | 'returnurl' => '', |
532 | ]; | 526 | ]; |
533 | $result = Service::submitOrder($params); | 527 | $result = Service::submitOrder($params); |
534 | - $order->pay_user_id = $friend_id?$friend_id:$this->auth->id; | 528 | + $order->pay_user_id = $this->auth->id; |
535 | $order->isUpdate()->save(); | 529 | $order->isUpdate()->save(); |
536 | $this->success('支付信息',$result); | 530 | $this->success('支付信息',$result); |
537 | } | 531 | } |
-
请 注册 或 登录 后发表评论