Merge branch 'phoenix' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into phoenix

app/Constants/v3/ErrorCode.php

@@ -125,7 +125,7 @@ class ErrorCode extends AbstractConstants
     const PAYMENT_AMOUNT_LIMIT = 655;
 
     /**
-     * @Message("提现失败")
+     * @Message("工作人员已下班，请明天提现")
      */
     const WITHDRAW_PAYMENT_FAIL = 656;
 

app/Controller/v3/NotifyController.php

@@ -288,7 +288,6 @@ class NotifyController extends BaseController
     {
 
         $config = config('wxpay');
-        var_dump('wxpay$config', $config);
         $app = Factory::payment($config);
         $app['guzzle_handler'] = CoroutineHandler::class;
 
@@ -304,8 +303,6 @@ class NotifyController extends BaseController
         // 通知回调，进行业务处理
         $response = $app->handleRefundedNotify(function ($message, $reqInfo, $fail) use ($app) {
 
-            var_dump('messga', $message);
-            var_dump('$reqInfo', $reqInfo);
             Db::beginTransaction();
             try {
                 // 支付失败或者通知失败
@@ -326,14 +323,14 @@ class NotifyController extends BaseController
                 // 查询订单
                 $orderMain = OrderMain::query()
                     ->whereIn('state', [OrderState::PAID, OrderState::DELIVERY, OrderState::COMPLETED, OrderState::EVALUATED, OrderState::REFUNDING])
-                    ->where(['global_order_id' => $message['out_trade_no'], 'pay_type' => Payment::WECHAT, 'refund_time' => 0])
+                    ->where(['global_order_id' => $reqInfo['out_trade_no'], 'pay_type' => Payment::WECHAT, 'refund_time' => 0])
                     ->first();
 
                 // 订单不存在
                 if (empty($orderMain)) {
                     $this->log->event(
                         LogLabel::ORDER_REFUND_NOTIFY_LOG,
-                        ['global_order_id_fail' => $message['out_trade_no']]
+                        ['global_order_id_fail' => $reqInfo['out_trade_no']]
                     );
                     Db::rollBack();
                     return true;

app/Controller/v3/OrderOnlineController.php

@@ -234,7 +234,7 @@ class OrderOnlineController extends BaseController
 
             Db::rollBack();
             $this->log->event(LogLabel::ORDER_COMPLETE_LOG, ['exception' => $e->getMessage()]);
-            throw new ErrorCodeException(ErrorCode::ORDER_COMPLETE_FAIL, $e->getMessage());
+            throw new ErrorCodeException(ErrorCode::ORDER_COMPLETE_FAIL);
         }
     }
 }

app/Controller/v3/WithdrawController.php

@@ -194,7 +194,7 @@ class WithdrawController extends BaseController
                 'withdraw' => json_encode($withdraw),
                 'params' => json_encode(['balance' => $balance->balance, 'user_id' => $userId, 'store_id' => $storeId]),
             ]);
-            throw new ErrorCodeException(ErrorCode::STORE_WITHDRAW_FAIL, '[请稍后重试]'.$e->getMessage());
+            throw new ErrorCodeException(ErrorCode::STORE_WITHDRAW_FAIL);
         }
 
     }

app/JsonRpc/OrdersService.php

@@ -96,7 +96,7 @@ class OrdersService implements OrdersServiceInterface
     {
         try {
             $result = $this->orderOnlineService->doRefund($global_order_id, $user_id);
-            var_dump('$result', $result);
+
             return [
                 "status" => 200,
                 "code" => 0,

app/Service/v3/Implementations/OrderListService.php

@@ -68,7 +68,7 @@ class OrderListService implements OrderListServiceInterface
 
         $paginate = $builder->orderBy('created_at', 'desc')->paginate($pagesize);
         $orders = $paginate->toArray();
-        return ['has_more_pages' => $paginate->hasMorePages(), 'orders' => $orders['data']];
+        return ['has_more_pages' => $paginate->hasMorePages(), 'orders' => $orders['data'], 'note' => '待付款订单15分钟后将自动取消，请尽快支付！'];
     }
 
     public function onlineByStore($storeId, $tab, $page=1, $pagesize=10)

app/Service/v3/Implementations/OrderOnlineService.php

@@ -584,7 +584,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface
     {
 
         $orderMain = $this->check($globalOrderId, $userId, OrderState::REFUNDING);
-        var_dump('$orderMain', $orderMain);
+
         // 微信退款
         if ($orderMain->pay_type == Payment::WECHAT) {
             return $this->paymentService->undo($orderMain->global_order_id, $userId);

app/Service/v3/Implementations/PaymentService.php

@@ -136,7 +136,7 @@ class PaymentService implements PaymentServiceInterface
                     'notify_url' => config('wechat.notify_url.refund'),
                 ]
             );
-            var_dump('payresult', $result);
+
             if ($result['return_code'] == 'SUCCESS' && isset($result['result_code']) && $result['result_code'] == "SUCCESS") {
                 return true;
             } else {
@@ -144,7 +144,7 @@ class PaymentService implements PaymentServiceInterface
             }
         } catch (\Exception $e) {
             $this->log->event(LogLabel::ORDER_REFUND_LOG, ['payment_do_exception_msg' => $e->getMessage()]);
-            throw new ErrorCodeException(ErrorCode::REFUND_PAYMENT_FAIL, '[退款失败]'.$e->getMessage());
+            throw new ErrorCodeException(ErrorCode::REFUND_PAYMENT_FAIL);
         }
 
     }
@@ -209,15 +209,15 @@ class PaymentService implements PaymentServiceInterface
                 $msg = $result['err_code_des'];
             }
 
-            if ($result['err_code'] == 'SENDNUM_LIMIT') {
-                throw new ErrorCodeException(ErrorCode::PAYMENT_SEND_NUM_LIMIT);
-            } elseif ($result['err_code'] == 'V2_ACCOUNT_SIMPLE_BAN') {
-                throw new ErrorCodeException(ErrorCode::PAYMENT_V2_ACCOUNT_SIMPLE_BAN);
-            } elseif ($result['err_code'] == 'NAME_MISMATCH') {
-                throw new ErrorCodeException(ErrorCode::PAYMENT_NAME_MISMATCH);
-            } elseif ($result['err_code'] == 'AMOUNT_LIMIT') {
-                throw new ErrorCodeException(ErrorCode::PAYMENT_AMOUNT_LIMIT);
-            }
+            // if ($result['err_code'] == 'SENDNUM_LIMIT') {
+            //     throw new ErrorCodeException(ErrorCode::PAYMENT_SEND_NUM_LIMIT);
+            // } elseif ($result['err_code'] == 'V2_ACCOUNT_SIMPLE_BAN') {
+            //     throw new ErrorCodeException(ErrorCode::PAYMENT_V2_ACCOUNT_SIMPLE_BAN);
+            // } elseif ($result['err_code'] == 'NAME_MISMATCH') {
+            //     throw new ErrorCodeException(ErrorCode::PAYMENT_NAME_MISMATCH);
+            // } elseif ($result['err_code'] == 'AMOUNT_LIMIT') {
+            //     throw new ErrorCodeException(ErrorCode::PAYMENT_AMOUNT_LIMIT);
+            // }
 
             throw new ErrorCodeException(ErrorCode::WITHDRAW_PAYMENT_FAIL);
         }