From 29992315aae7099c8a5739c0574e5a68c341c074 Mon Sep 17 00:00:00 2001
From: 李忠强 <1354905998@qq.com>
Date: Fri, 21 Jan 2022 13:44:43 +0800
Subject: [PATCH] 更新
---
application/api/controller/Classification.php | 4 ++--
application/api/controller/Goods.php | 4 ++--
application/api/controller/Order.php | 10 ++--------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/application/api/controller/Classification.php b/application/api/controller/Classification.php
index 9d1d340..472e1a8 100644
--- a/application/api/controller/Classification.php
+++ b/application/api/controller/Classification.php
@@ -137,12 +137,12 @@ class Classification extends Api
// 如果sku是空数组 为单规格商品 只需要用list的值
"list": [
{
- "goods_spec_id": 103,
+ "goods_spec_id": 103, // 规格列表id
"goods_id": 22,
"goods_no": "SNHW001",
"goods_price": "4499.00",
"line_price": "0.00",
- "stock_num": 941, 库存
+ "stock_num": 941, // 库存
"goods_sales": 58,
"goods_weight": 500,
"spec_sku_id": "44_46", // 搜索字段 组合sku里面的id搜索 从小到大排序
diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php
index 7aed0ba..84ae172 100644
--- a/application/api/controller/Goods.php
+++ b/application/api/controller/Goods.php
@@ -75,12 +75,12 @@ class Goods extends Api
// 规格组合完毕的列表
"list": [
{
- "goods_spec_id": 103,
+ "goods_spec_id": 103, // 规格列表id
"goods_id": 22,
"goods_no": "SNHW001",
"goods_price": "4499.00",
"line_price": "0.00",
- "stock_num": 941,
+ "stock_num": 941, // 库存
"goods_sales": 58,
"goods_weight": 500,
"spec_sku_id": "44_46", // 搜索字段 组合sku里面的id搜索 从小到大排序
diff --git a/application/api/controller/Order.php b/application/api/controller/Order.php
index 092613e..22dc154 100644
--- a/application/api/controller/Order.php
+++ b/application/api/controller/Order.php
@@ -497,7 +497,6 @@ class Order extends Api
* @ApiMethod (POST)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name="id", type="integer", required=true, description="订单ID")
- * @ApiParams (name="user_id", type="string", required=true, description="代付用户id 默认传0")
* @ApiReturn ({
'code':'1',
'msg':'返回成功'
@@ -512,12 +511,7 @@ class Order extends Api
$model = new \app\api\model\Order();
$order = $model::get($order_id);
if (!$order) $this->error('订单不存在');
- if ($friend_id){
- $openid = Third::get(['user_id'=>$friend_id]);
- }else{
- if ($order['user_id'] != $this->auth->id) $this->error('当前用户不可支付');
- $openid = Third::get(['user_id'=>$this->auth->id]);
- }
+ $openid = Third::get(['user_id'=>$this->auth->id]);
if (!$openid) $this->error('未注册用户');
$params = [
'type' => 'wechat',
@@ -531,7 +525,7 @@ class Order extends Api
'returnurl' => '',
];
$result = Service::submitOrder($params);
- $order->pay_user_id = $friend_id?$friend_id:$this->auth->id;
+ $order->pay_user_id = $this->auth->id;
$order->isUpdate()->save();
$this->success('支付信息',$result);
}
--
libgit2 0.24.0