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
f825bca4
Commit
f825bca4
authored
Jan 07, 2019
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试
parent
4da0ae28
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
OrderConfirmUtil.php
application/library/Order/OrderConfirmUtil.php
+1
-1
PBundling.php
application/models/DAO/PBundling.php
+4
-1
No files found.
application/library/Order/OrderConfirmUtil.php
View file @
f825bca4
...
...
@@ -974,7 +974,7 @@ class OrderConfirmUtil {
$goodsDao
=
\DAO\GoodsModel
::
getInstance
();
if
(
$blGoodsList
){
foreach
(
$blGoodsList
as
$key
=>
$blGoods
){
$pBundlingCacheResult
=
$pBundlingDao
->
opBlGoodsStorage
(
$key
,
$blGoods
[
'blStorage'
],
$op
);
//组合销售库存删减
$pBundlingCacheResult
=
$pBundlingDao
->
updatePBundlingStorageCacheByBlId
(
$key
,
$blGoods
[
'blStorage'
],
$op
);
//组合销售库存删减
if
(
$pBundlingCacheResult
===
false
){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
blGoodsStorageToCacheFailedForOrder
);
}
...
...
application/models/DAO/PBundling.php
View file @
f825bca4
...
...
@@ -192,6 +192,7 @@ class PBundlingModel extends \DAO\AbstractModel {
return
false
;
}
$pBundling
=
$result
[
'result'
];
\Our\Log
::
getInstance
()
->
write
(
json_encode
(
$pBundling
),
'/data/log/apptest'
);
$key
=
$result
[
'key'
];
if
(
$op
==
\Our\ApiConst
::
minus
){
$pBundling
[
'bl_storage'
]
=
$pBundling
[
'bl_storage'
]
-
$blStorage
;
...
...
@@ -204,8 +205,10 @@ class PBundlingModel extends \DAO\AbstractModel {
$pBundling
[
'bl_storage'
]
=
$pBundling
[
'bl_storage'
]
+
$blStorage
;
$pBundling
[
'bl_origin_storage'
]
=
$pBundling
[
'bl_origin_storage'
]
+
$blStorage
;
}
\Our\Log
::
getInstance
()
->
write
(
json_encode
(
$pBundling
),
'/data/log/apptest'
);
\Lock\RedisLock
::
getInstance
()
->
releaseLock
(
\Our\NameConst
::
pBundlingStorageRedisPrefix
.
$blId
);
return
$pBundlingRedisDao
->
setNoPrefix
(
$key
,
$pBundling
,
\Our\ApiConst
::
oneDaySecond
);
\Our\Log
::
getInstance
()
->
write
(
$key
,
'/data/log/apptest'
);
return
$pBundlingRedisDao
->
setNoPrefix
(
$key
,
serialize
(
$pBundling
),
\Our\ApiConst
::
oneDaySecond
);
}
...
...
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