Skip to content

M
my-yaf-project
Commit 26b48707 authored by christ's avatar christ
Browse files
Options

Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

parents 3ef49a2d 3bd32d21
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
application/models/Business/Store/StoreService.php
View file @ 26b48707
...@@ -200,7 +200,7 @@ class StoreServiceModel extends \Business\AbstractModel{ ...@@ -200,7 +200,7 @@ class StoreServiceModel extends \Business\AbstractModel{
if($sale) { if($sale) {
$sale_act = \DAO\SaleActivityModel::getInstance()->getOne(array('sale_act_id'=>$sale['sale_act_id'],'sale_act_state'=>1),'*'); $sale_act = \DAO\SaleActivityModel::getInstance()->getOne(array('sale_act_id'=>$sale['sale_act_id'],'sale_act_state'=>1),'*');
if($sale_act && $sale_act['sale_start_date'] >= time() && $sale_act['sale_end_date'] <= time()){ if($sale_act && $sale_act['sale_start_date'] >= time() && $sale_act['sale_end_date'] <= time()){
\DAO\SaleMemberModel::getInstance()->insertOrUpdate(array('sale_id'=>$sale['member_id'],'sale_act_id'=>$sale['sale_act_id'],'member_id'=>$memberId,'store_id'=>$storeId)); \DAO\SaleMemberModel::getInstance()->insertOrUpdate(array('sale_id'=>$sale['member_id'],'sale_act_id'=>$sale['sale_act_id'],'member_id'=>$memberId,'store_id'=>$sale_act['store_id']));
\Redis\Db4\SaleActivityRedisModel::getInstance()->tableDel('storeId:'.$storeId); \Redis\Db4\SaleActivityRedisModel::getInstance()->tableDel('storeId:'.$storeId);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment