正在显示
2 个修改的文件
包含
3 行增加
和
2 行删除
@@ -64,7 +64,7 @@ class Omessages extends Api | @@ -64,7 +64,7 @@ class Omessages extends Api | ||
64 | $data = Db::table('gc_porder') | 64 | $data = Db::table('gc_porder') |
65 | ->alias('o') | 65 | ->alias('o') |
66 | ->join('gc_product p','o.p_id = p.id','LEFT') | 66 | ->join('gc_product p','o.p_id = p.id','LEFT') |
67 | - ->join('gc_user u','o.s_uid = u.id','LEFT') | 67 | + ->join('gc_user u','o.uid = u.id','LEFT') |
68 | ->where(['o.s_uid'=>$this->user_id,'p.status'=>$this->normal,'u.status'=>'normal']) | 68 | ->where(['o.s_uid'=>$this->user_id,'p.status'=>$this->normal,'u.status'=>'normal']) |
69 | ->page($page,$limit) | 69 | ->page($page,$limit) |
70 | ->field('o.id,o.order_sn,o.status,p.title,u.username,o.is_read') | 70 | ->field('o.id,o.order_sn,o.status,p.title,u.username,o.is_read') |
@@ -183,7 +183,8 @@ class Wxpay extends Api | @@ -183,7 +183,8 @@ class Wxpay extends Api | ||
183 | * @ApiMethod (POST) | 183 | * @ApiMethod (POST) |
184 | * @ApiRoute (/api/wxpay/toPay) | 184 | * @ApiRoute (/api/wxpay/toPay) |
185 | * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") | 185 | * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") |
186 | - * @ApiParams (name="o_id", type="integer", required=true, description="订单id") | 186 | + * @ApiParams (name="amount", type="integer", required=true, description="充值金额") |
187 | + * @ApiParams (name="openid", type="integer", required=true, description="openid") | ||
187 | * @ApiReturn ({ | 188 | * @ApiReturn ({ |
188 | "code": 1, | 189 | "code": 1, |
189 | "msg": "成功", | 190 | "msg": "成功", |
-
请 注册 或 登录 后发表评论