Skip to content

M
my-yaf-project
Commit ac3d8447 authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

店铺经纬度地址修改

parents 9b028fd8 bf7a3615
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2452 additions and 45 deletions
application/controllers/Index.php
View file @ ac3d8447
......@@ -52,34 +52,35 @@ class IndexController extends \Our\Controller_Abstract {
}
public function indexAction() {
echo 1;exit;
$orderDao = \DAO\Order\OrderModel::getInstance();
$res=$orderDao->getList(array('buyer_id'=>1),'*',0,10);
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));
//// echo 1;exit;
//// $orderDao = \DAO\Order\OrderModel::getInstance();
////
//// $res=$orderDao->getList(array('buyer_id'=>1),'*',0,10);
//// 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();
$res= $mongoDb->insert('message_history',array('id'=>1,'name'=>'chenchuanwen'));
echo json_encode($res);
exit;
\Our\Log::getInstance()->write('testLog|||||testLog');
var_dump($_SERVER);exit;
// echo $_SERVER['USER']);exit;
$elasticConfig=\Our\Common::getConfig('elastic.master');
$configArray=array(
$elasticConfig->host.':'.$elasticConfig->port,
);
$client=\Elasticsearch\ClientBuilder::create()->setHosts($configArray)->build();
$res=array(
'id'=>'nignx-log*',
'index'=>'.kibana',
'type'=>'index-pattern'
);
$res=$client->getSource($res);
echo json_encode($res);
exit;
// exit;
// $mongoDb= new \Mongo\MongoDbModel();
// $res= $mongoDb->insert('message_history',array('id'=>1,'name'=>'chenchuanwen'));
// echo json_encode($res);
// exit;
// \Our\Log::getInstance()->write('testLog|||||testLog');
// var_dump($_SERVER);exit;
// // echo $_SERVER['USER']);exit;
// $elasticConfig=\Our\Common::getConfig('elastic.master');
// $configArray=array(
// $elasticConfig->host.':'.$elasticConfig->port,
// );
// $client=\Elasticsearch\ClientBuilder::create()->setHosts($configArray)->build();
// $res=array(
// 'id'=>'nignx-log*',
// 'index'=>'.kibana',
// 'type'=>'index-pattern'
// );
// $res=$client->getSource($res);
// echo json_encode($res);
// exit;
}
public function check(){
......
application/controllers/Message.php
View file @ ac3d8447
......@@ -58,6 +58,20 @@ class MessageController extends \Our\Controller_AbstractApi {
\Error\ErrorModel::throwException(\Error\CodeConfigModel::removeMessage);
}
}
/**
* 更新webim消息
*
* @ccw
*/
public function removeAllAction(){
$messageService = \Business\Message\MessageServiceModel::getInstance();
$res=$messageService->update($this->memberId,$this->req['data']['fromType'],$this->req['data']['toId'],$this->req['data']['toType']);
if($res!==false){
$this->success($res,'删除成功');
}else{
\Error\ErrorModel::throwException(\Error\CodeConfigModel::removeMessage);
}
}
/**
* 更新webim消息
*
......@@ -139,9 +153,11 @@ class MessageController extends \Our\Controller_AbstractApi {
}
public function setAction(){
$messageService = \Business\Message\MessageServiceModel::getInstance();
$pushSet['canPush']=$this->req['data']['canPush'];
$pushSet['sound']=$this->req['data']['sound'];
$pushSet['vibrate']=$this->req['data']['vibrate'];
$memberCenterService=\Business\User\MemberCenterServiceModel::getInstance();
$messageSet=$memberCenterService->getMessageSet($this->memberId);
$pushSet['canPush']=!empty($this->req['data']['canPush'])?$this->req['data']['canPush']:$messageSet['canPush'];
$pushSet['sound']=!empty($this->req['data']['sound'])?$this->req['data']['sound']:$messageSet['sound'];
$pushSet['vibrate']=!empty($this->req['data']['vibrate'])?$this->req['data']['vibrate']:$messageSet['vibrate'];
$pushSet['timeDiff']=$this->req['data']['timeDiff'];
if(isset($pushSet['canPush'])&& isset($pushSet['sound']) && isset($pushSet['vibrate']) ){
$res=$messageService->set($this->memberId,$pushSet);
......
application/controllers/Order.php
View file @ ac3d8447
......@@ -55,7 +55,8 @@ class OrderController extends \Our\Controller_AbstractApi {
public function getExpressAction(){
$orderService=\Business\Order\OrderServiceModel::getInstance();
// $expreddInfo= $orderService->getExpressInfo($this->req[\Our\NameConst::data]['orderId']);
$expreddInfo=\Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),array(&$orderService, 'getExpressInfo'),array($this->req[\Our\NameConst::data]['orderId']),\Our\ApiConst::oneHour);;
$expreddInfo=\Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),array(&$orderService, 'getExpressInfo'),array($this->req[\Our\NameConst::data]['orderId']),\Our\ApiConst::oneHour,array($this->req[\Our\NameConst::data]['orderId']));;
$this->success($expreddInfo,\Our\DescribeConst::getExpreeSuccess);
}
......
application/library/Our/ArrayConst.php
View file @ ac3d8447
......@@ -27,9 +27,9 @@ class ArrayConst
);
//配送方式
const refundShippingType=array(
ApiConst::bySelf=>array('id'=>ApiConst::bySelf,'name'=>"买家自退"),
ApiConst::bySeller=>array('id'=>ApiConst::bySeller,'name'=>"商家配取"),
ApiConst::express=>array('id'=>ApiConst::express,'name'=>"快递"),
ApiConst::bySelf=>array('id'=>ApiConst::bySelf,'name'=>"退货到店"),
ApiConst::bySeller=>array('id'=>ApiConst::bySeller,'name'=>"商家取货"),
// ApiConst::express=>array('id'=>ApiConst::express,'name'=>"快递"),
);
const payTypeOnlines=array(
ApiConst::wxAppPayType,
......
application/library/Our/Common.php
View file @ ac3d8447
......@@ -57,6 +57,19 @@ class Common
return isset($httpStatusCodes[$num]) ? $httpStatusCodes[$num] : '';
}
public static function isCurentTimeInSection($begin,$end)
{
$checkDayStr = date('Y-m-d ',time());
$timeBegin1 = strtotime($checkDayStr.$begin.":00");
$timeEnd1 = strtotime($checkDayStr.$end.":00");
$curr_time = time();
if($curr_time >= $timeBegin1 && $curr_time <= $timeEnd1)
{
return true;
}
return false;
}
public static function isSerialized( $data ) {
$data = trim( $data );
if ( 'N;' == $data )
......
application/models/Business/Message/MessageService.php
View file @ ac3d8447
......@@ -296,7 +296,25 @@ class MessageServiceModel extends \Business\AbstractModel
}
return $isSuccess;
}
/**
* 删除用户消息
*
* @ccw
*/
public function removeAll($memberId, $fromType,$toId,$toType)
{
$memageHistoryDao = \DAO\MessageHistoryModel::getInstance();
$where=Common::format(" (fromId={0} and fromType={1} and toId={2} and toType={3} and isDel={4}) or (fromId={2} and fromType={3} and toId={0} and toType={1} and idDel={5})",$memberId,$fromType,$toId,$toType,ApiConst::sendRemove);
$data['isDel']=ApiConst::remove;
$memageHistoryDao->updateByWhere($where,$data);
$where=Common::format(" fromId={0} and fromType={1} and toId={2} and toType={3} and isDel={4}",$memberId,$fromType,$toId,$toType,ApiConst::zero);
$data['isDel']=ApiConst::sendRemove;
$memageHistoryDao->updateByWhere($where,$data);
$where=Common::format(" fromId={2} and fromType={3} and toId={0} and toType={1} and isDel={4}",$memberId,$fromType,$toId,$toType,ApiConst::zero);
$data['isDel']=ApiConst::recieveRemove;
$memageHistoryDao->updateByWhere($where,$data);
return true;
}
/**
* 获得消息按钮
*
......
application/models/Business/Order/OrderService.php
View file @ ac3d8447
......@@ -402,7 +402,7 @@ class OrderServiceModel extends \Business\AbstractModel
$return['goodsImage'] = \Our\ImageUtil::getGoodsImgUrl($orderGoods['goodsImage'], ArrayConst::goodsImageExt[ApiConst::goodsSmallSize]);
$return['goodsAttr'] = $goodsDao->getFormatGoodsAttr($orderGoods['goodsSpec']);
$return['orderPrice'] = $order['orderAmount'];
$return['expressInfo'] = $order['shippingHtml'];
$return['expressInfo'] = !empty($order['shippingHtml'])?$order['shippingHtml']:[];
$return['shippingStatus'] = $order['shippingStatus'];
$return['sendTime'] = $order['sendTime'];
$return['rechedTime'] = $order['shippingSign'];
......
application/models/Business/Store/StoreService.php
View file @ ac3d8447
......@@ -903,7 +903,23 @@ class StoreServiceModel extends \Business\AbstractModel{
}
}
}
public function growStores(){
$storeDao=\DAO\StoreModel::getInstance();
$memberDao = \DAO\MemberModel::getInstance();
$res =$storeDao->getAll();
for($i=0;$i<1000000;$i++){
$memberId=50000+$i;
$re=array_rand($res);
if(!empty($res[$re])){
$data=$res[$re];
$data['member_id']=$memberId;
$data['member_mobile']=(int)$data['member_mobile']+$i;
$data['store_id']=$memberId;
$memberDao->addInfo($data);
echo '增加数据'.$i.'条member_id 是:'.$memberId."\n";
}
}
}
/**
*/
private static $_instance = null;
......
application/models/Business/User/MemberService.php
View file @ ac3d8447
......@@ -944,6 +944,23 @@ class MemberServiceModel extends \Business\AbstractModel
return true;
}
public function growMembers(){
$memberDao=\DAO\MemberModel::getInstance();
$res =$memberDao->getAll();
for($i=0;$i<1000000;$i++){
$memberId=50000+$i;
$re=array_rand($res);
if(!empty($res[$re])){
$data=$res[$re];
$data['member_id']=$memberId;
$data['member_mobile']=(int)$data['member_mobile']+$i;
$data['store_id']=$memberId;
$memberDao->add($data);
echo '增加数据'.$i.'条member_id 是:'.$memberId."\n";
}
}
}
}
application/models/DAO/Draw/DrawGoods.php 0 → 100644
View file @ ac3d8447
This diff is collapsed.
application/models/DAO/Draw/DrawTable.php 0 → 100644
View file @ ac3d8447
This diff is collapsed.
application/models/DAO/Member.php
View file @ ac3d8447
......@@ -118,8 +118,9 @@ class MemberModel extends \DAO\AbstractModel
*/
public function addInfo($data)
{
$this->setDb(\Our\DbNameConst::masterDBConnectName);
$result = $this->db->insert($this->_tableName)->rows($data)->execute();
// $this->setDb(\Our\DbNameConst::masterDBConnectName);
// $result = $this->db->insert($this->_tableName)->rows($data)->execute();
$result=$this->add($data);
if ($result) {
$memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance();
$memberAvatar = '';
......@@ -135,6 +136,16 @@ class MemberModel extends \DAO\AbstractModel
return false;
}
/**
* 保存用户信息
*/
public function add($data)
{
$this->setDb(\Our\DbNameConst::masterDBConnectName);
$result = $this->db->insert($this->_tableName)->rows($data)->execute();
return $result;
}
/**
* 类实例
......@@ -601,4 +612,22 @@ class MemberModel extends \DAO\AbstractModel
\Error\ErrorModel::throwException(\Error\CodeConfigModel::passwordLimit);
}
}
public function getAll($where=array()){
$this->setDb($this->dbName);
if($where){
$where=$this->db->getSqlWhereByArray($where);
}
if($where){
$res=$this->db->from($this->_tableName)->where($where)->fetchAll();
}else{
$res=$this->db->from($this->_tableName)->fetchAll();
}
$resArray=array();
foreach($res as $val){
$resArray[$val['member_id']]=$val;
}
return $resArray;
}
}
application/models/DAO/Order/Order.php
View file @ ac3d8447
......@@ -880,7 +880,8 @@ class OrderModel extends \DAO\AbstractModel
$orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId);
$orderCommonDao= \DAO\Order\OrderCommonModel::getInstance(DbNameConst::masterDBConnectName);
\Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array(),array($orderId));
// $orderService=\Business\Order\OrderServiceModel::getInstance();
// \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),array(&$orderService, 'getExpressInfo'),array(),array($orderId));
}
return true;
......
application/models/DAO/Store.php
View file @ ac3d8447
......@@ -440,4 +440,22 @@ class StoreModel extends \DAO\AbstractModel
);
}
public function getAll($where=array()){
$this->setDb($this->dbName);
if($where){
$where=$this->db->getSqlWhereByArray($where);
}
if($where){
$res=$this->db->from($this->_tableName)->where($where)->fetchAll();
}else{
$res=$this->db->from($this->_tableName)->fetchAll();
}
$resArray=array();
foreach($res as $val){
$resArray[$val['member_id']]=$val;
}
return $resArray;
}
}
conf/application.ini
View file @ ac3d8447
......@@ -229,7 +229,7 @@ push.open=1
[ccwdevelop : common]
; 数据库配置
resources.database.params.driver = "pdo_mysql"
resources.database.params.hostname = "127.0.0.1"
resources.database.params.hostname = "192.168.1.201"
resources.database.params.port = 3306
resources.database.params.database = "qmcs"
resources.database.params.username = "root"
......@@ -239,7 +239,7 @@ 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 = "192.168.1.201"
resources.database.slave.params.port = 3306
resources.database.slave.params.database = "qmcs"
resources.database.slave.params.username = "root"
......
public/jpush.log
View file @ ac3d8447
Send POST https://api.jpush.cn/v3/push, body:{"platform":"all","audience":"all","notification":{"alert":"Hi, JPush"},"options":{"sendno":1913510038,"apns_production":false}}, times:1
Send POST https://api.jpush.cn/v3/push, body:{"platform":"all","audience":"all","notification":{"alert":"Hi, JPush"},"options":{"sendno":93988000,"apns_production":false}}, times:1
Send POST https://api.jpush.cn/v3/push, body:{"platform":"all","audience":"all","notification":{"alert":"Hi, JPush"},"options":{"sendno":54209,"apns_production":false}}, times:1
scripts/crontab/growGoodsStores/grow.php 100755 → 100644
View file @ ac3d8447
......@@ -68,11 +68,12 @@ class cliGrow extends basecli
}
$this->bDoUnLock = true;
file_put_contents($this->lockFileName, "running"); // CLI 独占锁
$goodsCommonStrorageDao = \DAO\Storage\GoodsCommonStorageModel::getInstance();
$goodsStorageDao = \DAO\Storage\GoodsStorageModel::getInstance();
$goodsImagesStorageDao = \DAO\Storage\GoodsImagesStorageModel::getInstance();
$memberService=\Business\User\MemberServiceModel::getInstance();
try {
$goodsCommonStrorageDao->createTestData();
$memberService->growMembers();
// $goodsCommonStrorageDao->createTestData();
} catch (Exception $ex) {
throw new Exception($ex->getCode() . '|' . $ex->getMessage());
......
scripts/crontab/growGoodsStores/growStore.php 0 → 100644
View file @ ac3d8447
<?php
/**
* 生成店铺订单索引
* 执行时间：每分钟执行一次
*
* @author chenjiebin <sjlinyu@qq.com>
*/
define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../../../')); //指向public的上一级
require APPLICATION_PATH . '/scripts/crontab/baseCli.php';
require APPLICATION_PATH . '/scripts/crontab/common.php';
error_reporting(E_ALL ^ E_NOTICE);
class cliGrowStore extends basecli
{
const CLI_ADMIN_ID = 255;
private $bDoUnLock = FALSE; // 是否允许释放 LOCK 文件
private $_debug = 0;
private $lockFileName;
public $key='';
private $fromState;
private function mkdirs($dir, $mode = 0777)
{
if (is_dir($dir) || @mkdir($dir, $mode)) {
return TRUE;
}
if (!$this->mkdirs(dirname($dir), $mode)) {
return FALSE;
}
return @mkdir($dir, $mode);
}
/**
* 析构
*/
public function __destruct()
{
parent::__destruct();
if ($this->bDoUnLock) {
@unlink($this->lockFileName);
}
}
protected function _runCli()
{
$this->_debug = isset($this->aArgv[1]) ? intval($this->aArgv[1]) : 0;
if ($this->_debug) {
echo "*** Debug mode ***\n";
}
// Step: 02 检查是否已有相同CLI在运行中
$lockDir = $this->_getBaseFileName('growGoodsStores');
if (!$this->mkdirs($lockDir)) {
echo '****create dir fail ****';
exit;
}
$this->lockFileName = $lockDir . DS . 'cliGrowStore.locks';
if (file_exists($this->lockFileName)) {
$stat = stat($this->lockFileName);
if ((TIMESTAMP - $stat['mtime']) > 1800) {
echo "文件被锁超过1800秒，被强制删除";
@unlink($this->lockFileName);
} else {
$this->halt('[' . date('Y-m-d H:i:s') . '] The CLI is running' . "\n");
}
}
$this->bDoUnLock = true;
file_put_contents($this->lockFileName, "running"); // CLI 独占锁
$storeService=\Business\Store\StoreServiceModel::getInstance();
try {
$storeService->growMembers();
// $goodsCommonStrorageDao->createTestData();
} catch (Exception $ex) {
throw new Exception($ex->getCode() . '|' . $ex->getMessage());
}
echo '店铺生成成功' .date('Y-m-d H:i:s',TIMESTAMP). "\r\n";
}
}
$oCli = new cliGrowStore(TRUE);
EXIT;
?>
scripts/crontab/push/jpush.php
View file @ ac3d8447
......@@ -48,10 +48,26 @@ class cliOrderClose extends basecli
$redis->auth($conf['password']);
}
$clientPush=\JPush\ClientPush::getInstance();
$memberCenterServiceDao=\Business\User\MemberCenterServiceModel::getInstance();
//$messageService=\DAO\MessageHistoryModel::getInstance();
while($pushData=$redis->rPop('push_center')){
$addData = unserialize($pushData);
$addData['message'] = unserialize($addData['message']);
$res=$memberCenterServiceDao->getMessageSet($addData['toId']);
if($res['canPush']!=\Our\ApiConst::one){
continue;
}
// else{
// if(!empty($res['timeDiff'])){
// $timeArr=explode('-',$res['timeDiff']);
// if(!empty($timeArr)){
// if(\Our\Common::isCurentTimeInSection($timeArr[0],$timeArr[1])){
// continue;
// }
// }
// }
//
// }
$clientPush->push($addData);
}
$redis->close();
......
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