批量结算

application/api/controller/SenderOrderController.php

@@ -296,7 +296,7 @@ class SenderOrderController extends SenderApi
         $user=$this->auth->getUser();
         Db::startTrans();
         $senderOrder=$user->senderOrder()->now()->findOrFail($data['id']);
-        $senderOrder->settle($data);
+        $senderOrder->applySettle($data);
         Db::commit();
         $this->success();
     }

application/common/model/SenderOrder.php

@@ -14,7 +14,7 @@ use traits\model\SoftDelete;
  * @method Query set()
  * @method Query cancel()
  * @method Query now()
- * @method Query filter($order_id=null,$user_id=null)
+ * @method Query|self filter($user_order_id=null,$user_id=null)
  * @property UserOrder orders
  */
 class SenderOrder Extends Model
@@ -78,7 +78,7 @@ class SenderOrder Extends Model
             ->order('id','desc');
     }
     /** 申请结算 */
-    public function settle(array $data){
+    public function applySettle(array $data){
         if(!is_null($this['fee_total'])){
             throw_user('不可再次申请');
         }
@@ -136,7 +136,7 @@ class SenderOrder Extends Model
             $data=$order->getChangedData();
             #两人都提交了更新状态为已提交结算信息
             if($order['fee_total']>0){
-                $other=self::where('user_order_id',$order['user_order_id'])->now()->where('id','<>',$order['id'])->find();
+                $other=self::filter($order['user_order_id'])->now()->where('id','<>',$order['id'])->find();
                 if($other && $other['fee_total']>0){
                     $mainOrder=$order->orders;
                     if($mainOrder['status']==UserOrder::STATUS_COMPLETE){

application/common/model/UserOrder.php

@@ -238,10 +238,19 @@ class UserOrder extends Model
             }
             #加一个盈利记录
             User::money($this->profit,0,MoneyLog::TYPE_PROFIT,"订单[{$this['no']}]盈利",['order_id'=>$this['id']],false);
+            $this['settled_at']=time();
         }elseif($data['status']==2){
-            $this['status']=self::STATUS_SET_REJECT;
+            $this['status']=self::STATUS_COMPLETE;
+            $this->currentSenderOrder()->update([
+                'fee_1'=>0,
+                'fee_2'=>0,
+                'fee_3'=>0,
+                'fee_4'=>0,
+                'fee_5'=>0,
+                'fee_6'=>0,
+                'fee_total'=>0,
+            ]);
         }
-        $this['settled_at']=time();
         if(!$this->save()){
             throw_user('保存失败');
         }

application/validate/UserOrderValidate.php

@@ -29,7 +29,7 @@ class UserOrderValidate extends Validate{
         'spec|规格'=>['require','gt:0','integer'],
         'piece|件数'=>['require','gt:0','integer'],
         'has_cage|是否有宠具'=>['require','in:0,1'],
-        'remark|备注'=>['max:100','require'],
+        'remark|备注'=>['max:100',/*'require'*/],
         'images|图片'=>['array','max:9'],
         'coupon_id|优惠券'=>['integer','egt:0'],