lizuxiao 3 years ago
parent
commit
6797e161e4

+ 19 - 0
app/admin/controller/auction/AuctionOrder.php

@@ -243,6 +243,25 @@ class AuctionOrder extends AuthController
                 $data['status'] = 3;
                 $data->save();
                 \app\admin\model\auction\AuctionProduct::commitTrans();
+				// 计算总消费金额
+				$prices=model::where('uid',data['uid'])->where('status',3)->sum('price');//历史完成订单
+                $sum=floatval($prices+$data['price']);
+                //如果总金额大于等于三万
+                if($sum>=30000){
+                    $user=User::where('uid',data['uid'])->find();//获取用户信息
+                    if($user['f_integral']==3000){//如果积分依旧冻结
+                        //释放冻结积分
+                        $integral=floatval($user['integral']+3000);
+                        $res=User::where('uid',data['uid'])->update(['f_integral' =>0,'integral'=>$integral]);
+                        //积分释放流水
+                        $res3=UserBill::income('冻结积分释放',data['uid'], 'integral', 'release',3000, $id,$integral, '释放3000积分');
+						if(!$res3){
+							return self::setErrorInfo('操作失败');
+				}
+
+                    }
+                }
+
                 return Json::successful('审核通过!');
             }else{
 

+ 34 - 34
app/admin/controller/order/StoreOrder.php

@@ -499,44 +499,44 @@ class StoreOrder extends AuthController
                 StoreOrderModel::commitTrans();
                 //发送短信
                 event('ShortMssageSend', [$order['order_id'], 'Receiving']);
-				// 释放冻结积分
-				//获取当前订单的用户信息
-                $user=User::where('uid',$order['uid'])->find();
-//                计算当前用户的消费金额总和
-                $listsum=StoreOrderModel::where('id', $id)->where('status',2)->sum('total_price');
-//                判断当前用户金额加上当前订单金额是否大于三万
-                if($user['f_integral']==3000){
-                    $integral=floatval($user['integral']+3000);
-                    $res=User::where('uid',$order['uid'])->update(['f_integral' =>0,'integral'=>$integral]);
-                }
+// 				// 释放冻结积分
+// 				//获取当前订单的用户信息
+//                 $user=User::where('uid',$order['uid'])->find();
+// //                计算当前用户的消费金额总和
+//                 $listsum=StoreOrderModel::where('id', $id)->where('status',2)->sum('total_price');
+// //                判断当前用户金额加上当前订单金额是否大于三万
+//                 if($user['f_integral']==3000){
+//                     $integral=floatval($user['integral']+3000);
+//                     $res=User::where('uid',$order['uid'])->update(['f_integral' =>0,'integral'=>$integral]);
+//                 }
+
+
+
+
+// 				$order = self::getUserOrderDetail($uid, $uni);
+// 				//计算历史金额加上当前金额
+// 				$listsum=floatval($order['total_price']+$list);
+// 				if (!$order) return self::setErrorInfo('订单不存在!');
+// 				$order = self::tidyOrder($order);
+// 				// 如果总金额大于等于30000 释放冻结积分
+// 				if($listsum>=30000){
+// 					// 释放积分
+// 					$res=User::where('uid',$uid)->find();
+// 					if($res['f_integral']==3000){
+
+
+// 						$res3=UserBill::income('冻结积分释放',$uid, 'integral', 'release',3000, $order['id'],$listsum, '释放3000积分');
+// 						if(!$res2){
+// 							return self::setErrorInfo('操作失败');
+// 						}
+// 					}
+// 				}
+
+
 
 
 
 
-				$order = self::getUserOrderDetail($uid, $uni);
-				//计算历史金额加上当前金额
-				$listsum=floatval($order['total_price']+$list);
-				if (!$order) return self::setErrorInfo('订单不存在!');
-				$order = self::tidyOrder($order);
-				// 如果总金额大于等于30000 释放冻结积分
-				if($listsum>=30000){
-					// 释放积分
-					$res=User::where('uid',$uid)->find();
-					if($res['f_integral']==3000){
-
-
-						$res3=UserBill::income('冻结积分释放',$uid, 'integral', 'release',3000, $order['id'],$listsum, '释放3000积分');
-						if(!$res2){
-							return self::setErrorInfo('操作失败');
-						}
-					}
-				}
-				
-				
-				
-				
-				
-				
                 return Json::successful('收货成功!');
             }
         } catch (\Exception $e) {

+ 10 - 0
runtime/log/202203/30.log

@@ -1,3 +1,13 @@
 [2022-03-30T09:00:10+08:00][error] [1130]SQLSTATE[HY000] [1130] Host 'WIN-2109131507.lan' is not allowed to connect to this MySQL server[D:\phpstudy_pro\WWW\CRMEB\vendor\topthink\think-orm\src\db\PDOConnection.php:548]
 [2022-03-30T09:02:17+08:00][error] [1130]SQLSTATE[HY000] [1130] Host 'WIN-2109131507.lan' is not allowed to connect to this MySQL server[D:\phpstudy_pro\WWW\CRMEB\vendor\topthink\think-orm\src\db\PDOConnection.php:548]
 [2022-03-30T09:02:33+08:00][error] [1130]SQLSTATE[HY000] [1130] Host 'WIN-2109131507.lan' is not allowed to connect to this MySQL server[D:\phpstudy_pro\WWW\CRMEB\vendor\topthink\think-orm\src\db\PDOConnection.php:548]
+[2022-03-30T09:11:22+08:00][error] 小票打印出现错误,错误原因:获取access_token获取失败
+[2022-03-30T09:13:02+08:00][error] 小票打印出现错误,错误原因:获取access_token获取失败
+[2022-03-30T09:13:43+08:00][error] 小票打印出现错误,错误原因:获取access_token获取失败
+[2022-03-30T09:14:48+08:00][error] [0]Call to undefined method app\admin\controller\order\StoreOrder::getUserOrderDetail()[C:\Users\Administrator\Desktop\qdshop\qd\app\admin\controller\order\StoreOrder.php:516]
+[2022-03-30T09:15:46+08:00][error] 小票打印出现错误,错误原因:获取access_token获取失败
+[2022-03-30T09:16:02+08:00][error] [0]Call to undefined method app\admin\controller\order\StoreOrder::getUserOrderDetail()[C:\Users\Administrator\Desktop\qdshop\qd\app\admin\controller\order\StoreOrder.php:516]
+[2022-03-30T09:22:55+08:00][error] 小票打印出现错误,错误原因:获取access_token获取失败
+[2022-03-30T09:59:54+08:00][error] 小票打印出现错误,错误原因:获取access_token获取失败
+[2022-03-30T10:00:09+08:00][error] [0]Call to undefined method app\admin\controller\order\StoreOrder::getUserOrderDetail()[C:\Users\Administrator\Desktop\qdshop\qd\app\admin\controller\order\StoreOrder.php:502]
+[2022-03-30T10:02:45+08:00][error] 小票打印出现错误,错误原因:获取access_token获取失败