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

application/models/Business/Goods/GoodsCommonService.php

@@ -68,12 +68,11 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                 $datas[$key]['goodsAttr'] = $goodsDao->getFormatGoodsAttr($val['goodsAttr']);
             }
         }
-
         //获得售后商品列表getOrderGoodsByRecIds
         if (!empty($datas)) {
             return $datas;
         } else {
-            return new \stdClass();
+            return Array();
         }
     }
     /**

application/models/Business/Store/DeliveryService.php

@@ -47,15 +47,15 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $qmDeliveryManLogData['distribution_fee'] = $data['distributionFee'];
         $qmDeliveryManLogData['order_type'] = $data['orderType'];
         $qmDeliveryManLogData['get_time'] = TIMESTAMP;
-        $qmDeliveryWhere['diliveryman_id']= $qmDeliveryManLogData['diliveryman_id'];
+       // $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->update($qmDeliveryWhere,$qmDeliveryManLogData);
+        }else{
+            $res = $qmDeliveryManLog->insert($qmDeliveryManLogData);
         }
-        $res = $qmDeliveryManLog->insert($qmDeliveryManLogData);
         if (!res) {
             $orderDao->db->doRollback();
             ErrorModel::throwException(CodeConfigModel::selectDeliveryFail);

conf/application.ini

@@ -245,20 +245,43 @@ resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
-push.clientHost="ws://192.168.80.18:9502"
-redis.database.params.host = "127.0.0.1"
+; mongodb
+resources.database.mongo.params.driver   = "scram"
+resources.database.mongo.params.hostname = "192.168.1.201"
+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 = "192.168.1.201"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
-out.config="/data/config"
+redis.database.params.password = ""
+
+out.config="/data/config";
+;锁文件
+out.locks="/data/locks";
 ; redis配置
-push.user.service.id=293
-push.user.service.type=7
+
 ;redis.database.params.password = "test"
 ;推送配置
-push.clientHost="ws://192.168.80.18:9502"
-push.host="192.168.80.18"
+push.clientHost="ws://192.168.1.201:9502"
+push.host="192.168.1.201"
 push.port="9503"
 push.open=1
+push.user.service.id=293
+push.user.service.type=7
+elastic.master.host="192.168.1.201"
+elastic.master.port="9200"
+elastic.master.scheme="http";
+;resources.database.params.hostname = "127.0.0.1"
+;resources.database.params.database = "database"
+;resources.database.params.username = "username"
+;resources.database.params.password = "password"
 
 [ccwdevelop : common]
 ; 数据库配置