Skip to content

M
my-yaf-project
Commit 2c41c50f authored by wwccw0591's avatar wwccw0591
Browse files
Options

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

parents 143d56c7 353835a8
Hide whitespace changes
Inline Side-by-side
Showing with 467 additions and 53 deletions
application/controllers/User.php
View file @ 2c41c50f
......@@ -33,7 +33,7 @@ class UserController extends \Our\Controller_AbstractIndex {
$password=$data[NameConst::password];
if($this->memberService->checkUserNamePassWord($mobile,$password)){
$member= $this->memberService->getOneByMobileAndPassword($mobile,$password);
if($member['member_state']==\Our\ApiConst::zero){
if($member&&$member['member_state']==\Our\ApiConst::zero){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::unavailMemberState);
}
//第二步保存扫码会员信息
......
application/library/Our/ApiConst.php
View file @ 2c41c50f
......@@ -64,6 +64,8 @@ class ApiConst
const cannotSendMsg=-1;
const canSendMsg=1;
const telephoneLen=11;
const defaultIntervalTime = 1500;
const getExpressSuccess=0;
......
application/models/Business/Store/DeliveryService.php
View file @ 2c41c50f
......@@ -7,6 +7,8 @@ use DAO\StoreModel;
use Error\CodeConfigModel;
use Error\ErrorModel;
use Our\ApiConst;
use Our\DbNameConst;
use Yaf\Exception;
/**
......@@ -26,32 +28,74 @@ class DeliveryServiceModel extends \Business\AbstractModel
$this->storeDao = StoreModel::getInstance();
}
public function selectDeliveryMan($data){
$orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$qmDeliveryManLog=\DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::masterDBConnectName);
$orderDao->setDb($orderDao->dbName);
$orderDao->db->doTransaction();
$orderData['diliveryman_id']=$data['id'];
$orderRes=$orderDao->updateByOrderId($orderData,$data['orderId']);
if(!$orderRes){
$orderDao->db->doRollback();
ErrorModel::throwException(CodeConfigModel::updateOrderFail);
}
$qmDeliveryManLogData['diliveryman_id']=$data['id'];
$qmDeliveryManLogData['store_id']=$data['storeId'];
$qmDeliveryManLogData['order_id']=$data['orderId'];
$qmDeliveryManLogData['delivery_state']=ApiConst::deliveryStateWait;
$qmDeliveryManLogData['distribution_fee']=$data['distributionFee'];
$qmDeliveryManLogData['order_type']=$data['orderType'];
$qmDeliveryManLogData['get_time']=TIMESTAMP;
$res=$qmDeliveryManLog->insert($data);
if(!res){
$orderDao->db->doRollback();
ErrorModel::throwException(CodeConfigModel::selectDeliveryFail);
}
$orderDao->db->doCommit();
return $res;
public function selectDeliveryMan($data)
{
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$qmDeliveryManLog = \DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::masterDBConnectName);
$orderDao->setDb($orderDao->dbName);
$orderDao->db->doTransaction();
$orderData['diliveryman_id'] = $data['id'];
$orderRes = $orderDao->updateByOrderId($orderData, $data['orderId']);
if (!$orderRes) {
$orderDao->db->doRollback();
ErrorModel::throwException(CodeConfigModel::updateOrderFail);
}
$qmDeliveryManLogData['diliveryman_id'] = $data['id'];
$qmDeliveryManLogData['store_id'] = $data['storeId'];
$qmDeliveryManLogData['order_id'] = $data['orderId'];
$qmDeliveryManLogData['delivery_state'] = ApiConst::deliveryStateWait;
$qmDeliveryManLogData['distribution_fee'] = $data['distributionFee'];
$qmDeliveryManLogData['order_type'] = $data['orderType'];
$qmDeliveryManLogData['get_time'] = TIMESTAMP;
$qmDeliveryWhere['diliveryman_id']= $qmDeliveryManLogData['diliveryman_id'];
$qmDeliveryWhere['order_id']=$qmDeliveryManLogData['order_id'];
$qmDeliveryWhere['order_type']=$qmDeliveryManLogData['order_type'];
$isRepeat=$qmDeliveryManLog->find($qmDeliveryWhere);
if($isRepeat){
$orderDao->db->doRollback();
ErrorModel::throwException(CodeConfigModel::alreadyExsitQmDeliveryLog);
}
$res = $qmDeliveryManLog->insert($qmDeliveryManLogData);
if (!res) {
$orderDao->db->doRollback();
ErrorModel::throwException(CodeConfigModel::selectDeliveryFail);
}
$orderDao->db->doCommit();
return $res;
}
public function addDeleiveryMan($storeId,$memberId,$trueName=''){
$memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
$deliveryManDao=\DAO\Order\DiliverymanModel::getInstance(DbNameConst::masterDBConnectName);
$member=$memberDao->getInfo($memberId);
$memberMobile=$member['memberMobile'];
if(strlen($memberMobile)>ApiConst::telephoneLen || !$memberMobile){
ErrorModel::throwException(CodeConfigModel::notExsitDeliveryMan);
}
$where['store_id']=$storeId;
$where['member_id']=$memberId;
$res=$deliveryManDao->getByWhere($where);
if($res){
ErrorModel::throwException(CodeConfigModel::alreadyExsitDeliveryMan);
}
$trueName=$trueName?$trueName:$member['memberName'];
$deliveryManData['true_name']=$trueName;
$deliveryManData['mobile']=$memberMobile;
$deliveryManData['scores']=ApiConst::five;
$deliveryManData['store_id']=$storeId;
$deliveryManData['add_time']=TIMESTAMP;
$deliveryManData['update_time']=TIMESTAMP;
$deliveryManData['member_id']=$memberId;
$deliveryManData['bind_status']=ApiConst::one;
$deliveryManData['is_del']=ApiConst::zero;
$resData=$deliveryManDao->insert($deliveryManData);
if(!$resData){
ErrorModel::throwException(CodeConfigModel::addDeliveryManError);
}
return $resData;
}
/**
* 登录业务
*
......
application/models/Business/Store/ShopkeeperService.php
View file @ 2c41c50f
......@@ -306,7 +306,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$value['orderAmount'] = $value['orderAmount'] + $value['couponAmount'];
$value['reciverInfo'] = unserialize($value['reciverInfo']);
$value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin));
$value['shippingArrivalTimeEnd'] = $value['shippingArrivalTime'] + ApiConst::arriveTimeRadius;
$value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius;
if ($value['diliverymanId']) {
$diliverymanDao = DiliverymanModel::getInstance();
$res = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$diliverymanDao, 'findById'), array($value['diliverymanId']), \Our\ApiConst::oneDaySecond, array($value['diliverymanId']));
......@@ -490,7 +490,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$returnData['receiveAmount'] = $returnData['goodsAmount'] - $returnData['couponAmount'];
$returnData['orderAmount'] = $returnData['orderAmount'] + $returnData['couponAmount'];
$returnData['dlyoPickupCode'] = intval(substr($returnData['orderSn'], ApiConst::positionPickupCodeBegin));
$returnData['shippingArrivalTimeEnd'] = $returnData['shippingArrivalTime'] + ApiConst::arriveTimeRadius;
$returnData['deliveryTimeEnd'] = $returnData['deliveryTime'] + ApiConst::arriveTimeRadius;
} else {
unset($returnData['reciverInfo']);
}
......@@ -860,11 +860,21 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
public function sellerLogin($sellerName)
{
$sellerDao = \DAO\Store\SellerModel::getInstance(DbNameConst::masterDBConnectName);
$sellerGroupDao=\DAO\Store\SellerGroupModel::getInstance(DbNameConst::masterDBConnectName);
$sellerInfo = $sellerDao->getInfoBySellerName($sellerName);
if($sellerInfo['sellerGroupId'] > ApiConst::zero){
$allowMenus=$sellerGroupDao->getInfoById($sellerInfo['sellerGroupId'],'limits');
$allowMenuaArr=explode(',',$allowMenus);
if(!in_array('client',$allowMenuaArr)){
ErrorModel::throwException(CodeConfigModel::notHaveAccess);
}
}
if ($sellerInfo) {
$memberDao = \DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
$memberInfo = $memberDao->getInfo($sellerInfo['memberId']);
return $memberInfo;
$sellerInfo['memberMobile']=$memberInfo['memberMobile'];
$sellerInfo['trueName']=$memberInfo['memberName'];
return $sellerInfo;
}
ErrorModel::throwException(CodeConfigModel::errorUsernameOrPassword);
......
application/models/Business/User/MemberCenterService.php
View file @ 2c41c50f
......@@ -43,7 +43,6 @@ class MemberCenterServiceModel extends \Business\AbstractModel
'vibrate'=>ApiConst::openMessae,
);
}
$memberInfo['storeId'] ? $memberCenter['is'] = 1 : $memberCenter['isSeller'] = 0;
//是否销售员
$saleInstance = \DAO\SaleModel::getInstance();
//$sale_act_id = \DAO\SaleModel::getInstance()->getOne(array('member_id'=>$memberId,'is_closing'=>0),'sale_act_id');
......
application/models/Business/User/MemberService.php
View file @ 2c41c50f
......@@ -294,7 +294,7 @@ class MemberServiceModel extends \Business\AbstractModel
$addKey=Common::getConfig('password.key');
$memberTime = TIMESTAMP;
if(!empty($addKey)){
$md5Str=$memberTime.$addKey.$where['password'];
$md5Str=$memberTime.$where['password'].$addKey;
}else{
$md5Str=$where['password'];
}
......@@ -730,22 +730,45 @@ class MemberServiceModel extends \Business\AbstractModel
public function changeMobile($data,$memberId){
$memberDao = \DAO\MemberModel::getInstance();
$memberDao = \DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
$memberDao->checkChangedInfo($data);
//验证短信验证码
$shortMessageDao = \DAO\ShortMessageModel::getInstance();
$data['messageType'] = \Our\ApiConst::messageTypeValidNewMobile;
$shortMessageDao->validCode($data);
$memberTime = $memberDao->getInfo($memberId,'member_time');
$memberTime= $memberDao->getInfo($memberId,'member_time');
if(!$memberTime){
$memberTime = TIMESTAMP;
}
$oldMemberMobile= $memberDao->getInfo($memberId,'member_mobile');
$passwordStr = $this->getRealPassword($data['password'],$memberTime);
$storeModel = \DAO\StoreModel::getInstance(\Our\DbNameConst::masterDBConnectName);
$store = $storeModel->getInfo(array('store_phone'=>$oldMemberMobile));
$memberDao->db->doTransaction();
$result = $memberDao->updateInfo(array('member_passwd'=>md5($passwordStr),'member_mobile'=>$data['mobile'],'member_time'=>$memberTime,'member_mobile_bind'=>\Our\ApiConst::one),array('member_id'=>$memberId));
if(!$result){
$memberDao->db->doRollback();
\Error\ErrorModel::throwException(\Error\CodeConfigModel::changeMobileFailed);
}
if($store){
$storeResult = $storeModel->save(array('store_phone'=>$data['mobile']),array('store_id'=>$store['store_id']));
if($storeResult===false){
$memberDao->db->doRollback();
\Error\ErrorModel::throwException(\Error\CodeConfigModel::storePhoneUpdateFailed);
}
}
$sellerResult = \DAO\Store\SellerModel::getInstance(\Our\DbNameConst::masterDBConnectName)->update(array('seller_name'=>$data['mobile']),array('seller_name'=>$oldMemberMobile));
if($sellerResult===false){
$memberDao->db->doRollback();
\Error\ErrorModel::throwException(\Error\CodeConfigModel::sellerNameUpdateFailed);
}
$memberDao->db->doCommit();
if($store){
\Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeModel, 'getInfoById'),array(),array($store['store_id']));
}
$this->memberDb0Redis->tableHMSet($memberId,array('member_mobile'=>$data['mobile']),ApiConst::tenDaySecond);
$shortMessageDao = \DAO\ShortMessageModel::getInstance();
$shortMessageDao->delCodeRedis($data['key'],$data['mobile'],\Our\ApiConst::messageTypeValidNewMobile);
......
application/models/DAO/Member.php
View file @ 2c41c50f
......@@ -261,7 +261,13 @@ class MemberModel extends \DAO\AbstractModel
}
}
public function updateMemberCache($memberId,$member) {
$memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance();
if($memberDb0Redis->tableExists($memberId)) {
return $memberDb0Redis->tableHMSet($memberId,$member);
}
return true;
}
public function updateInfo($data, $where)
{
$this->setDb(\Our\DbNameConst::masterDBConnectName);
......
application/models/DAO/Order/Diliveryman.php
View file @ 2c41c50f
......@@ -71,6 +71,18 @@ class DiliverymanModel extends \DAO\AbstractModel
$result=$this->find($where);
return $result;
}
/**
* 插入数据
* @param $data
* @param $where
* @return mixed
*/
public function insert($data)
{
$this->setDb(\Our\DbNameConst::masterDBConnectName);
return $this->db->insert($this->_tableName)->rows($data)->execute();
}
public function getDeliveryManFields()
{
return array(
......
application/models/DAO/Order/Order.php
View file @ 2c41c50f
......@@ -45,7 +45,7 @@ class OrderModel extends \DAO\AbstractModel
public function getOrderDetailField()
{
return 'order_id as orderId,coupon_id as couponId,refund_amount as refundAmount,order_sn as orderSn,pay_sn as paySn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,payment_time as paymentTime,finnshed_time as finnshedTime,need_shipping_fee as needShippingFee,payment_code as paymentCode,buyer_id as buyerId,buyer_name as buyerName,refund_condition as refundCondition,delay_time as delayTime,gmt_update as gmtUpdate,diliveryman_id as diliverymanId,shipping_arrival_time as shippingArrivalTime';
return 'order_id as orderId,coupon_id as couponId,refund_amount as refundAmount,order_sn as orderSn,pay_sn as paySn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,payment_time as paymentTime,finnshed_time as finnshedTime,need_shipping_fee as needShippingFee,payment_code as paymentCode,buyer_id as buyerId,buyer_name as buyerName,refund_condition as refundCondition,delay_time as delayTime,gmt_update as gmtUpdate,diliveryman_id as diliverymanId,shipping_arrival_time as shippingArrivalTime,delivery_time as deliveryTime';
}
public function getOrderShippingField()
......
application/models/DAO/Order/QmDeliverymanLog.php
View file @ 2c41c50f
......@@ -58,8 +58,8 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
*/
public function insert($data)
{
$this->setDb(\Our\DbNameConst::masterDBConnectName);
return $this->db->insert($this->_tableName)->rows($data)->execute();
$this->setDb(\Our\DbNameConst::masterDBConnectName);
return $this->db->insert($this->_tableName)->rows($data)->execute();
}
public function updateStatusById($id)
......@@ -145,13 +145,13 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
*/
public function find($where)
{
$this->setDb($this->dbName);
$data = $this->db->from($this->_tableName)->select($this->fieldDetail)->where($where)->fetchOne();
return $data;
}
public function findById($id)
{
$this->setDb($this->dbName);
$where[$this->_primaryKey] = $id;
return $this->find($where);
}
......
application/models/DAO/Store.php
View file @ 2c41c50f
......@@ -269,7 +269,7 @@ class StoreModel extends \DAO\AbstractModel
public function get($storeId,$label = true)
{
$storeInfo = $this->getStoreInfoCache($storeId);
if(!$storeInfo || $storeInfo['open_flag'] == 0 || $storeInfo['store_state'] != 1){
if(!$storeInfo || $storeInfo['open_flag'] != 1 || $storeInfo['store_state'] != 1){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
}
......@@ -467,4 +467,10 @@ class StoreModel extends \DAO\AbstractModel
return $result;
}
public function save($data,$where){
$this->setDb(\Our\DbNameConst::masterDBConnectName);
$result = $this->db->update($this->_tableName)->rows($data)->where($where)->execute();
return $result;
}
}
application/models/DAO/Store/Seller.php
View file @ 2c41c50f
......@@ -81,7 +81,8 @@ class SellerModel extends \DAO\AbstractModel
public function update($data, $where)
{
$this->setDb(DbNameConst::masterDBConnectName);
return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
$result = $this->db->update($this->_tableName)->rows($data)->where($where)->execute();
return $result;
}
public function updateBySellerId($data,$sellerId){
......
application/models/DAO/Store/SellerGroup.php 0 → 100644
View file @ 2c41c50f
<?php
namespace DAO\Store;
use OSS\Common;
use Our\ApiConst;
use Our\DbNameConst;
use Redis\Db6\StoreRedisModel;
/**
* 店铺数据统计
* @date 2018-5-14
* @author csw
*/
class SellerGroupModel extends \DAO\AbstractModel
{
protected $redis;
private $detailField = "group_id as groupId,group_name as groupName,limits as limits,smt_limits as smtLimits,store_id as storeId";
/**
* 表名
*
* @var string
*/
protected $_tableName = 'han_seller_group';
/**
* 主键
*
* @var string
*/
protected $_primaryKey = 'group_id';
public function init()
{
$this->setDb();
}
/**
* 获取店铺统计信息
* @param $where
* @return array
*/
public function find($where)
{
$this->setDb($this->dbName);
$data = $this->db->select($this->detailField)->from($this->_tableName)->where($where)->fetchOne();
return $data;
}
public function getInfoBySellerName($sellerName)
{
$where['seller_name'] = $sellerName;
return $this->find($where);
}
public function getByStoreIdAndGmtCreate($storeId, $gmtCreate)
{
$where['store_id'] = $storeId;
$where['gmt_create'] = $gmtCreate;
$res = $this->find($where);
return $res;
}
public function getById($id)
{
$where['id'] = $id;
$res = $this->find($where);
return $res;
}
/**
* 更新数据
* @param $data
* @param $where
* @return mixed
*/
public function update($data, $where)
{
$this->setDb(DbNameConst::masterDBConnectName);
return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
}
public function updateBySellerId($data,$sellerId){
$where['seller_id']=$sellerId;
return $this->update($data,$where);
}
/**
* 插入数据
* @param $data
* @return mixed
*/
public function insert($data)
{
return $this->db->insert($this->_tableName)->rows($data)->execute();
}
/**
* @param $storeId 店铺id
* @param $field 更新栏目
* @param $value 增加值
* @param $type ,'INC':增加,'DEC':减少
*/
public function updateStoreStatisticsToday($storeId, $field, $value, $type = 'INC')
{
$h = 'todayData' . date('Ymd');
$key = $storeId;
$this->redis = StoreRedisModel::getInstance();
$data = $this->redis->tableHGet($h, $key);
$data[$field] = $type == 'INC' ? $data[$field] + $value : $data[$field] - $value;
StoreRedisModel::tableHSet($h, $storeId, $data, ApiConst::oneDaySecond);
}
public function getInfoById($id, $field=false)
{
$where[$this->_primaryKey] = $id;
$sellerGroup=$this->find($where);
if ($field) {
return $sellerGroup[$field];
} else {
return $sellerGroup;
}
}
public function getInfoByMemberId($memberId, $field = '*', $isField = false)
{
$this->setDb();
$where['member_id'] = $memberId;
$store = $this->db->from($this->_tableName)->select($field)->where($where)->fetchOne();
if ($isField) {
return $store[$isField];
} else {
return $store;
}
}
//插入数据大量
public function addAllReduce($datas)
{
$this->setDb(DbNameConst::masterDBConnectName);
$error = 0;
$baseSql = "insert into {$this->_tableName}(store_id,order_count,order_total,gmt_create) values";
$extentSql = " ON DUPLICATE KEY UPDATE order_count=order_goods_count-values(order_goods_count),order_total=order_total-values(order_total)";
$insertAllSql = $baseSql;
for ($i = 0; $i < count($datas); $i++) {
$addSql = \Our\Common::format("({0},{1},{2},{3}),", $datas[$i]['storeId'], $datas[$i]['orderCount'], $datas[$i]['orderTotal'], datas[$i]['gmtCreate']);
$insertAllSql .= $addSql;
if ($i % 1000 == 0 && $i != 0) {
$insertAllSql = rtrim($insertAllSql, ',');
$insertSql = $insertAllSql . $extentSql;
$one = $this->db->insert($this->_tableName)->query($insertSql);
if (!$one) {
$error++;
}
$insertAllSql = $baseSql;
}
}
if ($insertAllSql != $baseSql) {
$insertAllSql = rtrim($insertAllSql, ',');
$insertSql = $insertAllSql . $extentSql;
$one = $this->db->insert($this->_tableName)->query($insertSql);
if (!$one) {
$error++;
}
}
if ($error > 0) {
$dataJson = json_encode($datas);
throw new Exception('插入han_store_member_statistics失败,' . $dataJson, 4);
}
}
//插入数据大量
public function addAll($datas)
{
$this->setDb(DbNameConst::masterDBConnectName);
$error = 0;
$baseSql = "insert into {$this->_tableName}(store_id,order_count,order_total,fav_count,gmt_update,gmt_create) values";
$extentSql = " ON DUPLICATE KEY UPDATE order_count=order_count+values(order_count),order_total=order_total+values(order_total),fav_count=fav_count+values(fav_count),gmt_update=values(gmt_update)";
$insertAllSql = $baseSql;
for ($i = 0; $i < count($datas); $i++) {
$addSql = \Our\Common::format("({0},{1},{2},{3},{4},'{5}'),", $datas[$i]['storeId'], $datas[$i]['orderCount'], $datas[$i]['orderTotal'], $datas[$i]['favCount'], TIMESTAMP, date('Y-m-d', TIMESTAMP));
$insertAllSql .= $addSql;
if ($i % 1000 == 0 && $i != 0) {
$insertAllSql = rtrim($insertAllSql, ',');
$insertSql = $insertAllSql . $extentSql;
$one = $this->db->insert($this->_tableName)->query($insertSql);
if (!$one) {
$error++;
}
$insertAllSql = $baseSql;
}
}
if ($insertAllSql != $baseSql) {
$insertAllSql = rtrim($insertAllSql, ',');
$insertSql = $insertAllSql . $extentSql;
$one = $this->db->insert($this->_tableName)->query($insertSql);
if (!$one) {
$error++;
}
}
if ($error > 0) {
$dataJson = json_encode($datas);
throw new Exception('插入han_store_statics_day失败,' . $dataJson, 4);
}
}
/**
* 类实例
*
* @var \DAO\UserModel
*/
private static $_instance = null;
/**
* 获取类实例
*
* @return \DAO\UserModel
*/
public static function getInstance()
{
if (!(self::$_instance instanceof self)) {
self::$_instance = new self();
}
return self::$_instance;
}
/**
* 获取字段
* @return array
*/
private function _getColumns()
{
return array(
'store_id as storeId',
'order_count as orderCount',
'order_total as orderTotal',
'fav_count as favCount',
'goods_count as goodsCount',
);
}
}
application/models/Error/CodeConfig.php
View file @ 2c41c50f
......@@ -100,7 +100,9 @@ class CodeConfigModel
const uploadMemberAvatarFailed = 10112;
const uploadWxMemberAvatarFailed = 10113;
const unavailMemberState = 10114;
const storePhoneUpdateFailed = 10115;
const sellerNameUpdateFailed = 10116;
const notHaveAccess = 10117;
//访问错误
const illegalAccess = 200001;
......@@ -285,7 +287,9 @@ class CodeConfigModel
const platFormAreadyIn = 300117;
const confirmReceiveError = 300118;
const alreadyExsitDeliveryMan = 300119;
const alreadyExsitQmDeliveryLog = 300122;
const notExsitDeliveryMan = 300123;
const addDeliveryManError = 300124;
const updateOrderFail = 300120;
const selectDeliveryFail = 300121;
const noEnoughStorageForBundlingGoods = 30118;
......@@ -413,6 +417,9 @@ class CodeConfigModel
//分享错误码
const shareGrowImageError = 180001;
//数据库错误
const databaseError = 190001;
/**
* 获取错误码配置
*/
......@@ -499,6 +506,9 @@ class CodeConfigModel
self::uploadMemberAvatarFailed => '上传用户头像失败',
self::uploadWxMemberAvatarFailed => '微信上传用户头像失败',
self::unavailMemberState => '您的账号已被禁用',
self::storePhoneUpdateFailed => '更换手机时卖家手机号码更新失败',
self::sellerNameUpdateFailed => '更换手机时卖家手机号码更新失败',
self::notHaveAccess => '您没有权限使用',
//商品相关
self::emptyCommonId => '商品主键不能为空',
self::goodsNotExist => '商品不存在',
......@@ -707,6 +717,9 @@ class CodeConfigModel
self::bundlingGoodsNotExist => '组合销售商品不存在',
self::confirmReceiveError => '确认收款失败',
self::alreadyExsitDeliveryMan=>'您的店铺已经存在此配送员',
self::alreadyExsitQmDeliveryLog=>'配送订单已存在',
self::notExsitDeliveryMan=>'用户不存在或未绑定手机号码',
self::addDeliveryManError=>'添加配送员失败',
self::noStorageForBundlingGoods => '组合销售商品库存不存在',
self::bundlingGoodsOfflineForCartOrOrder => '组合销售活动已下架',
self::goodsNoStoreForCartOrOrder => '商品库存不足',
......@@ -797,7 +810,8 @@ class CodeConfigModel
self::wrongTimeForReadLog => '读日志时写入时间段查询开始时间不能大于结束时间',
self::saveUserMappingFailed => '保存用户关联关系失败',
self::registerMemberInfoFailed => '注册更新用户信息失败',
self::authMemberExistMobile => '该授权用户已经绑定手机号码'
self::authMemberExistMobile => '该授权用户已经绑定手机号码',
self::databaseError=>'数据库执行失败',
);
}
......
application/models/Mysql/LinkMySQL.php
View file @ 2c41c50f
<?php
namespace Mysql;
use Error\CodeConfigModel;
use Error\ErrorModel;
use Our\ApiConst;
/**
......@@ -129,16 +131,14 @@ class LinkMySQLModel{
if ( is_object($sql) ) {
$sql = $sql->_toSQL();
}
$resource = mysqli_query($this->_connection, $sql);
if(! $resource) {
if ( APP_ENV != 'product' ) {
die('Error: ' . mysqli_error($this->_connection) . '<br />Error No: ' . mysqli_errno($this->_connection) . '<br />' . $sql);
if ( APP_ENV == 'product' || APP_ENV=='productOne' ) {
ErrorModel::throwException(CodeConfigModel::databaseError);
} else {
die('DataBase Error');
throw new \Exception('Error: ' . mysqli_error($this->_connection) . '<br />Error No: ' . mysqli_errno($this->_connection) . '<br />' . $sql);
}
}
if($this->_type == 'SELECT') {
$i = 0; $data = array();
while ($result = mysqli_fetch_assoc($resource)) {
......@@ -146,12 +146,10 @@ class LinkMySQLModel{
$i++;
}
mysqli_free_result($resource);
$query = new \stdClass();
$query->one = isset($data[0]) ? $data[0] : FALSE;
$query->rows = empty($data) ? FALSE : $data;
$query->num = $i;
unset($data);
return $query;
} else {
......
application/models/Redis/Db0/MemberRedis.php 100755 → 100644
View file @ 2c41c50f
......@@ -38,7 +38,9 @@ class MemberRedisModel extends \Redis\Db0\AbstractModel {
}
return null;
}
public function tableExists($h){
return $this->exists($this->calcKey($h));
}
/**
* 更新数据
*
......
application/modules/Client/controllers/Delivery.php
View file @ 2c41c50f
......@@ -30,6 +30,7 @@ class DeliveryController extends \Our\Controller_AbstractClient {
$deliveryService=\Business\Store\DeliveryServiceModel::getInstance();
$data=$this->req['data'];
$data['storeId']=$this->storeId;
unset($data['key']);
$result =$deliveryService->selectDeliveryMan($data);
if($result!==false){
$this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
......@@ -60,7 +61,13 @@ class DeliveryController extends \Our\Controller_AbstractClient {
* 添加配送员
*/
public function addDeliveryAction(){
$deliveryService=\Business\Store\DeliveryServiceModel::getInstance();
$trueName=$this->req['data']['trueName'];
$result =$deliveryService->addDeleiveryMan($this->storeId,$this->memberId,$trueName);
if($result!==false){
$this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
}
ErrorModel::throwException(CodeConfigModel::commonError);
}
......
application/modules/Client/controllers/User.php
View file @ 2c41c50f
......@@ -69,7 +69,7 @@ class UserController extends \Our\Controller_AbstractIndex {
$member['store_id']=$seller['storeId'];
$member['seller_id']=$seller['sellerId'];
$this->memberService->saveMember($member,'seller');
$this->success(array('key'=>$this->key,'trueName'=>$seller['trueName'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id'],'storeId'=>(int)$seller['storeId']));
$this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberMobile'=>$member['member_mobile'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id'],'storeId'=>(int)$seller['storeId']));
}else{
ErrorModel::throwException(CodeConfigModel::errorUsernameOrPassword);
}
......
public/client/delivery/addDelivery.php 0 → 100644
View file @ 2c41c50f
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>简单的html5 File测试 for pic2base64</title>
<style>
</style>
</head>
<body>
<form action="/client/delivery/addDelivery" method="post">
用户登录状态key:<input name="data[key]" value="73526b0db474f2a0e5f80c67301be73d"/><br />
memberId:<input name="data[memberId]" value="284"/><br />
<input type="submit" value="提交">
</form>
</body>
</html>
\ No newline at end of file
public/client/delivery/selectDelivery.php 0 → 100644
View file @ 2c41c50f
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>简单的html5 File测试 for pic2base64</title>
<style>
</style>
</head>
<body>
<form action="/client/delivery/selectDelivery" method="post">
用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br />
订单id:<input name="data[orderId]" value=""/><br />
配送员id:<input name="data[id]" value=""/><br />
配送费:<input name="data[distributionFee]" value="85"/><br />
订单类型:<input name="data[orderType]" value="1"/><br />
<input type="submit" value="提交">
</form>
</body>
</html>
\ No newline at end of file
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