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
6f46c9b8
Commit
6f46c9b8
authored
Nov 24, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
012b0122
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
OrderService.php
application/models/Business/Order/OrderService.php
+2
-0
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+1
-1
Store.php
application/models/DAO/Store.php
+5
-1
No files found.
application/models/Business/Order/OrderService.php
View file @
6f46c9b8
...
...
@@ -908,6 +908,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderLogDao
=
\DAO\Order\OrderLogModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$orderDetail
=
$orderDao
->
getByOrderId
(
$orderId
,
$orderDao
->
getOrderDetailField
());
$orderDetail
=
$orderDetail
[
ApiConst
::
arrBegin
];
$storeDao
=
\DAO\StoreModel
::
getInstance
();
if
(
$orderDetail
[
'storeId'
]
!=
$storeId
){
ErrorModel
::
throwException
(
CodeConfigModel
::
orderNotExist
);
}
...
...
@@ -917,6 +918,7 @@ class OrderServiceModel extends \Business\AbstractModel
$data
[
'order_amount'
]
=
$newOrderAmount
;
$res
=
$orderDao
->
updateByOrderId
(
$data
,
$orderId
);
$orderDao
->
deleteOrderCache
(
$orderDetail
[
'memberId'
],
$orderId
,
$storeId
,
true
);
$storeDao
->
$orderLogDao
->
add
(
$orderDetail
[
'orderId'
],
ArrayConst
::
logMsgType
[
ApiConst
::
sellerUpdateOrderAmount
],
DescribeConst
::
sellerLog
,
$memberName
,
$orderDetail
[
'orderState'
]);
return
$res
;
}
...
...
application/models/Business/Store/ShopkeeperService.php
View file @
6f46c9b8
...
...
@@ -508,7 +508,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$qmDeliveryManLogWhere
[
'order_id'
]
=
$orderId
;
$qmDeliveryManLogWhere
[
'order_type'
]
=
ApiConst
::
orderTypeBuy
;
$qmDeliveryManLog
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$
orderCommon
Dao
,
'find'
),
array
(
$qmDeliveryManLogWhere
,
$qmDeliveryManLogDao
->
fieldDetail
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$orderId
));
$qmDeliveryManLog
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$
qmDeliveryManLog
Dao
,
'find'
),
array
(
$qmDeliveryManLogWhere
,
$qmDeliveryManLogDao
->
fieldDetail
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$orderId
));
//$this->orderCommon = $orderCommonDao->findByOrderId($orderId, $this->orderCommonField);
$reciverInfo
=
$this
->
orderCommon
[
'reciverInfo'
];
$reciverInfo
=
unserialize
(
$reciverInfo
);
...
...
application/models/DAO/Store.php
View file @
6f46c9b8
...
...
@@ -249,10 +249,14 @@ class StoreModel extends \DAO\AbstractModel
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'findByOrderId'
),
array
(),
array
(
$orderId
));
}
}
public
function
deleteStoreCache
(
$storeId
){
public
function
deleteStoreCache
(
$storeId
,
$orderId
){
if
(
!
empty
(
$storeId
)){
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$this
,
'getList'
),
array
(),
array
(
$storeId
));
}
if
(
!
empty
(
$orderId
)){
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'findByOrderId'
),
array
(),
array
(
$orderId
));
}
}
public
function
getStoresByCityCode
(
$cityCode
,
$field
=
'store_id,store_longitude,store_latitude,max_sign_rang,max_sales_rang,store_sales_scope'
)
...
...
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