Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenDocCN
yii2_fecshop
提交
7b64f6cf
Y
yii2_fecshop
项目概览
OpenDocCN
/
yii2_fecshop
通知
17
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
yii2_fecshop
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
7b64f6cf
编写于
10月 22, 2018
作者:
T
Terry
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
yii2 exception format: change to `\Exception $e`
上级
b5dcd78d
变更
23
隐藏空白更改
内联
并排
Showing
23 changed file
with
46 addition
and
46 deletion
+46
-46
app/appfront/modules/Checkout/block/onepage/Placeorder.php
app/appfront/modules/Checkout/block/onepage/Placeorder.php
+1
-1
app/appfront/modules/Checkout/controllers/CartController.php
app/appfront/modules/Checkout/controllers/CartController.php
+6
-6
app/appfront/modules/Payment/block/paypal/express/Placeorder.php
...front/modules/Payment/block/paypal/express/Placeorder.php
+3
-3
app/appfront/modules/Payment/block/paypal/standard/Placeorder.php
...ront/modules/Payment/block/paypal/standard/Placeorder.php
+1
-1
app/appfront/modules/Payment/controllers/alipay/StandardController.php
...modules/Payment/controllers/alipay/StandardController.php
+1
-1
app/appfront/modules/Payment/controllers/paypal/StandardController.php
...modules/Payment/controllers/paypal/StandardController.php
+1
-1
app/apphtml5/modules/Checkout/block/onepage/Placeorder.php
app/apphtml5/modules/Checkout/block/onepage/Placeorder.php
+1
-1
app/apphtml5/modules/Checkout/controllers/CartController.php
app/apphtml5/modules/Checkout/controllers/CartController.php
+6
-6
app/apphtml5/modules/Payment/block/paypal/express/Placeorder.php
...html5/modules/Payment/block/paypal/express/Placeorder.php
+3
-3
app/apphtml5/modules/Payment/block/paypal/standard/Placeorder.php
...tml5/modules/Payment/block/paypal/standard/Placeorder.php
+1
-1
app/apphtml5/modules/Payment/controllers/alipay/StandardController.php
...modules/Payment/controllers/alipay/StandardController.php
+1
-1
app/apphtml5/modules/Payment/controllers/paypal/StandardController.php
...modules/Payment/controllers/paypal/StandardController.php
+1
-1
app/appserver/modules/Checkout/block/onepage/Placeorder.php
app/appserver/modules/Checkout/block/onepage/Placeorder.php
+1
-1
app/appserver/modules/Checkout/controllers/CartController.php
...appserver/modules/Checkout/controllers/CartController.php
+6
-6
app/appserver/modules/Payment/block/paypal/express/Placeorder.php
...erver/modules/Payment/block/paypal/express/Placeorder.php
+3
-3
app/appserver/modules/Payment/block/paypal/standard/Placeorder.php
...rver/modules/Payment/block/paypal/standard/Placeorder.php
+1
-1
app/appserver/modules/Payment/controllers/alipay/StandardController.php
...modules/Payment/controllers/alipay/StandardController.php
+1
-1
app/appserver/modules/Payment/controllers/paypal/StandardController.php
...modules/Payment/controllers/paypal/StandardController.php
+1
-1
services/Order.php
services/Order.php
+1
-1
services/cart/Coupon.php
services/cart/Coupon.php
+1
-1
services/cms/article/ArticleMysqldb.php
services/cms/article/ArticleMysqldb.php
+2
-2
services/payment/Paypal.php
services/payment/Paypal.php
+1
-1
services/url/rewrite/RewriteMysqldb.php
services/url/rewrite/RewriteMysqldb.php
+2
-2
未找到文件。
app/appfront/modules/Checkout/block/onepage/Placeorder.php
浏览文件 @
7b64f6cf
...
...
@@ -90,7 +90,7 @@ class Placeorder
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
...
...
app/appfront/modules/Checkout/controllers/CartController.php
浏览文件 @
7b64f6cf
...
...
@@ -76,7 +76,7 @@ class CartController extends AppfrontController
$innerTransaction
->
rollBack
();
exit
;
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
}
...
...
@@ -107,7 +107,7 @@ class CartController extends AppfrontController
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
$error_arr
=
Yii
::
$service
->
helper
->
errors
->
get
(
true
);
...
...
@@ -184,7 +184,7 @@ class CartController extends AppfrontController
$innerTransaction
->
commit
();
exit
;
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
}
else
{
...
...
@@ -221,7 +221,7 @@ class CartController extends AppfrontController
]);
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
exit
;
...
...
@@ -247,7 +247,7 @@ class CartController extends AppfrontController
]);
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
exit
;
...
...
@@ -272,7 +272,7 @@ class CartController extends AppfrontController
]);
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
exit
;
...
...
app/appfront/modules/Payment/block/paypal/express/Placeorder.php
浏览文件 @
7b64f6cf
...
...
@@ -68,7 +68,7 @@ class Placeorder
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
//echo 22;
...
...
@@ -114,7 +114,7 @@ class Placeorder
$innerTransaction
->
rollBack
();
return
false
;
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
return
false
;
}
...
...
@@ -129,7 +129,7 @@ class Placeorder
}else{
$innerTransaction->rollBack();
}
} catch (Exception $e) {
} catch (
\
Exception $e) {
$innerTransaction->rollBack();
}
}
...
...
app/appfront/modules/Payment/block/paypal/standard/Placeorder.php
浏览文件 @
7b64f6cf
...
...
@@ -83,7 +83,7 @@ class Placeorder
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
}
...
...
app/appfront/modules/Payment/controllers/alipay/StandardController.php
浏览文件 @
7b64f6cf
...
...
@@ -79,7 +79,7 @@ class StandardController extends AppfrontController
}else{
$innerTransaction->rollBack();
}
} catch (Exception $e) {
} catch (
\
Exception $e) {
$innerTransaction->rollBack();
}
return Yii::$service->url->redirectByUrlKey('checkout/onepage');
...
...
app/appfront/modules/Payment/controllers/paypal/StandardController.php
浏览文件 @
7b64f6cf
...
...
@@ -66,7 +66,7 @@ class StandardController extends AppfrontController
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
return
Yii
::
$service
->
url
->
redirectByUrlKey
(
'checkout/onepage'
);
...
...
app/apphtml5/modules/Checkout/block/onepage/Placeorder.php
浏览文件 @
7b64f6cf
...
...
@@ -79,7 +79,7 @@ class Placeorder
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
}
...
...
app/apphtml5/modules/Checkout/controllers/CartController.php
浏览文件 @
7b64f6cf
...
...
@@ -72,7 +72,7 @@ class CartController extends AppfrontController
$innerTransaction
->
rollBack
();
exit
;
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
}
...
...
@@ -104,7 +104,7 @@ class CartController extends AppfrontController
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
...
...
@@ -181,7 +181,7 @@ class CartController extends AppfrontController
$innerTransaction
->
commit
();
exit
;
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
}
else
{
...
...
@@ -217,7 +217,7 @@ class CartController extends AppfrontController
]);
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
exit
;
...
...
@@ -243,7 +243,7 @@ class CartController extends AppfrontController
]);
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
exit
;
...
...
@@ -268,7 +268,7 @@ class CartController extends AppfrontController
]);
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
exit
;
...
...
app/apphtml5/modules/Payment/block/paypal/express/Placeorder.php
浏览文件 @
7b64f6cf
...
...
@@ -68,7 +68,7 @@ class Placeorder
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
//echo 22;
...
...
@@ -114,7 +114,7 @@ class Placeorder
$innerTransaction
->
rollBack
();
return
false
;
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
return
false
;
}
...
...
@@ -129,7 +129,7 @@ class Placeorder
}else{
$innerTransaction->rollBack();
}
} catch (Exception $e) {
} catch (
\
Exception $e) {
$innerTransaction->rollBack();
}
}
...
...
app/apphtml5/modules/Payment/block/paypal/standard/Placeorder.php
浏览文件 @
7b64f6cf
...
...
@@ -83,7 +83,7 @@ class Placeorder
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
}
...
...
app/apphtml5/modules/Payment/controllers/alipay/StandardController.php
浏览文件 @
7b64f6cf
...
...
@@ -80,7 +80,7 @@ class StandardController extends AppfrontController
}else{
$innerTransaction->rollBack();
}
} catch (Exception $e) {
} catch (
\
Exception $e) {
$innerTransaction->rollBack();
}
return Yii::$service->url->redirectByUrlKey('checkout/onepage');
...
...
app/apphtml5/modules/Payment/controllers/paypal/StandardController.php
浏览文件 @
7b64f6cf
...
...
@@ -65,7 +65,7 @@ class StandardController extends AppfrontController
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
return
Yii
::
$service
->
url
->
redirectByUrlKey
(
'checkout/onepage'
);
...
...
app/appserver/modules/Checkout/block/onepage/Placeorder.php
浏览文件 @
7b64f6cf
...
...
@@ -116,7 +116,7 @@ class Placeorder
return
$responseData
;
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
...
...
app/appserver/modules/Checkout/controllers/CartController.php
浏览文件 @
7b64f6cf
...
...
@@ -178,7 +178,7 @@ class CartController extends AppserverController
return
$responseData
;
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
}
else
{
...
...
@@ -218,7 +218,7 @@ class CartController extends AppserverController
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
$error_arr
=
Yii
::
$service
->
helper
->
errors
->
get
(
true
);
...
...
@@ -308,7 +308,7 @@ class CartController extends AppserverController
return
$responseData
;
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
$code
=
Yii
::
$service
->
helper
->
appserver
->
cart_coupon_invalid
;
$data
=
[
...
...
@@ -355,7 +355,7 @@ class CartController extends AppserverController
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
$code
=
Yii
::
$service
->
helper
->
appserver
->
cart_product_update_qty_fail
;
...
...
@@ -384,7 +384,7 @@ class CartController extends AppserverController
$data
=
[];
$responseData
=
Yii
::
$service
->
helper
->
appserver
->
getResponseData
(
$code
,
$data
);
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
...
...
@@ -409,7 +409,7 @@ class CartController extends AppserverController
$data
=
[];
$responseData
=
Yii
::
$service
->
helper
->
appserver
->
getResponseData
(
$code
,
$data
);
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
...
...
app/appserver/modules/Payment/block/paypal/express/Placeorder.php
浏览文件 @
7b64f6cf
...
...
@@ -74,7 +74,7 @@ class Placeorder
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
//echo 22;
...
...
@@ -135,7 +135,7 @@ class Placeorder
return
$responseData
;
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
}
else
{
...
...
@@ -161,7 +161,7 @@ class Placeorder
}else{
$innerTransaction->rollBack();
}
} catch (Exception $e) {
} catch (
\
Exception $e) {
$innerTransaction->rollBack();
}
}
...
...
app/appserver/modules/Payment/block/paypal/standard/Placeorder.php
浏览文件 @
7b64f6cf
...
...
@@ -83,7 +83,7 @@ class Placeorder
}
else
{
$innerTransaction
->
rollBack
();
}
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
$code
=
Yii
::
$service
->
helper
->
appserver
->
order_paypal_standard_updateorderinfoafterpayment_fail
;
...
...
app/appserver/modules/Payment/controllers/alipay/StandardController.php
浏览文件 @
7b64f6cf
...
...
@@ -99,7 +99,7 @@ class StandardController extends AppserverController
}else{
$innerTransaction->rollBack();
}
} catch (Exception $e) {
} catch (
\
Exception $e) {
$innerTransaction->rollBack();
}
return Yii::$service->url->redirectByUrlKey('checkout/onepage');
...
...
app/appserver/modules/Payment/controllers/paypal/StandardController.php
浏览文件 @
7b64f6cf
...
...
@@ -81,7 +81,7 @@ class StandardController extends AppserverController
}else{
$innerTransaction->rollBack();
}
} catch (Exception $e) {
} catch (
\
Exception $e) {
$innerTransaction->rollBack();
}
return Yii::$service->url->redirectByUrlKey('checkout/onepage');
...
...
services/Order.php
浏览文件 @
7b64f6cf
...
...
@@ -979,7 +979,7 @@ class Order extends Service
//$one->save();
$innerTransaction
->
commit
();
$logMessage
[]
=
'cancel order[end] increment_id: '
.
$one
[
'increment_id'
];
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
$innerTransaction
->
rollBack
();
}
}
...
...
services/cart/Coupon.php
浏览文件 @
7b64f6cf
...
...
@@ -440,7 +440,7 @@ class Coupon extends Service
}
//Yii::$service->helper->errors->add('add coupon fail');
//$innerTransaction->rollBack();
//} catch (Exception $e) {
//} catch (
\
Exception $e) {
//Yii::$service->helper->errors->add('add coupon fail');
//$innerTransaction->rollBack();
//}
...
...
services/cms/article/ArticleMysqldb.php
浏览文件 @
7b64f6cf
...
...
@@ -200,7 +200,7 @@ class ArticleMysqldb extends Service implements ArticleInterface
}
}
$innerTransaction
->
commit
();
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
Yii
::
$service
->
helper
->
errors
->
add
(
'Article Remove Errors: transaction rollback'
);
$innerTransaction
->
rollBack
();
...
...
@@ -216,7 +216,7 @@ class ArticleMysqldb extends Service implements ArticleInterface
Yii
::
$service
->
url
->
removeRewriteUrlKey
(
$url_key
);
$model
->
delete
();
$innerTransaction
->
commit
();
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
Yii
::
$service
->
helper
->
errors
->
add
(
'Article Remove Errors: transaction rollback'
);
$innerTransaction
->
rollBack
();
}
...
...
services/payment/Paypal.php
浏览文件 @
7b64f6cf
...
...
@@ -394,7 +394,7 @@ class Paypal extends Service
}
//$innerTransaction->commit();
return
true
;
//} catch (Exception $e) {
//} catch (
\
Exception $e) {
// $innerTransaction->rollBack();
//}
//return false;
...
...
services/url/rewrite/RewriteMysqldb.php
浏览文件 @
7b64f6cf
...
...
@@ -165,7 +165,7 @@ class RewriteMysqldb extends Service implements RewriteInterface
}
}
$innerTransaction
->
commit
();
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
Yii
::
$service
->
helper
->
errors
->
add
(
'UrlRewrite Remove Errors: transaction rollback'
);
$innerTransaction
->
rollBack
();
...
...
@@ -180,7 +180,7 @@ class RewriteMysqldb extends Service implements RewriteInterface
$url_key
=
$model
[
'url_key'
];
$model
->
delete
();
$innerTransaction
->
commit
();
}
catch
(
Exception
$e
)
{
}
catch
(
\
Exception
$e
)
{
Yii
::
$service
->
helper
->
errors
->
add
(
'UrlRewrite Remove Errors: transaction rollback'
);
$innerTransaction
->
rollBack
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录