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

application/controllers/Index.php

@@ -52,6 +52,7 @@ class IndexController extends \Our\Controller_Abstract  {
     }
 
     public function indexAction() {
+        \Our\Log::getInstance()->write('testLog|||||testLog');
         var_dump($_SERVER);exit;
        // echo $_SERVER['USER']);exit;
         $elasticConfig=\Our\Common::getConfig('elastic.master');

application/models/Business/Goods/GoodsClassService.php

@@ -32,7 +32,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
         $qmStoreClassCon['city_code'] = $cityCode;
         $qmStoreClassCon['is_charged'] = \Our\ApiConst::one;
         $qmStoreClassCon['class_style'] = \Our\ApiConst::signClassStyle;
-        $storeField = 'gc_id,longitude,latitude,sign_rang,gc_parent_id';
+        $storeField = 'gc_id,longitude,latitude,sign_rang,gc_parent_id,store_id';
 
         $qmStoreClassDao = \DAO\QmStoreClassModel::getInstance();
         $signStoreClasses = \Our\RedisHelper::cachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(),array(&$qmStoreClassDao, 'getStoreClasses'),array($qmStoreClassCon,$storeField),\Our\ApiConst::oneHour,array($cityCode));
@@ -96,7 +96,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
             $classIds = array_merge($expressClassIds,$classIds);
         }
         $classIdKeys = array_flip($classIds);
-
         $goodsClassDao = \DAO\GoodsClassModel::getInstance();
         $parentClasses = $goodsClassDao->getParentClasses();
         $temp =array_diff_key($parentClasses,$classIdKeys);
@@ -193,18 +192,26 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
         $signStoreClasses = $this->getSignClassesByCityCode($cityCode);
         if($signStoreClasses){
             $returnClass = array();
-
+            $newStoreIds = array();
             foreach($signStoreClasses as $signClass){
                 $class_distance  = \Our\CommonExtension::getDistance($lat,$lng,$signClass['latitude'],$signClass['longitude'],1);
                 //判断签约分类是否可以为当前用户提供服务,并且记录这些店铺对应的store_id
                 if($class_distance<=$signClass['sign_rang']){
+                    $class = $signClass;
                     $class['class_distance'] = $class_distance;
+
                     $returnClass[$class_distance] = $class;
+                    if(!($newStoreIds&&in_array($signClass['store_id'],$newStoreIds))){
+                        $newStoreIds[] = $signClass['store_id'];
+                    }
+
                 }
             }
             ksort($returnClass);
+
             $signParentClassIds = array_unique(array_column($returnClass,'gc_parent_id'));
-            $signStoreIds = array_unique(array_column($returnClass,'store_id'));
+            //$signStoreIds = array_unique(array_column($returnClass,'store_id'));
+            $signStoreIds = $newStoreIds;
 
             //将当前位置对应签约店铺存入缓存
             $position['lat'] = $where['lat'];

application/models/Business/Goods/GroupSaleService.php

@@ -159,7 +159,10 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                             }else{
                                 $tempObj['blChangeFlag'] = \Our\ApiConst::one;
                             }
-                            $tempObj['goodsPrice'] = \Goods\GoodsUtil::getInstance()->getRealPrice($pBundling['blId'],null,null,\Our\ApiConst::addBundingToCart,\Our\DbNameConst::salveDBConnectName);
+                            $tempPrice = \Goods\GoodsUtil::getInstance()->getRealPrice($pBundling['blId'],null,null,\Our\ApiConst::addBundingToCart,\Our\DbNameConst::salveDBConnectName);
+                            if($tempPrice){
+                                $tempObj['goodsPrice'] = $tempPrice;
+                            }
                             $tempObj['goodsList'] = \Our\Common::convertUnderline($pBundling['goodsList']);
                             $tempObj['goodsOriginalPrice'] = $pBundling['sumPrice'];
                         } else if ($tempCart['type'] == \Our\ApiConst::addGoodsToCart) {
@@ -181,7 +184,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                                 $tempObj['goodsState'] = \Our\ApiConst::cartGoodsOffline;
                             }
                             $price = \Goods\GoodsUtil::getInstance()->getRealPrice($tempCart['goods_id'],$memberId);
-                            $tempObj['goodsPrice'] = $price?$price:intval($tempCart['goods_price']);
+                            $tempObj['goodsPrice'] = $price?$price:$tempObj['goodsPrice'];
                         }
                         $tempObj['goodsAttr'] = $goodsDao->getFormatGoodsAttr($tempCart['goods_spec']);
                         $tempObj['goodsMid'] = $tempCart['goods_mid'];

application/models/Business/Order/PaymentService.php

@@ -22,6 +22,11 @@ class PaymentServiceModel extends \Business\AbstractModel{
         if(!$data['paySn']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyPaySnForPay);
         }
