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/controllers/Member.php

@@ -47,8 +47,9 @@ class MemberController extends \Our\Controller_AbstractApi {
 
         $data = $this->req[\Our\NameConst::data];
         $result = $this->memberService->saveMemberAvatar($data,$this->memberId);
+        $member = $this->memberService->getMemberInfo($this->memberId);
         if($result!==false){
-            $this->success(array('memberAvatar'=>$result));
+            $this->success(array('memberAvatar'=>$member['memberAvatar']));
         }
         \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveMemberAvatarFailed);
     }

application/controllers/User.php

@@ -146,4 +146,12 @@ class UserController extends \Our\Controller_AbstractIndex {
             $this->success(array('userFlag'=>\Our\ApiConst::zero));
         }
     }
+
+    public function isLoginAction(){
+        $isLogin = \Our\ApiConst::zero;
+        if(parent::isLogin()){
+            $isLogin = \Our\ApiConst::one;
+        }
+        $this->success(array('isLogin'=>$isLogin));
+    }
 }

application/library/Order/OrderConfirmUtil.php

@@ -62,7 +62,7 @@ class OrderConfirmUtil {
     public function checkPostData($data,$memberId,$currentAddress){
         $dbName = \Our\DbNameConst::masterDBConnectName;
         $this->memberId = $memberId;
-        $this->member = \DAO\MemberModel::getInstance()->find($this->memberId);
+        $this->member = \DAO\MemberModel::getInstance()->getInfo($this->memberId);
         $this ->address = $this->checkCurrentAddress($currentAddress,$this->memberId);
         if(!$this->address){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::noAddressForOrder);
@@ -353,8 +353,8 @@ class OrderConfirmUtil {
             $order['store_id'] = $storeId;
             $order['store_name'] = $storeCarts['storeName'];
             $order['buyer_id'] = $this->memberId;
-            $order['buyer_name'] = $this->member['member_name'];
-            $order['buyer_email'] = $this->member['member_email'];
+            $order['buyer_name'] = $this->member['memberName'];
+            $order['buyer_email'] = $this->member['memberEmail'];
             $order['add_time'] = TIMESTAMP;
             $order['payment_type'] = $storeCarts['payway'];
             $order['order_amount'] = $storeCarts['orderAmount'];
@@ -393,7 +393,7 @@ class OrderConfirmUtil {
             $orderLog['log_msg'] = \Our\DescribeConst::addOrderLog;
             $orderLog['log_time']  = TIMESTAMP;
             $orderLog['log_role'] = \Our\DescribeConst::buyer;
-            $orderLog['log_user'] = $this->member['member_name'];
+            $orderLog['log_user'] = $this->member['memberName'];
             $orderLog['log_msg'] = $logMsg;
             $orderLog['log_orderstate'] = $order['order_state'];
             $orderLogList[] = $orderLog;

application/library/Our/DescribeConst.php

@@ -95,6 +95,7 @@ class DescribeConst
     const afterPay = '货到付款';
     const alipay = '支付宝支付';
     const tenPay = 'qq支付';
+    const wxProgrom = '微信支付';
     //运费类型
     const serviceFee = '服务费';
     const freightFee = '运费';

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/ShopkeeperService.php

@@ -73,6 +73,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $data['todayOrderCount'] = $storeStats['todayOrderCount'];
         $data['todayOrderTotal'] = $storeStats['todayOrderTotal'];
         $data['tadayFavCount'] = $storeFavariteCount['todayFavCount'];
+        $data['todayFavCount'] = $storeFavariteCount['todayFavCount'];
         return $data;
     }
 
@@ -499,19 +500,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                 $memberIds=array_unique($memberId);
                 $goodsNumCount=$orderGoodDao->getMemberStoreOrderGoodsCount($storeIds,$memberIds);
                 $ordersCount=$orderDao->getSumAmountCountByMemberAndStoreId($storeIds,$memberIds);
-                $arr = array();
-                if(!empty($goodsNumCount)&&!empty($ordersCount)){
-                    foreach($goodsNumCount as $k=>$r){
-                        $arr[] = array_merge($r,$ordersCount[$k]);
-                    }
-                    $addDatas=$arr;
-                }else{
-                    if(!empty($goodsNumCount)){
-                        $addDatas=$goodsNumCount;
-                    }else{
-                        $addDatas=$goodsNumCount;
-                    }
-                }
+
                 if(!empty($goodsNumCount)){
                     $storeMemberStatisticDao->addAll($goodsNumCount,'orderGoodsCount');
                 }

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/Business/User/MemberService.php

@@ -193,17 +193,26 @@ class MemberServiceModel extends \Business\AbstractModel
      */
     public function saveMemberAvatar($where,$memberId){
         $memberAvatar = $where['memberAvatar'];
-        if(!$memberAvatar){
+        $memberImage = $where['memberImage'];
+        if(!($memberAvatar||$memberImage)){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emtpyMemberAvatar);
         }
-        $memberAvatarName = \Our\ImageConst::memberAvatarPrefix.$memberId;
-        $result = \Our\ImageUtil::uploadBase64Image($memberAvatar,\Our\ImageConst::memberAvatar,$memberAvatarName);
-        if($result){
-            $data['member_avatar'] = $memberAvatarName;
+        if($memberAvatar){
+            $memberAvatarName = \Our\ImageConst::memberAvatarPrefix.$memberId;
+            $result = \Our\ImageUtil::uploadBase64Image($memberAvatar,\Our\ImageConst::memberAvatar,$memberAvatarName);
+            if($result){
+                $data['member_avatar'] = $memberAvatarName;
+                $memberDao=\DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
+                $result = $memberDao->saveInfo($data,$memberId);
+            }
+            return $result;
+        }
+        if($memberImage){
+            $data['member_avatar'] = $memberImage;
             $memberDao=\DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
             $result = $memberDao->saveInfo($data,$memberId);
+            return $result;
         }
-        return $result;
     }
 
 

application/models/DAO/Member.php

@@ -63,8 +63,10 @@ class MemberModel extends \DAO\AbstractModel
         if ($memberAvatar) {
             if (strpos($memberAvatar, \Our\NameConst::http) === 0) {
                 return $memberAvatar;
+            }else{
+                $filename = $memberAvatar;
             }
-            $filename = \Our\ImageConst::memberAvatarPrefix . $memberId;
+            //$filename = \Our\ImageConst::memberAvatarPrefix . $memberId;
         }
         return \Our\Common::getStaticFile($filename, \Our\ImageConst::memberAvatar);
     }
@@ -103,7 +105,7 @@ class MemberModel extends \DAO\AbstractModel
     {
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $result = $this->db->update($this->_tableName)->rows($data)->where(array('member_id' => $memberId))->execute();
-        if ($result) {
+        if ($result!==false) {
             $memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance();
             $member = $data;
             if (isset($member['member_avatar']) && $member['member_avatar']) {

application/models/DAO/Order/Order.php

@@ -279,9 +279,11 @@ class OrderModel extends \DAO\AbstractModel
             case ApiConst::alipay:
                 $payName = DescribeConst::alipay;
                 break;
-            case
-            $payName = ApiConst::tenpay:
-                DescribeConst::tenPay;
+            case ApiConst::tenpay:
+                $payName = DescribeConst::tenPay;
+                break;
+            case ApiConst::wxProgram:
+                $payName =  DescribeConst::wxProgrom;
                 break;
             default:
                 break;

application/models/DAO/Order/OrderGoods.php

@@ -230,10 +230,17 @@ class OrderGoodsModel extends \DAO\AbstractModel {
     }
     public function getMemberStoreOrderGoodsCount($storeIds,$memberIds){
         $this->setDb($this->dbName);
+//        if(is_array($storeIds)){
+//            $storeIds=implode(',',$storeIds);
+//        }
+//        if(is_array($memberIds)){
+//            $memberIds=implode($memberIds);
+//        }
         $where['store_id']=array('in',$storeIds);
         $where['buyer_id']=array('in',$memberIds);
         $where['is_refund']=array('neq',ApiConst::one);
-        $res=$this->db->from($this->_tableName)->select($this->sumGoodsNum)->group("buyer_id")->group("store_id")->fetchAll();
+        $where=$this->db->getSqlWhereByArray($where);
+        $res=$this->db->from($this->_tableName)->select($this->sumGoodsNum)->where($where)->group("buyer_id")->group("store_id")->fetchAll();
         return $res;
 
     }

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');

scripts/crontab/push/news_server.php

@@ -7,7 +7,7 @@
  */
 define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../../../')); //指向public的上一级
 define("KEY_REDIS_PRE","PHPREDIS_SESSION:");
-define("KEY_PRE","qm_:han_member:");
+define("KEY_PRE","qm_:han_member_im:");
 require APPLICATION_PATH . '/scripts/crontab/common.php';
 header("Access-Control-Allow-Origin: *");
 header('Access-Control-Allow-Method: *');
@@ -48,6 +48,8 @@ $serv->on('Message', function($server, $frame) use($conf){
             $redis->auth($conf['password']);
         }
        // echo $frame->data;
+        echo $frame->data;
+        echo 11111111111;
         $rev_data = json_decode($frame->data,true);
         //echo json_encode($rev_data);
         $method = isset($rev_data['method']) ? $rev_data['method'] : '';
@@ -103,8 +105,10 @@ $serv->on('Message', function($server, $frame) use($conf){
                     $sendMessage['toUserName']=$rev_data['toUserName'];
                     $sendMessage['toType']= $rev_data['toType'];
                     if(!empty($sendFd)){
+                        echo '发送fd:'.$sendFd;
                         $server->push($sendFd, responseJson(1,"fromMsg","success", $sendMessage));
                     }
+                    echo 'afterSendFd:'.$sendFd;
                 }
                 //echo json_encode($sendMessage);
                 //$redis->rPush("message_center",serialize($sendMessage));
@@ -128,6 +132,7 @@ $serv->on('Message', function($server, $frame) use($conf){
             preg_match("/member_id\|i:(\d+)/i",$sessData,$matchs);//现在
            // preg_match("/member_id\|i[^\d]{1,3}(\d+)/i",$res,$matchs);过去
             $memberId=$matchs[1];
+            echo "success".$memberId.'login||||';
             $redis->expire($realKey,\Our\ApiConst::tenDaySecond);
             if($memberId==(int)$memberId){
                 switch($method) {