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

application/controllers/Index.php

@@ -52,8 +52,11 @@ class IndexController extends \Our\Controller_Abstract  {
     }
 
     public function indexAction() {
+        $getKey=$_GET['key'];
+        if($getKey!='~!@#$`1234qwert'){
+            throw new Exception('非法',-1111);
+        }
         $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));

application/models/Business/Order/OrderService.php

@@ -826,7 +826,7 @@ class OrderServiceModel extends \Business\AbstractModel
     public function updateOrderAmount($storeId,$orderId,$newOrderAmount,$memberName)
     {
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
-       // $orderLogDao=\DAO\Order\OrderLogModel::getInstance(DbNameConst::masterDBConnectName);
+        $orderLogDao=\DAO\Order\OrderLogModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDetail=$orderDao->getByOrderId($orderId,$orderDao->getOrderDetailField());
         $orderDetail=$orderDetail[ApiConst::arrBegin];
         if($orderDetail['storeId']!=$storeId){
@@ -837,7 +837,7 @@ class OrderServiceModel extends \Business\AbstractModel
         }
         $data['order_amount']=$newOrderAmount;
         $res=$orderDao->updateByOrderId($data,$orderId);
-       // $orderLogDao->add($orderDetail['orderId'],ArrayConst::logMsgType[ApiConst::sellerUpdateOrderAmount],DescribeConst::sellerLog,$memberName,$orderDetail['orderState']);
+        $orderLogDao->add($orderDetail['orderId'],ArrayConst::logMsgType[ApiConst::sellerUpdateOrderAmount],DescribeConst::sellerLog,$memberName,$orderDetail['orderState']);
         return $res;
     }
 

application/models/Business/Store/DeliveryService.php

@@ -64,16 +64,16 @@ class DeliveryServiceModel extends \Business\AbstractModel
         return $res;
     }
 
-    public function addDeleiveryMan($storeId,$memberId,$trueName=''){
+    public function addDeleiveryMan($storeId,$memberMobile,$trueName=''){
         $memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
         $deliveryManDao=\DAO\Order\DiliverymanModel::getInstance(DbNameConst::masterDBConnectName);
-        $member=$memberDao->getInfo($memberId);
+        $member=$memberDao->getByMemberMobile($memberMobile);
         $memberMobile=$member['memberMobile'];
         if(strlen($memberMobile)>ApiConst::telephoneLen || !$memberMobile){
                 ErrorModel::throwException(CodeConfigModel::notExsitDeliveryMan);
         }
         $where['store_id']=$storeId;
-        $where['member_id']=$memberId;
+        $where['member_id']=$member['memberId'];
         $res=$deliveryManDao->getByWhere($where);
         if($res){
             ErrorModel::throwException(CodeConfigModel::alreadyExsitDeliveryMan);
@@ -85,7 +85,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $deliveryManData['store_id']=$storeId;
         $deliveryManData['add_time']=TIMESTAMP;
         $deliveryManData['update_time']=TIMESTAMP;
-        $deliveryManData['member_id']=$memberId;
+        $deliveryManData['member_id']=$member['memberId'];
         $deliveryManData['bind_status']=ApiConst::one;
         $deliveryManData['is_del']=ApiConst::zero;
         $resData=$deliveryManDao->insert($deliveryManData);

application/modules/Client/controllers/Delivery.php

@@ -64,7 +64,8 @@ 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);
+        $memberMobile=$this->req['data']['memberMobile'];
+        $result =$deliveryService->addDeleiveryMan($this->storeId,$memberMobile,$trueName);
         if($result!==false){
             $this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
         }

conf/application.ini

@@ -32,6 +32,17 @@ resources.database.slave.params.username = "root"
 resources.database.slave.params.password = "!@#$%12345werty"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
+
+
+; mongodb
+resources.database.mongo.params.driver   = "scram"
+resources.database.mongo.params.hostname = "172.16.142.15"
+resources.database.mongo.params.port     = 27017
+resources.database.mongo.params.database = "qmcs"
+resources.database.mongo.params.username = "qmcs"
+resources.database.mongo.params.password = "123456asdfgh"
+resources.database.mongo.params.charset  = "UTF8"
+resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
 ;
 password.key='~!@#$`1234qwertasdfgzxcvb';
 redis.database.params.host = "172.16.142.15"
@@ -58,7 +69,7 @@ elastic.master.port="9200"
 elastic.master.scheme="http";
 
 password.key='~!@#$`1234qwertasdfgzxcvb';
-//生产环境
+;生产环境
 [product : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
@@ -80,6 +91,16 @@ resources.database.slave.params.password = "!@#$%12345werty"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
+; mongodb
+resources.database.mongo.params.driver   = "scram"
+resources.database.mongo.params.hostname = "127.0.0.1"
+resources.database.mongo.params.port     = 27017
+resources.database.mongo.params.database = "qmcs"
+resources.database.mongo.params.username = "qmcs"
+resources.database.mongo.params.password = "123456asdfgh"
+resources.database.mongo.params.charset  = "UTF8"
+resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
+
 password.key='~!@#$`1234qwertasdfgzxcvb';
 redis.database.params.host = "127.0.0.1"
 redis.database.params.port = "6379"
@@ -138,6 +159,16 @@ resources.database.drawSource.params.password = "!@#$%12345werty"
 resources.database.drawSource.params.charset  = "UTF8"
 resources.database.drawSource.params.driver_options.1002 = "SET NAMES utf8"
 
+; mongodb
+resources.database.mongo.params.driver   = "scram"
+resources.database.mongo.params.hostname = "127.0.0.1"
+resources.database.mongo.params.port     = 27017
+resources.database.mongo.params.database = "qmcs"
+resources.database.mongo.params.username = "qmcs"
+resources.database.mongo.params.password = "123456asdfgh"
+resources.database.mongo.params.charset  = "UTF8"
+resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
+
 redis.database.params.host = "127.0.0.1"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
@@ -184,6 +215,16 @@ resources.database.slave.params.password = "!@#$%12345werty"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
+; mongodb
+resources.database.mongo.params.driver   = "scram"
+resources.database.mongo.params.hostname = "127.0.0.1"
+resources.database.mongo.params.port     = 27017
+resources.database.mongo.params.database = "qmcs"
+resources.database.mongo.params.username = "qmcs"
+resources.database.mongo.params.password = "123456asdfgh"
+resources.database.mongo.params.charset  = "UTF8"
+resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
+
 redis.database.params.host = "127.0.0.1"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"