xieruidong 2 年之前
父節點
當前提交
edfb35befa

+ 1 - 1
application/api/controller/mall/Orders.php

@@ -162,7 +162,7 @@ class Orders extends Api
         $user=$this->auth->getUser();
         $order=$user->orders()->with(['info'])->findOrFail($data['id']);
         foreach ($order['info'] as $info){
-            $info->append(['goods']);
+            $info->append(['goods','sku']);
         }
         $this->success('',$order);
     }

+ 1 - 2
application/api/controller/object/Index.php

@@ -91,8 +91,7 @@ class Index extends Api
      * @ApiParams (name=tax.open_name,description=开户名称u_type2时候必须)
      * @ApiParams (name=tax.bank_name,description=开户行u_type2时候必须)
      * @ApiParams (name=tax.tax_no,description=税号u_type2时候必须)
-     * @ApiParams (name=goods.name,description=列表里面的商品名称)
-     * @ApiParams (name=goods.logo,description=列表里面的商品logo)
+     * @ApiParams (name=goods,description=商品对象)
      */
     public function orders(){}
 }

+ 8 - 4
application/common/model/OrderInfo.php

@@ -8,6 +8,9 @@ use think\Model;
  */
 class OrderInfo extends Model
 {
+    protected $hidden=[
+        'goods_bak'
+    ];
     public function orders(){
         return $this->belongsTo(Orders::class);
     }
@@ -44,10 +47,11 @@ class OrderInfo extends Model
     }
     public function getGoodsAttr(){
         $info=$this;
-        return [
-            'name'=>$info['goodsBak']['goods']['name'],
-            'logo'=>$info['goodsBak']['goods']['logo'],
-        ];
+        return $info['goodsBak']['goods'];
+    }
+    public function getSkuAttr(){
+        $info=$this;
+        return $info['goodsBak']['sku'];
     }
 
 

+ 1 - 4
application/common/model/Orders.php

@@ -49,10 +49,7 @@ class Orders extends Model
     public function getGoodsAttr(){
         $info=$this->info()->with(['goodsBak'])->find();
         $goods=$info['goodsBak'];
-        return [
-            'name'=>$goods['goods']['name'],
-            'logo'=>$goods['goods']['logo'],
-        ];
+        return $goods['goods'];
     }
 
     /**

+ 5 - 15
public/api.html

@@ -6029,16 +6029,10 @@
                                                         <td>税号u_type2时候必须</td>
                                                     </tr>
                                                                                                         <tr>
-                                                        <td>goods.name</td>
+                                                        <td>goods</td>
                                                         <td>string</td>
                                                         <td>是</td>
-                                                        <td>列表里面的商品名称</td>
-                                                    </tr>
-                                                                                                        <tr>
-                                                        <td>goods.logo</td>
-                                                        <td>string</td>
-                                                        <td>是</td>
-                                                        <td>列表里面的商品logo</td>
+                                                        <td>商品对象</td>
                                                     </tr>
                                                                                                     </tbody>
                                             </table>
@@ -6235,12 +6229,8 @@
                                                             <input type="string" class="form-control input-sm" id="tax.tax_no" required placeholder="税号u_type2时候必须" name="tax.tax_no">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="goods.name">goods.name</label>
-                                                            <input type="string" class="form-control input-sm" id="goods.name" required placeholder="列表里面的商品名称" name="goods.name">
-                                                        </div>
-                                                                                                                <div class="form-group">
-                                                            <label class="control-label" for="goods.logo">goods.logo</label>
-                                                            <input type="string" class="form-control input-sm" id="goods.logo" required placeholder="列表里面的商品logo" name="goods.logo">
+                                                            <label class="control-label" for="goods">goods</label>
+                                                            <input type="string" class="form-control input-sm" id="goods" required placeholder="商品对象" name="goods">
                                                         </div>
                                                                                                                 <div class="form-group form-group-submit">
                                                             <button type="submit" class="btn btn-success send" rel="35">提交</button>
@@ -10372,7 +10362,7 @@
 
                 </div>
                 <div class="col-md-6" align="right">
-                    Generated on 2022-09-24 15:08:45 <a href="./" target="_blank">后台管理</a>
+                    Generated on 2022-09-24 15:22:45 <a href="./" target="_blank">后台管理</a>
                 </div>
             </div>