Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
d62122d6
Commit
d62122d6
authored
Sep 08, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
首页地址返回经纬度
parent
b8e366d0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
OrderConfirmUtil.php
application/library/Order/OrderConfirmUtil.php
+1
-1
CodeConfig.php
application/models/Error/CodeConfig.php
+0
-3
No files found.
application/library/Order/OrderConfirmUtil.php
View file @
d62122d6
...
@@ -221,7 +221,7 @@ class OrderConfirmUtil {
...
@@ -221,7 +221,7 @@ class OrderConfirmUtil {
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
noExpressDeliveryForOrder
);
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
noExpressDeliveryForOrder
);
}
}
if
(
$tempStore
[
'goodsFreight'
]
==
\Our\ApiConst
::
zero
&&!
(
$tempStore
[
'is_transport'
]
&&
$tempStore
[
'transport_id'
]
>
\Our\ApiConst
::
zero
&&
isset
(
$temp
[
'shippingFee'
]))){
if
(
$tempStore
[
'goodsFreight'
]
==
\Our\ApiConst
::
zero
&&!
(
$tempStore
[
'is_transport'
]
&&
$tempStore
[
'transport_id'
]
>
\Our\ApiConst
::
zero
&&
isset
(
$temp
[
'shippingFee'
]))){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
noExpressDeliveryForOrder
1
);
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
noExpressDeliveryForOrder
);
}
}
$deliveryFee
=
$temp
[
'shippingFee'
];
$deliveryFee
=
$temp
[
'shippingFee'
];
}
}
...
...
application/models/Error/CodeConfig.php
View file @
d62122d6
...
@@ -271,8 +271,6 @@ class CodeConfigModel {
...
@@ -271,8 +271,6 @@ class CodeConfigModel {
const
notExsitOrder
=
300112
;
const
notExsitOrder
=
300112
;
const
alreadyExsitRefundGoods
=
300113
;
const
alreadyExsitRefundGoods
=
300113
;
const
notAllowDelete
=
300114
;
const
notAllowDelete
=
300114
;
const
noExpressDeliveryForOrder1
=
300115
;
//店铺相关错误码
//店铺相关错误码
//商品分类
//商品分类
...
@@ -736,7 +734,6 @@ class CodeConfigModel {
...
@@ -736,7 +734,6 @@ class CodeConfigModel {
self
::
blGoodsStorageToCacheFailedForOrder
=>
'组合销售库存更新失败(cache)'
,
self
::
blGoodsStorageToCacheFailedForOrder
=>
'组合销售库存更新失败(cache)'
,
self
::
goodsStorageToCacheFailedForOrder
=>
'普通商品库存更新失败(cache)'
,
self
::
goodsStorageToCacheFailedForOrder
=>
'普通商品库存更新失败(cache)'
,
self
::
notExistOrderGoods
=>
'退款商品不存在'
,
self
::
notExistOrderGoods
=>
'退款商品不存在'
,
self
::
noExpressDeliveryForOrder1
=>
'test123'
,
//销售员
//销售员
self
::
emptySaleGoodsId
=>
'商品id不能为空'
,
self
::
emptySaleGoodsId
=>
'商品id不能为空'
,
self
::
emptySaleGoods
=>
'销售商品不存在'
,
self
::
emptySaleGoods
=>
'销售商品不存在'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment