Skip to content

M
my-yaf-project
Commit 79d505d5 authored by zhz's avatar zhz
Browse files
Options

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

parents c9bb5ec9 b88491e1
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 14 deletions
application/controllers/Index.php
View file @ 79d505d5
......@@ -52,6 +52,16 @@ class IndexController extends \Our\Controller_Abstract {
}
public function indexAction() {
$browseDAO = \DAO\GoodsBrowseModel::getInstance();
$month = date('m');
$year = date('Y');
$sort = isset($param['sort']) ? (int)$param['sort'] : 1;
$sort == 1 ? $order = ['browsedate','ASC'] : $order = ['browsedate','DESC'];
$startTime = mktime(0,0,0,$month-2,1,$year);
$endTime = mktime(0,0,-1,$month+1,1,$year);
$res=$browseDAO->getDistinctDate(1,$startTime,$endTime);
echo json_encode($res);exit;
//$list = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsBrowserRedisModel::getInstance(),array(&$browseDAO, 'getDistinctDate'),array($memberId,$startTime,$endTime,$order),\Our\ApiConst::twoMinSecond,array($memberId));
// $clientPush=\JPush\ClientPush::getInstance();
// $clientPush->pushAll();
$mongoDb= new \Mongo\MongoDbModel();
......
application/models/DAO/Coupon/Coupon.php
View file @ 79d505d5
......@@ -23,9 +23,9 @@ class CouponModel extends \DAO\AbstractModel {
*/
protected $_primaryKey = 'id';
protected $availStoreIndexField = 'id,type,FORMAT(cash_money/100,2) as cash_money,FORMAT(order_amount/100,2) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,gift_coupon_id';
protected $availTitleField = 'id,type,FORMAT(cash_money/100,2) as cash_money,FORMAT(order_amount/100,2) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,gift_coupon_id,ids';
protected $availCartStoreIndexField = 'id,type,FORMAT(cash_money/100,2) as cash_money,FORMAT(order_amount/100,2) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,ids,gift_coupon_id,gift_goods_ids';
protected $availStoreIndexField = 'id,type,ROUND(cash_money/100,0) as cash_money,ROUND(order_amount/100,0) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,gift_coupon_id';
protected $availTitleField = 'id,type,ROUND(cash_money/100,0) as cash_money,ROUND(order_amount/100,0) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,gift_coupon_id,ids';
protected $availCartStoreIndexField = 'id,type,ROUND(cash_money/100,0) as cash_money,ROUND(order_amount/100,0) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,ids,gift_coupon_id,gift_goods_ids';
public function init(){
......@@ -223,7 +223,7 @@ class CouponModel extends \DAO\AbstractModel {
return $coupons;
}
public function getCartCouponTitles($where,$field = 'id,type,FORMAT(cash_money/100,2) as cash_money,FORMAT(order_amount/100,2) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,ids,gift_coupon_id,gift_goods_ids'){
public function getCartCouponTitles($where,$field = 'id,type,ROUND(cash_money/100,2) as cash_money,ROUND(order_amount/100,2) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,ids,gift_coupon_id,gift_goods_ids'){
$coupons = $this->getList($where,$field);
if($coupons){
$result = array();
......@@ -233,9 +233,9 @@ class CouponModel extends \DAO\AbstractModel {
$temp['type'] = $coupon['type'];
$temp['couponId'] = $coupon['id'];
$temp['store_id'] = $coupon['store_id'];
$temp['order_amount'] = $coupon['order_amount'];
$temp['order_amount'] = intval($coupon['order_amount']);
$temp['discount'] = $coupon['discount'];
$temp['cash_money'] = $coupon['cash_money'];
$temp['cash_money'] = intval($coupon['cash_money']);
$temp['ids'] = $coupon['ids'];
$temp['gift_coupon_id'] = isset($coupon['gift_coupon_id'])?$coupon['gift_coupon_id']:\Our\ApiConst::zero;
$temp['gift_goods_ids'] = isset($coupon['gift_goods_ids'])?$coupon['gift_goods_ids']:\Our\NameConst::emptyString;
......@@ -272,7 +272,7 @@ class CouponModel extends \DAO\AbstractModel {
$temp['type'] = $coupon['coupon_type'];
$temp['couponId'] = $coupon['id'];
$temp['is_overlay'] = $coupon['is_overlay'];
$orderAmount = intval($coupon['order_amount']);
$orderAmount = (int)$coupon['order_amount'];
if($coupon['type'] == \Our\ApiConst::noLimitCoupon){//无门槛优惠券
$temp['type'] = \Our\ApiConst::noLimitCouponType;
$temp['title'] = intval($coupon['cash_money']);
......@@ -502,11 +502,9 @@ class CouponModel extends \DAO\AbstractModel {
*/
public function deleteCouponCache($storeId,$couponId=false){
$couponService = \Business\Coupon\CouponServiceModel::getInstance();
$memberCouponDao = \DAO\Coupon\MemberCouponModel::getInstance();
if($couponId){
\Our\RedisHelper::delCachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$memberCouponDao, 'getList'),array(),array($couponId));
\Redis\Db13\CouponRedisModel::getInstance()->tableDel($couponId);
}
//\Our\RedisHelper::delCachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$this, 'getStorePromotionCouponList'),array(),array($storeId));
\Our\RedisHelper::delCachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$couponService, 'getStoreCouponsById'),array(),array($storeId));
\Our\RedisHelper::delCachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$this, 'getOnlineCouponList'),array(),array($storeId));
return true;
......
conf/application.ini
View file @ 79d505d5
......@@ -25,10 +25,10 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
;
; ; 从库配置
resources.database.slave.params.driver = "pdo_mysql"
resources.database.slave.params.hostname = "172.16.142.15"
resources.database.slave.params.hostname = "127.0.0.1"
resources.database.slave.params.port = 3306
resources.database.slave.params.database = "qmcs"
resources.database.slave.params.username = "root"
resources.database.slave.params.username = "qmcsreader"
resources.database.slave.params.password = "!@#$%12345werty"
resources.database.slave.params.charset = "UTF8"
resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
......@@ -71,10 +71,10 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
; 从库配置
resources.database.slave.params.driver = "pdo_mysql"
resources.database.slave.params.hostname = "127.0.0.1"
resources.database.slave.params.hostname = "172.16.142.13"
resources.database.slave.params.port = 3306
resources.database.slave.params.database = "qmcs"
resources.database.slave.params.username = "root"
resources.database.slave.params.username = "qmcsreader"
resources.database.slave.params.password = "!@#$%12345werty"
resources.database.slave.params.charset = "UTF8"
resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
......
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