退款

application/admin/controller/Orders.php

@@ -85,6 +85,7 @@ class Orders extends Backend
             $this->validate($data,[
                 'com_id'=>['require',],
                 'trans_no'=>['require'],
+                'remark|备注'=>['require','max:100'],
             ]);
             /*if($order->logistics){
                 $this->error('已发货无法再次发货');

application/admin/view/orders/send.html

@@ -22,6 +22,12 @@
             <input id="c-user_id" data-rule="required" data-field="nickname" class="form-control" name="row[trans_no]" type="text" value="{$row.logistics.trans_no|default=''}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('备注')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" class="form-control" name="row[remark]" type="text">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/mall/Orders.php

@@ -164,7 +164,7 @@ class Orders extends Api
         $this->success('',$this->orderDetail($data['id']));
     }
     protected function orderDetail($orderId){
-        $order= Order::with(['info','address','logistics'])->findOrFail($orderId);
+        $order= Order::with(['info','address','logistics','logistics.com'])->findOrFail($orderId);
         foreach ($order['info'] as $info){
             $info->append(['goods','sku']);
         }

application/api/controller/object/Index.php

@@ -107,6 +107,7 @@ class Index extends Api
      * @ApiParams (name=tax.bank_name,description=开户行u_type2时候必须)
      * @ApiParams (name=tax.tax_no,description=税号u_type2时候必须)
      * @ApiParams (name=goods,description=商品对象)
+     * @ApiParams (name=logistics,description=商品对象)
      * @ApiParams (name=address,description=地址对象)
      * @ApiParams (name=address.address,description=详细地址)
      * @ApiParams (name=address.mobile,description=手机号)

application/common/model/OrderLogistics.php

@@ -8,5 +8,7 @@ use think\Model;
 
 class OrderLogistics extends Model
 {
-
+    public function com(){
+        return $this->belongsTo(LogisticsCompany::class,'com_id');
+    }
 }

application/common/model/Orders.php

@@ -149,7 +149,7 @@ class Orders extends Model
     }
     #发货
     public function makeSend($logistics,$data){
-        $newData=Arr::only($data,['com_id','trans_no']);
+        $newData=Arr::only($data,['com_id','trans_no','remark']);
         if(!$logistics) {
             $this->logistics()->save($newData);
             $this['status']=self::S_WAIT_REC;