diff --git a/app/ExceptionHandler.php b/app/ExceptionHandler.php index 8cfa3719..179dd0a7 100644 --- a/app/ExceptionHandler.php +++ b/app/ExceptionHandler.php @@ -20,9 +20,7 @@ class ExceptionHandler extends Handler { if ($exception instanceof Dumper) { return \response(self::convertToHtml($exception)); - } elseif ($exception instanceof ErrorException) { - return response($exception->getMessage(), 401); - } elseif ($exception instanceof BusinessException) { + }elseif ($exception instanceof BusinessException) { return response($exception->getMessage()); } elseif ($exception instanceof \Exception) { $isDebug = config('app.debug'); diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 3fbb8e1f..68b9790d 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -292,6 +292,7 @@ class OrderController extends BaseApiController if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') { PayNotifyLogic::handle('StoreOrder', $result['out_trade_no'], $result); } else { + Db::name('wechat_micropay')->insert(['order_id'=>$order['order_id'],'create_time'=>time(),'update_time'=>time()]); Redis::send('send-code-pay', ['order_id' => $order['order_id']]); return $this->success('用户支付中'); } diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 8e75ae4c..082229e4 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -327,19 +327,30 @@ class OrderLogic extends BaseLogic try { $order = StoreOrder::create($_order); $goods_list = $orderInfo['cart_list']; + + $updateData = []; + $updateDataTwo = []; foreach ($goods_list as $k => $v) { $goods_list[$k]['oid'] = $order->id; $goods_list[$k]['uid'] = $uid; $goods_list[$k]['cart_id'] = implode(',', $cartId); $goods_list[$k]['delivery_id'] = $params['store_id']; //商家id - // $StoreBranchProduct = StoreBranchProduct::where('id', $v['branch_product_id'])->withTrashed()->find(); - // if ($StoreBranchProduct['stock'] - $v['cart_num'] <= 0) { - // Db::name('store_product_cate')->where(['cate_id' => $StoreBranchProduct['cate_id'], 'store_id' => $params['store_id']])->update(['count' => 0]); - // } + + $updateData[] = [ + 'id' => $v['branch_product_id'], + 'sales' => ['inc', $v['cart_num']], + 'stock' => ['dec', $v['cart_num']], + ]; + $updateDataTwo[] = [ + 'id' => $v['product_id'], + 'sales' => ['inc', $v['cart_num']] + ]; } (new StoreOrderCartInfo())->saveAll($goods_list); $where = ['is_pay' => 0]; Cart::whereIn('id', $cartId)->where($where)->update(['is_pay' => 1]); + (new StoreBranchProduct())->saveAll($updateData); + (new StoreProduct())->saveAll($updateDataTwo); Db::commit(); return $order; } catch (\Exception $e) { diff --git a/app/common/cache/UserAccountSafeCache.php b/app/common/cache/UserAccountSafeCache.php index 2061ecb3..53cc1d5a 100644 --- a/app/common/cache/UserAccountSafeCache.php +++ b/app/common/cache/UserAccountSafeCache.php @@ -20,7 +20,7 @@ class UserAccountSafeCache extends BaseCache public function __construct() { parent::__construct(); - $ip = \request()->getLocalIp(); + $ip = \request()->getRealIp(); $this->key = $this->tagName . $ip; } diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index a040a0e5..09b8cdf0 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -280,6 +280,9 @@ class PayNotifyLogic extends BaseLogic if (!empty($extra['payer']['openid']) && $order->pay_type == 7) { Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid']], 4); } + if($order['pay_type']==9){ + Db::name('wechat_micropay')->where(['order_id'=>$order['order_id']])->delete(); + } return true; } @@ -461,12 +464,12 @@ class PayNotifyLogic extends BaseLogic $uid = $order['other_uid']; } - PushService::push('wechat_mmp_' . $uid, $uid, ['type' => 'INDUSTRYMEMBERS', 'msg' => '订单支付成功', 'data' => ['id' => $order['id'], 'paid' => 1]]); PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'INDUSTRYMEMBERS', 'msg' => '订单支付成功', 'data' => ['id' => $order['id'], 'paid' => 1]]); if (!empty($extra['payer']['openid'])) { Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid'], 'logistics_type' => 3], 4); } + Db::name('wechat_micropay')->where(['order_id'=>$order['order_id']])->delete(); return true; } diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 5cf8e956..37b1bd22 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -29,6 +29,7 @@ use app\store\validate\store_order\StoreOrderValidate; use support\Cache; use support\Log; use think\Exception; +use think\facade\Db; use Webman\RedisQueue\Redis; /** @@ -246,6 +247,7 @@ class StoreOrderController extends BaseAdminController Log::error(json_encode($result)); PayNotifyLogic::handle('wechat_common', $result['out_trade_no'], $result); } else { + Db::name('wechat_micropay')->insert(['order_id'=>$order['order_id'],'create_time'=>time(),'update_time'=>time()]); Redis::send('send-code-pay', ['order_id' => $order['order_id']]); return $this->success('用户支付中'); } @@ -318,6 +320,7 @@ class StoreOrderController extends BaseAdminController PayNotifyLogic::handle('wechat_common', $result['out_trade_no'], $result); } else { Redis::send('send-code-pay', ['order_id' => $order['order_id']]); + Db::name('wechat_micropay')->insert(['order_id'=>$order['order_id'],'create_time'=>time(),'update_time'=>time()]); return $this->success('用户支付中'); } return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'], 'id' => $order['id']]); diff --git a/config/log.php b/config/log.php index 59727598..b6c0e6c5 100644 --- a/config/log.php +++ b/config/log.php @@ -20,7 +20,7 @@ return [ 'constructor' => [ runtime_path() . '/logs/'.date('Ym').'/.log', 2048, - Monolog\Logger::NOTICE, + Monolog\Logger::INFO, true, 0755 ], diff --git a/process/Task.php b/process/Task.php index 56a913db..70503c56 100644 --- a/process/Task.php +++ b/process/Task.php @@ -32,7 +32,8 @@ class Task foreach ($arr as $v) { $updateData[] = [ 'id' => $v['branch_product_id'], - 'sales' => ['dec', $v['cart_num']] + 'sales' => ['dec', $v['cart_num']], + 'stock' => ['inc', $v['cart_num']], ]; $updateDataTwo[] = [ 'id' => $v['product_id'], @@ -62,27 +63,27 @@ class Task } }); //每10秒执行一次 - // new Crontab('*/10 * * * * *', function () { - // $select=Db::name('wechat_micropay')->limit(100)->select(); - // $pay = new PayService(); - // foreach ($select as $k=>$v) { - // $time = time(); - // if ($time - $v['create_time'] > 60){ - // Db::name('wechat_micropay')->where('id',$v['id'])->delete(); - // continue; - // } - // $order = [ - // 'out_trade_no' => $v['order_id'], - // ]; - // $res = $pay->wechat->query($order); - // if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') { - // if(isset($data['pay_type']) && $data['pay_type']=='recharge'){ - // PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res); - // }else{ - // PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); - // } - // } - // } - // }); + new Crontab('*/10 * * * * *', function () { + $select=Db::name('wechat_micropay')->limit(100)->select(); + $pay = new PayService(); + foreach ($select as $k=>$v) { + $time = time(); + if ($time - $v['create_time'] > 60){ + Db::name('wechat_micropay')->where('id',$v['id'])->delete(); + continue; + } + $order = [ + 'out_trade_no' => $v['order_id'], + ]; + $res = $pay->wechat->query($order); + if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') { + if(isset($data['pay_type']) && $data['pay_type']=='recharge'){ + PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res); + }else{ + PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); + } + } + } + }); } }