挂售

app/admin/controller/user/UserAuth.php

@@ -78,7 +78,7 @@ class UserAuth extends AuthController
 			$res=UserModel::where(['uid' => $uid])->update(['is_auth' =>2,'f_integral'=>3000,'off'=>"", 'is_new' => 1]);
 			if($res>0){
 				// 添加积分充值记录
-				$res2=UserBillAdmin::income('实名认证赠送',$uid, 'integral', 'top_add', 3000, 0, 3000, '首次实名赠送(竞拍消费满30000释放)');
+//				$res2=UserBillAdmin::income('实名认证赠送',$uid, 'integral', 'top_add', 3000, 0, 3000, '首次实名赠送(竞拍消费满30000释放)');
 				return JsonService::successful('审核成功');
 				
 			}else{

app/api/controller/auction/AuctionProductController.php

@@ -249,7 +249,10 @@ class AuctionProductController
         try {
             Db::startTrans();
             $product = AuctionProduct::find($order['product_id']);
-            if ($product['uid'] == $order['uid'])  return app('json')->fail('商品已发放');
+            if ($product['uid'] == $order['uid']) {
+                AuctionOrder::where('order_id', $data['order_id'])->update(['status' => 3]);
+                return app('json')->fail('完成');
+            }
             if (!$product) return app('json')->fail('数据不存在');
             $uid = $product['uid']; // 所属人id
 

app/models/auction/AuctionOrder.php

@@ -405,14 +405,19 @@ class AuctionOrder extends BaseModel
                 if (time() > $time) {
                     // 如果当前时间已经过了
                     $product = AuctionProduct::where('id', $item['product_id'])->find();
-                    $product['uid'] = $item['uid'];// 商品拥有人更新
-                    $product['add_time'] = 111111;
-                    $product['order'] = $item['order_id'];
-
-                    self::where('id', $item['id'])->update(['status' => 3]);
-                    self::earn($item['uid'], $item['price'], $product);
-                    self::return($item['id']);
-                    $product->save();
+                    if ($product['uid'] == $item['uid']) {
+                        self::where('id', $item['id'])->update(['status' => 3]);
+                    }else{
+                        $product['uid'] = $item['uid'];// 商品拥有人更新
+                        $product['add_time'] = 111111;
+                        $product['order'] = $item['order_id'];
+
+                        self::where('id', $item['id'])->update(['status' => 3]);
+                        self::earn($item['uid'], $item['price'], $product);
+                        self::return($item['id']);
+                        $product->save();
+                    }
+
                 }
 
             }