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

application/controllers/User.php

@@ -33,6 +33,9 @@ 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){
+                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::unavailMemberState);
+                }
                 //第二步保存扫码会员信息
                 $result = $this->memberService->saveStoreMembers($member['member_id']);
                 if(!$result){
@@ -46,7 +49,7 @@ class UserController extends \Our\Controller_AbstractIndex {
                     if(!$result['status']){
                         \Error\ErrorModel::throwException(\Error\CodeConfigModel::loginBindUserInfoFailed);
                     }
-                        if(isset($result['member'])&&$member){
+                    if(isset($result['member'])&&$member){
                         $member = array_merge($member,$result['member']);
                     }
                 }

application/models/Business/User/SalespersonService.php

@@ -74,7 +74,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
         $saleActDAO = \DAO\SaleActivityModel::getInstance();
         $actList = $saleActDAO->getActByArr($saleActArr);
 
-        $member = \DAO\MemberModel::getInstance()->getInfo($memberId);
+        $member = $this->getNameAndAvatar($memberId);
         $memberName = $member['memberName'];
         $memberAvatarUrl = $member['memberAvatarUrl'];
 
@@ -155,7 +155,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
     public function getNameAndAvatar($memberId) {
         $member = \DAO\MemberModel::getInstance()->getInfo($memberId);
         $memberName = $member['memberName'];
-        $memberAvatarUrl = $member['memberAvatarUrl'];
+        $memberAvatarUrl = $member['memberAvatarUrl'].'?x-oss-process=image/resize,m_fill,h_192,w_192';
         return array('memberName'=>$memberName,'memberAvatarUrl'=>$memberAvatarUrl);
     }
 
@@ -217,7 +217,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptySaleGoodsId);
         }
 
-        $member = \DAO\MemberModel::getInstance()->getInfo($memberId);
+        $member = $this->getNameAndAvatar($memberId);
         $memberName = $member['memberName'];
         $memberAvatarUrl = $member['memberAvatarUrl'];
 

application/models/DAO/Address.php

@@ -136,6 +136,8 @@ class AddressModel extends \DAO\AbstractModel {
 
     public function insert($data){
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $data['gmt_create'] = TIMESTAMP;
+        $data['gmt_update'] = TIMESTAMP;
         $result = $this->db->insert($this->_tableName)->rows($data)->execute();
 
         if($result){
@@ -147,8 +149,8 @@ class AddressModel extends \DAO\AbstractModel {
     }
 
     public function update($data,$where){
-
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $data['gmt_update'] = TIMESTAMP;
         $result=$this->db->update($this->_tableName)->rows($data)->where($where)->execute();
         if($result){
             $memberId = isset($data['member_id'])?$data['member_id']:(isset($where['member_id'])?$where['member_id']:\Our\ApiConst::zero);

application/models/DAO/Member.php

@@ -23,6 +23,10 @@ class MemberModel extends \DAO\AbstractModel
     //有效用户返回数据
     private $availMemberColumn = array('member_id', 'member_name', 'member_truename', 'member_avatar', 'member_sex', 'member_birthday', 'member_mobile', 'member_mobile_bind', 'member_qq', 'member_qqopenid', 'member_qqinfo', 'member_wxinfo', 'member_wxopenid', 'member_sinaopenid', 'member_sinainfo', 'member_points', 'member_state', 'member_quicklink', 'member_exppoints', 'store_id', 'iswx', 'agree_flag', 'seller_id', 'diliveryman_id', 'member_tag_ids', 'member_group_ids', 'is_teacher', 'member_email', 'member_email_bind','is_wxsend');
 
+
+    //有效用户返回数据
+    private $memberColumn = array('member_id', 'member_name', 'member_truename', 'member_avatar', 'member_sex', 'member_birthday', 'member_mobile', 'member_mobile_bind', 'member_qq', 'member_qqopenid', 'member_qqinfo', 'member_wxinfo', 'member_wxopenid', 'member_sinaopenid', 'member_sinainfo', 'member_points', 'member_state', 'member_quicklink', 'member_exppoints', 'store_id', 'iswx', 'agree_flag', 'seller_id', 'diliveryman_id', 'member_tag_ids', 'member_group_ids', 'is_teacher', 'member_email', 'member_email_bind','is_wxsend','member_state');
+
     public function init()
     {
         $this->memberMysql = \Mysql\MemberModel::getInstance();
@@ -98,7 +102,7 @@ class MemberModel extends \DAO\AbstractModel
             $where[NameConst::memberPasswd]=md5($password);
         }
 
-        $result = $this->db->select($this->availMemberColumn)->from($this->_tableName)->where($where)->fetchOne();
+        $result = $this->db->select($this->memberColumn)->from($this->_tableName)->where($where)->fetchOne();
         if ($result) {
             $memberAvatarUrl = $this->getMemberAvatarUrl($result['member_id'], $result['member_avatar']);
             $result['memberAvatarUrl'] = $memberAvatarUrl;

application/models/DAO/StoreGoodsClass.php

@@ -26,8 +26,9 @@ class StoreGoodsClassModel extends \DAO\AbstractModel {
     }
     public function getList($where,$field,$order = true){
         $this->setDb($this->dbName);
+        $where['stc_state'] = 1;
         if($order){
-            return $this->db->select($field)->from($this->_tableName)->where($where)->order('stc_sort','DESC')->fetchAll();
+            return $this->db->select($field)->from($this->_tableName)->where($where)->order('stc_sort','ASC')->fetchAll();
         }
         return $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
     }

application/models/Error/CodeConfig.php

@@ -98,6 +98,7 @@ class CodeConfigModel {
     const authMemberExistMobile = 10111;
     const uploadMemberAvatarFailed = 10112;
     const uploadWxMemberAvatarFailed = 10113;
+    const unavailMemberState = 10114;
 
     //访问错误
     const illegalAccess=200001;
@@ -458,10 +459,10 @@ class CodeConfigModel {
             self::emptyUserAvatar => '第三方用户头像不能为空',
             self::emptyUserNickname => '第三方用户昵称不能为空',
             self::addMemberMappingError => '添加第三方绑定关系失败',
-            self::userAlreadyBind => '当前账号已被其他账号绑定,如需绑定,请先解绑',
+            self::userAlreadyBind => '当前第三方账号已被其他账号绑定,如需绑定,请先解绑',
             self::emptyPlatformType => '第三方平台类型不能为空',
             self::wrongPlatformInfo => '获取平台授权信息错误',
-            self::loginBindUserInfoFailed => '登录是绑定用户信息失败',
+            self::loginBindUserInfoFailed => '登录时绑定用户信息失败',
             self::cancelBindingUserFailed => '取消第三方绑定失败',
             self::emptyUserOpenid => '第三方用户唯一识别符不能为空',
             self::bindingSuccess => '绑定成功',
@@ -504,6 +505,7 @@ class CodeConfigModel {
             self::saveMemberMapppingFailed => '保存用户第三方绑定信息失败',
             self::uploadMemberAvatarFailed => '上传用户头像失败',
             self::uploadWxMemberAvatarFailed => '微信上传用户头像失败',
+            self::unavailMemberState => '您的账号已被禁用',
             //商品相关
             self::emptyCommonId=> '商品主键不能为空',
             self::goodsNotExist=> '商品不存在',

conf/application.ini

@@ -365,6 +365,8 @@ resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
+password.key='~!@#$`1234qwertasdfgzxcvb'
+
 redis.database.params.host = "127.0.0.1"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
@@ -410,6 +412,8 @@ resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
+password.key='~!@#$`1234qwertasdfgzxcvb'
+
 redis.database.params.host = "127.0.0.1"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"