+        $orderModel = \DAO\Order\OrderModel::getInstance();
+        $order = $orderModel->find(array('pay_sn'=>$data['paySn'],'payment_type'=>\Our\ApiConst::one,'order_state'=>\Our\ApiConst::orderStateWaitPay));
+        if(!$order){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::noOrderWaitToPay);
+        }
     }
 
     public function updateOrderToPayedWxLite(){

application/models/Business/Order/RefundService.php

@@ -461,6 +461,7 @@ class RefundServiceModel extends \Business\AbstractModel
             }
             if(!empty($address)){
                 $address['isDefault'] = (int)$address['isDefault'];
+                $address['company']=isset( $address['company'])? $address['company']:'';
                 $info['dAddressInfo'] = $address;
             }else{
                 $info['dAddressInfo'] =new \stdClass();

application/models/Business/Store/StoreService.php

@@ -450,15 +450,16 @@ class StoreServiceModel extends \Business\AbstractModel{
         $signStoreKey = \Our\NameConst::signStoreIdsPrefix . $readisSuffix;
         $signStoreIds =$storeRedis->find($signStoreKey, \Our\ApiConst::oneHour);
 
-        $serviceStoreKey = \Our\NameConst::serviceStoreIdsPrefix . $readisSuffix;
-        $serviceStoreIds = $storeRedis->find($serviceStoreKey, \Our\ApiConst::oneHour);
-        if(is_array($signStoreIds)&&is_array($serviceStoreIds)){
+        //$serviceStoreKey = \Our\NameConst::serviceStoreIdsPrefix . $readisSuffix;
+        //$serviceStoreIds = $storeRedis->find($serviceStoreKey, \Our\ApiConst::oneHour);
+        /*if(is_array($signStoreIds)&&is_array($serviceStoreIds)){
             $nearbyStoreIds = array_merge($serviceStoreIds,$signStoreIds);
-        }else if(is_array($signStoreIds)){
+        }else */
+        if(is_array($signStoreIds)){
             $nearbyStoreIds = $signStoreIds;
-        }else if(is_array($serviceStoreIds)){
+        }/*else if(is_array($serviceStoreIds)){
             $nearbyStoreIds = $serviceStoreIds;
-        }
+        }*/
         if($nearbyStoreIds&&is_array($nearbyStoreIds)){
             return $nearbyStoreIds;
         }

application/models/Error/CodeConfig.php

@@ -277,6 +277,7 @@ class CodeConfigModel {
     const platFormAreadyIn=300117;
 
     const noEnoughStorageForBundlingGoods = 30118;
+    const noOrderWaitToPay = 30119;
     //店铺相关错误码
 
     //商品分类
@@ -746,6 +747,7 @@ class CodeConfigModel {
             self::noExpressDeliveryForOrder1 => '该店铺未配置快递配送',
             self::goodsNoStoreForCartOrOrder1 => '商品库存紧张,您的购买数量太多啦',
             self::noEnoughStorageForBundlingGoods =>'组合销售库存紧张,您购买的数量太多啦',
+            self::noOrderWaitToPay => '您的订单已支付,请勿重复重复',
             //销售员
             self::emptySaleGoodsId=>'商品id不能为空',
             self::emptySaleGoods=>'销售商品不存在',

public/test.php

 <?php
+
+echo unserialize('a:5:{i:1064;a:3:{s:4:\"gcId\";i:1064;s:6:\"gcName\";s:6:\"\xe5\x9b\xbe\xe4\xb9\xa6\";s:7:\"gcImage\";s:79:\"https://qmoss-01.oss-cn-hangzhou.aliyuncs.com/mall/common/category-pic-1064.jpg\";}i:1153;a:3:{s:4:\"gcId\";i:1153;s:6:\"gcName\";s:6:\"\xe6\x9c\x8d\xe8\xa3\x85\";s:7:\"gcImage\";s:79:\"https://qmoss-01.oss-cn-hangzhou.aliyuncs.com/mall/common/category-pic-1153.jpg\";}i:1212;a:3:{s:4:\"gcId\";i:1212;s:6:\"gcName\";s:6:\"\xe7\x94\x9f\xe9\xb2\x9c\";s:7:\"gcImage\";s:79:\"https://qmoss-01.oss-cn-hangzhou.aliyuncs.com/mall/common/category-pic-1212.jpg\";}i:1233;a:3:{s:4:\"gcId\";i:1233;s:6:\"gcName\";s:6:\"\xe7\xae\xb1\xe5\x8c\x85\";s:7:\"gcImage\";s:79:\"https://qmoss-01.oss-cn-hangzhou.aliyuncs.com/mall/common/category-pic-1233.jpg\";}i:1244;a:3:{s:4:\"gcId\";i:1244;s:6:\"gcName\";s:12:\"\xe7\xbe\x8e\xe5\xa6\x86\xe7\xbe\x8e\xe6\x8a\xa4\";s:7:\"gcImage\";s:79:\"https://qmoss-01.oss-cn-hangzhou.aliyuncs.com/mall/common/category-pic-1244.jpg\";}}');exit;
 echo 24234;exit;
 $redis =new Redis();
 $redis->connect('127.0.0.1','6379');