commit

app/models/store/StoreOrder.php

@@ -776,7 +776,7 @@ class StoreOrder extends BaseModel
     {
         $order = self::where('order_id', $orderId)->find();
         $resPink = true;
-        $res1 = self::where('order_id', $orderId)->update(['paid' => 1, 'pay_type' => $paytype, 'pay_time' => time(), 'is_del' => 0, 'is_system_del' => 0, 'mark' => '', 'status' => 2]);//订单改为支付
+        $res1 = self::where('order_id', $orderId)->update(['paid' => 1, 'pay_type' => $paytype, 'pay_time' => time(), 'is_del' => 0, 'is_system_del' => 0, 'mark' => '']);//订单改为支付
         if ($order->combination_id && $res1 && !$order->refund_status) $resPink = StorePink::createPink($order);//创建拼团
         $oid = self::where('order_id', $orderId)->value('id');
         StoreOrderStatus::status($oid, 'pay_success', '用户付款成功');
@@ -1234,7 +1234,7 @@ class StoreOrder extends BaseModel
         else if ($status == 2)//待收货
             return $model->where('paid', 1)->where('status', 1)->where('refund_status', 0);
         else if ($status == 3)//待评价
-            return $model->where('paid', 1)->where('status', 2)->where('use', 0)->where('refund_status', 0);
+            return $model->where('paid', 1)->where('use', 0)->where('refund_status', 0);
         else if ($status == 4)//已完成
             return $model->where('paid', 1)->where('use', 1)->where('refund_status', 0);
         else if ($status == -1)//退款中