qifengquan 1 år sedan
förälder
incheckning
e1b3dbe5a2
3 ändrade filer med 10 tillägg och 30 borttagningar
  1. 8 8
      application/api/controller/Pricing.php
  2. 1 1
      application/api/controller/User.php
  3. 1 21
      public/api.html

+ 8 - 8
application/api/controller/Pricing.php

@@ -55,9 +55,7 @@ class Pricing extends Api
      * @ApiParams (name="deploy_type",description="部署方式0自己部署 1授权部署")
      * @ApiParams (name="deploy",description="授权部署信息(授权部署时传)")
      * @ApiParams (name="type",description="1页面下单,2是购物车下单")
-     * @ApiParams (name="cart_id",description="购物车id(购物车下单时传)")
      * @ApiParams (name="goods_id",description="商品id")
-     * @ApiParams (name="amount_real",description="订单金额")
      */
     public function place_order(){
         if(input('deploy_type')==1 && empty(input('deploy'))){
@@ -69,11 +67,11 @@ class Pricing extends Api
             'goods_id' => input('goods_id'),
             'goods_name' => Goods::where('id',input('goods_id'))->value('name'),
             'order_no' => pay_no($this->auth->id),
-            'amount_real' => input('amount_real'),
-            'discount_id' => input('discount_id'),
-            'discount' => DiscountCoupon::where('id',input('discount_id'))->value('price'),
+            'amount_real' => Goods::where('id',input('goods_id'))->value('price'),
+//            'discount_id' => input('discount_id'),
+//            'discount' => DiscountCoupon::where('id',input('discount_id'))->value('price'),
 //            'payment_type' => input('payment_type'),
-            'number_goods' => 1,
+//            'number_goods' => 1,
             'deploy_type' => input('deploy_type'),
             'deploy' => input('deploy'),
         ];
@@ -81,11 +79,13 @@ class Pricing extends Api
         try {
             $id = Order::insertGetId($data);
             if(input('type')==2){
-                Cart::where('id',input('cart_id'))->delete();
+                if(!Cart::where(['user_id'=>$this->auth->id,'goods_id'=>input('goods_id')])->delete()){
+                    $this->error('参数错误');
+                }
             }
-            $this->success('下单成功',$id);
 //            $this->pay_order($data['amount_real'],$data['order_no'],$data['payment_type'],$data['goods_name'],'scan');
             Db::commit();
+            $this->success('下单成功',$id);
         }catch (Exception $exception){
             Db::rollback();
             $this->error($exception);

+ 1 - 1
application/api/controller/User.php

@@ -470,7 +470,7 @@ class User extends Api
      */
     public function myorder_details(){
         $list = Order::get(function ($query){
-            $query->where(['uid'=>$this->auth->id,'type'=>1,'id'=>input('id')])->field('id,uid,type,goods_id,goods_name,order_no,amount_real,status,create_time,deploy_type,deploy,billing_status')->order('id desc');
+            $query->where(['uid'=>$this->auth->id,'type'=>1,'id'=>input('id')])->field('id,uid,type,goods_id,goods_name,order_no,amount_real,status,create_time,deploy_type,deploy,billing_status,after_sale')->order('id desc');
         });
         $this->success('请求成功',$list);
     }

+ 1 - 21
public/api.html

@@ -4357,23 +4357,11 @@
                                                         <td>1页面下单,2是购物车下单</td>
                                                     </tr>
                                                                                                         <tr>
-                                                        <td>cart_id</td>
-                                                        <td>string</td>
-                                                        <td>是</td>
-                                                        <td>购物车id(购物车下单时传)</td>
-                                                    </tr>
-                                                                                                        <tr>
                                                         <td>goods_id</td>
                                                         <td>string</td>
                                                         <td>是</td>
                                                         <td>商品id</td>
                                                     </tr>
-                                                                                                        <tr>
-                                                        <td>amount_real</td>
-                                                        <td>string</td>
-                                                        <td>是</td>
-                                                        <td>订单金额</td>
-                                                    </tr>
                                                                                                     </tbody>
                                             </table>
                                                                                     </div>
@@ -4409,17 +4397,9 @@
                                                             <input type="string" class="form-control input-sm" id="type" required placeholder="1页面下单,2是购物车下单" name="type">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="cart_id">cart_id</label>
-                                                            <input type="string" class="form-control input-sm" id="cart_id" required placeholder="购物车id(购物车下单时传)" name="cart_id">
-                                                        </div>
-                                                                                                                <div class="form-group">
                                                             <label class="control-label" for="goods_id">goods_id</label>
                                                             <input type="string" class="form-control input-sm" id="goods_id" required placeholder="商品id" name="goods_id">
                                                         </div>
-                                                                                                                <div class="form-group">
-                                                            <label class="control-label" for="amount_real">amount_real</label>
-                                                            <input type="string" class="form-control input-sm" id="amount_real" required placeholder="订单金额" name="amount_real">
-                                                        </div>
                                                                                                                 <div class="form-group form-group-submit">
                                                             <button type="submit" class="btn btn-success send" rel="29">提交</button>
                                                             <button type="reset" class="btn btn-info" rel="29">重置</button>
@@ -10005,7 +9985,7 @@
 
                 </div>
                 <div class="col-md-6" align="right">
-                    Generated on 2023-05-19 14:07:03 <a href="./" target="_blank">宙斯维创</a>
+                    Generated on 2023-05-19 14:30:04 <a href="./" target="_blank">宙斯维创</a>
                 </div>
             </div>