Skip to content

M
my-yaf-project
Commit 96bfab8c authored by liuyuzhengrace's avatar liuyuzhengrace
Browse files
Options

Merge branch 'master' of http://git.shenbd.com/api-project-dev/api.shenbd.com into zhz_marketing

parents 9f5996d1 fa331d91
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 28 deletions
application/controllers/Index.php
View file @ 96bfab8c
......@@ -105,7 +105,16 @@ class IndexController extends \Our\Controller_Abstract {
}
exit;
}
public function getInvateHtmlAction(){
$req=$this->getRequest()->getQuery();
if(empty($req['params'] )){
echo 'error';exit;
}
$params=base64_decode($req['params']);
$params=\Our\Common::paramToJson($params);
$this->_view->assign("params", $params);
}
public function testPushAction(){
$clientPush=\JPush\ClientPush::getInstance();
$clientPush->pushTest(array());
......
application/controllers/Member.php 100755 → 100644
View file @ 96bfab8c
......@@ -159,7 +159,7 @@ class MemberController extends \Our\Controller_AbstractApi {
* 该微信是否添加过邀请人
*/
public function hasAddInviterAction () {
$result = $this->memberService->addInviter($this->memberId);
$result = $this->memberService->hasAddInviter($this->memberId);
$this->success($result);
}
}
application/library/Our/Common.php
View file @ 96bfab8c
......@@ -334,6 +334,15 @@ public static function convertArrKey($arr, $key_name)
json_decode($string);
return (json_last_error() == JSON_ERROR_NONE);
}
public static function paramToJson($param)
{
$array = array();
$paramArrs = explode('&', $param);
foreach ($paramArrs as $paramArr) {
$array[strstr($paramArr, '=', true)] = substr(strstr($paramArr, '='), 1);
}
return $array;
}
/**
* sql字符串格式化
......
application/models/Business/Store/StoreService.php 100755 → 100644
View file @ 96bfab8c
......@@ -1333,9 +1333,10 @@ class StoreServiceModel extends \Business\AbstractModel{
public function tryStoreExamine() {
$storeDrainageAmountDao = \DAO\Store\StoreDrainageAmountModel::getInstance();
$storeClassPayLogDao = \DAO\Store\StoreClassPayLogModel::getInstance();
$storeUtil = \Store\StoreUtil::getInstance();
$pageBegin = \Our\PageConst::taskPageBegin;
while (true) {
$stores = $storeDrainageAmountDao->getStoreAndDrainageAmount(array('han_store.store_end_time'=>array('between',TIMESTAMP-\Our\ApiConst::oneDaySecond,TIMESTAMP),'han_store_drainage_amount.gmt_examine'=>0),'han_store.store_citycode,han_store.member_id,han_store_drainage_amount.*',array($pageBegin,1000));
$stores = $storeDrainageAmountDao->getStoreAndDrainageAmount(array('han_store_full.store_end_time'=>array('between',TIMESTAMP-\Our\ApiConst::oneDaySecond,TIMESTAMP),'han_store_drainage_amount.gmt_examine'=>0),'han_store_full.store_citycode,han_store_full.member_id,han_store_full.contract_time,han_store_full.store_end_time,han_store_full.store_phone,han_store_drainage_amount.*',array($pageBegin,1000));
// $stores = $storeDrainageAmountDao->getStoreAndDrainageAmount(array('han_store.store_end_time'=>array('between',0,1648209008),'han_store_drainage_amount.gmt_examine'=>0),'han_store.store_citycode,han_store.member_id,han_store_drainage_amount.*',array($pageBegin,1000));
if(empty($stores)) {
break;
......@@ -1343,16 +1344,19 @@ class StoreServiceModel extends \Business\AbstractModel{
foreach ($stores as $store) {
if($store['amount'] >= 400) {
//自动免费续费 当前签约分类租金2个月
$storeUtil->calcChargeMoney(array('month'=>2,'store_end_time'=>$store['store_end_time'],'contract_time'=>$store['contract_time']));
}elseif ($store['amount'] >= 300) {
//自动免费续费 当前签约分类租金1个月
}elseif ($store['amount'] < 30) {
//查看是否有签约分类续费记录
$log = $storeClassPayLogDao->getStoreClassPayLog(array('store_id'=>$store['store_id'],'pay_state'=>1));
if(empty($log)) {
//店铺下架，下架理由为 试用期考核不合格 并且 发送短信
$this->storeClose($store,\Our\NameConst::tryStoreExamineFail);
}
$storeUtil->calcChargeMoney(array('month'=>1,'store_end_time'=>$store['store_end_time'],'contract_time'=>$store['contract_time']));
}
// elseif ($store['amount'] < 30) {
// //查看是否有签约分类续费记录
// $log = $storeClassPayLogDao->getStoreClassPayLog(array('store_id'=>$store['store_id'],'pay_state'=>1));
// if(empty($log)) {
// //店铺下架，下架理由为 试用期考核不合格 并且 发送短信
// $this->storeClose($store,\Our\NameConst::tryStoreExamineFail);
// }
// }
$storeDrainageAmountDao->editDrainage(array('store_id'=>$store['store_id']),array('gmt_examine'=>TIMESTAMP));
}
$pageBegin = ($pageBegin + 1) * 1000;
......
application/models/Business/User/MemberService.php 100755 → 100644
View file @ 96bfab8c
......@@ -1174,7 +1174,7 @@ class MemberServiceModel extends \Business\AbstractModel
$sess = \Yaf\Session::getInstance();
$authInfo = $sess->get('wxAuthInfo');
$openId = $authInfo['openid'];
$result = \DAO\Store\QmStoreInvite::getInstance()->getQmStoreInviteOne(array('invite_wxappopenid'=>$openId));
$result = \DAO\Store\QmStoreInviteModel::getInstance()->getQmStoreInviteOne(array('invite_wxappopenid'=>$openId));
return array('hasAddInviter'=>$result ? 1 : 0);
}
public function addInviter ($param, $memberId) {
......@@ -1187,22 +1187,22 @@ class MemberServiceModel extends \Business\AbstractModel
$validData['code'] = $param['code'];
$shortMessageDao = \DAO\ShortMessageModel::getInstance();
$shortMessageDao->validCode($validData);
if($inviterTel == $applicantTel) {
\Error\ErrorModel::throwException(\Error\CodeConfigModel::StoreInviterNotBeSelf);
}
if($inviterTel) {
$result = \DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName)->getOneByWhereWithField(" (store_id>0 or is_inviter=1) and member_mobile ='".$inviterTel."'",'member_id');
if(!$result) {
\Error\ErrorModel::throwException(\Error\CodeConfigModel::isNotStoreInviter);
}
}else{
\Error\ErrorModel::throwException(\Error\CodeConfigModel::isNotStoreInviter);
}
// if($inviterTel == $applicantTel) {
// \Error\ErrorModel::throwException(\Error\CodeConfigModel::StoreInviterNotBeSelf);
// }
// if($inviterTel) {
// $result = \DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName)->getOneByWhereWithField(" (store_id>0 or is_inviter=1) and member_mobile ='".$inviterTel."'",'member_id');
// if(!$result) {
// \Error\ErrorModel::throwException(\Error\CodeConfigModel::isNotStoreInviter);
// }
// }else{
// \Error\ErrorModel::throwException(\Error\CodeConfigModel::isNotStoreInviter);
// }
$sess = \Yaf\Session::getInstance();
$authInfo = $sess->get('wxAuthInfo');
$openId = $authInfo['openid'];
if ($openId) {
$QmStoreInviteDAO = \DAO\Store\QmStoreInvite::getInstance(\Our\DbNameConst::masterDBConnectName);
$QmStoreInviteDAO = \DAO\Store\QmStoreInviteModel::getInstance(\Our\DbNameConst::masterDBConnectName);
$result = $QmStoreInviteDAO->getQmStoreInviteOne(array('invite_wxappopenid'=>$openId));
if(!$result) {
$result = $QmStoreInviteDAO->addQmStoreInvite(array('invite_code'=>$inviterTel,'invite_mobile'=>$applicantTel,'invite_time'=>TIMESTAMP,'invite_wxappopenid'=>$openId));
......
application/models/DAO/Store/QmStoreInvite.php
View file @ 96bfab8c
......@@ -3,7 +3,7 @@
namespace DAO\Store;
class QmStoreInvite extends \DAO\AbstractModel
class QmStoreInviteModel extends \DAO\AbstractModel
{
......@@ -29,7 +29,7 @@ class QmStoreInvite extends \DAO\AbstractModel
public function getQmStoreInviteOne($where, $field = '*')
{
$this->setDb($this->dbName);
return $this->db->select($field)->where($where)->fetchOne();
return $this->db->from($this->_tableName)->select($field)->where($where)->fetchOne();
}
public function addQmStoreInvite($data)
{
......
application/models/DAO/Store/StoreDrainageAmount.php
View file @ 96bfab8c
......@@ -69,7 +69,7 @@ class StoreDrainageAmountModel extends \DAO\AbstractModel
if(is_array($where)) {
$where = $this->db->getSqlWhereByArray($where);
}
$result = $this->db->select($field)->from('han_store')->join($this->_tableName,'han_store.store_id = han_store_drainage_amount.store_id','inner')->where($where)->fetchAll();
$result = $this->db->select($field)->from('han_store_full')->join($this->_tableName,'han_store_full.store_id = han_store_drainage_amount.store_id','inner')->where($where)->fetchAll();
return $result;
}
public function editDrainage($where, $data)
......
application/models/Error/CodeConfig.php 100755 → 100644
View file @ 96bfab8c
......@@ -454,9 +454,9 @@ const updateGoodsStorageFail=300150;
const databaseError = 190001;
//开店邀请
const NoLoginOpenStoreInvite = 200001;
const StoreInviterNotBeSelf = 200002;
const isNotStoreInviter = 200003;
const NoLoginOpenStoreInvite = 210001;
const StoreInviterNotBeSelf = 210002;
const isNotStoreInviter = 210003;
/**
* 获取错误码配置
*/
......
application/views/index/getinvatehtml.phtml 0 → 100644
View file @ 96bfab8c
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>我的身边店 - 您身边的品牌 服务品牌的你</title>
<meta name="description" content="【我的身边店】互联网平台助力实体店升级，为实体店逐渐优化成“实体+智能”于一体的“数字店铺”提供技术支持，助力服务创新，适应用户购买方式的改变，助力实体，让商业回归本源！">
<meta name="keywords" content="我的身边店,我的,身边,店,身边店,的身边店,品牌,诚信,配送,近距离,线下支付,到店自提,货到付款,区域,独家,周边,坐等,在身边,可信赖,易追溯,异业,导流,推广,代理商,配送员,推广者,商家提供各类服饰,美容,家居,数码,销售家电,数码通讯,电脑,家居百货,服装服饰,母婴,图书,食品">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link type="image/x-icon" rel="icon" href="//static.shenbd.com/lib/img/favicon-hd.ico" />
<link type="image/x-icon" rel="shortcut icon" href="//static.shenbd.com/lib/img/favicon.ico" />
<style>
body,blockquote,h1,h2,h3,h4,h5,h6,p,pre,dd,form,figure{margin:0}
legend{padding:0}
menu,ol,ul,dl,fieldset,input,textarea{margin:0;padding:0}
audio,video,canvas{*display:inline;*zoom:1}
:link,:visited{text-decoration:none}
[hidden],template{display:none}
a{text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}
img{border-style:none;vertical-align:middle}
@font-face {
font-family: rzyzkxk;
src: url('/data/fonts/fonts/rzyzkxk.ttf');
}
.wrap { max-width:1276px; margin: 0 auto; }
body { background: #fff; font-size: 14px; line-height: 1.5; font-family: "Microsoft Yahei";}
.mod-card{ height: 1063px; background: url("//static.shenbd.com/www/index/2018/img/card/bg-card.jpg") no-repeat; position: relative; color:#030000}
.mod-card .mod-c1, .mod-card .mod-c2{ position: absolute; width: 50%; text-align: center;}
.mod-card .mod-c1{ left: 0; top: 300px;}
.mod-card .mod-c2{ right: 0; top: 200px;}
.mod-card .t1{ margin-top: 35px;}
.mod-card .t2{ margin-top: 255px;}
.mod-card .message{ line-height: 1.4; margin-top: 160px;}
.mod-card .name{ font-size: 74px; font-family: 'rzyzkxk';}
.mod-card .title{ font-size: 26px;}
.mod-card .phone{ font-size: 36px; margin-top: 20px; letter-spacing: 8px;}
.mod-card .code{ margin-top: 60px;}
</style>
</head>
<body>
<div class="wrap">
<div class="mod-card">
<div class="mod-c1">
<p><img src="//static.shenbd.com/www/index/2018/img/code-download-400.jpg" width="325" height="325" alt="我的身边店"></p>
<p class="t1"><img src="//static.shenbd.com/www/index/2018/img/card/t1.png" alt="我的身边店"></p>
<p class="t2"><img src="//static.shenbd.com/www/index/2018/img/card/t2.png" alt="您身边的品牌 服务品牌的你"></p>
</div>
<div class="mod-c2">
<div class="logo">
<img src="//static.shenbd.com/lib/img/logo-black.png" alt="我的身边店">
</div>
<div class="message">
<p class="name"><?php echo $params['name']; ?></p>
<p class="title">区域经理</p>
<p class="phone"><?php echo $params['telephone']; ?></p>
</div>
<div class="code">
<img width="213" src="<?php echo $params['qrcodeUrl']; ?>" alt="我的身边店">
</div>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
scripts/crontab/store/tryStoreExamine.php 0 → 100644
View file @ 96bfab8c
<?php
/**
* 试用期的店铺考核
* 执行时间：每个月1号00:05
*/
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 cliSaleOrder extends basecli
{
const CLI_ADMIN_ID = 255;
private $bDoUnLock = FALSE; // 是否允许释放 LOCK 文件
private $_debug = 0;
private $lockFileName;
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 tryStoreExamine(){
\Business\Store\StoreServiceModel::getInstance()->tryStoreExamine();
}
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('store');
if(!$this->mkdirs($lockDir)){
echo '****create dir fail ****';
exit;
}
$this->lockFileName = $lockDir .'/tryStoreExamine.locks';
if( file_exists( $this->lockFileName ) )
{
$stat = stat($this->lockFileName);
if( (TIMESTAMP - $stat['mtime']) > 3600 )
{
echo "文件被锁超过3600秒，被强制删除";
@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 独占锁
$this->tryStoreExamine();
echo '试用期的店铺考核完成'."\r\n";
}
}
$oCli = new cliSaleOrder(TRUE);
EXIT;
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