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
efa8e069
Commit
efa8e069
authored
Sep 07, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
d75dd879
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
OrderService.php
application/models/Business/Order/OrderService.php
+2
-2
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+1
-1
No files found.
application/models/Business/Order/OrderService.php
View file @
efa8e069
...
@@ -789,7 +789,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -789,7 +789,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderId
=
$delivery
[
'orderId'
];
$orderId
=
$delivery
[
'orderId'
];
//订单
//订单
$order
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'findByOrderId'
),
array
(
$orderId
),
\Our\ApiConst
::
oneDaySecond
);
$order
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'findByOrderId'
),
array
(
$orderId
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$orderId
)
);
if
(
empty
(
$order
))
{
if
(
empty
(
$order
))
{
ErrorModel
::
throwException
(
CodeConfigModel
::
notExsitOrder
);
ErrorModel
::
throwException
(
CodeConfigModel
::
notExsitOrder
);
}
}
...
@@ -1007,7 +1007,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -1007,7 +1007,7 @@ class OrderServiceModel extends \Business\AbstractModel
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
emptyOrderIdForPay
);
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
emptyOrderIdForPay
);
}
}
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$order
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'findByOrderId'
),
array
(
$orderId
),
\Our\ApiConst
::
oneDaySecond
);
$order
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'findByOrderId'
),
array
(
$orderId
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$orderId
)
);
if
(
!
$order
)
{
if
(
!
$order
)
{
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
emptyOrderForPay
);
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
emptyOrderForPay
);
}
}
...
...
application/models/Business/Store/ShopkeeperService.php
View file @
efa8e069
...
@@ -359,7 +359,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -359,7 +359,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$storeDao
=
\DAO\StoreModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$storeDao
=
\DAO\StoreModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$goodsDao
=
\DAO\GoodsModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$goodsDao
=
\DAO\GoodsModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
//订单
//订单
$order
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'findByOrderId'
),
array
(
$orderId
),
\Our\ApiConst
::
oneDaySecond
);
$order
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'findByOrderId'
),
array
(
$orderId
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$orderId
)
);
if
(
$order
[
'store_id'
]
!=
$storeId
)
{
if
(
$order
[
'store_id'
]
!=
$storeId
)
{
ErrorModel
::
throwException
(
CodeConfigModel
::
orderError
);
ErrorModel
::
throwException
(
CodeConfigModel
::
orderError
);
}
}
...
...
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