Merge branch 'master_dev' of http://git.shenbd.com/api-project-dev/api.shenbd.com into ccw

.gitignore

-<<<<<<< HEAD
-dea
-=======
 /nbproject/
 .idea
->>>>>>> 07613dd26e99bb68b3772e7616f45675937eabb9
 *.DS_Store
 upload
 /data/log
 /data/images
 /scripts/crontab/push/nohup.out
 /lib
-<<<<<<< HEAD
-=======
-
->>>>>>> 07613dd26e99bb68b3772e7616f45675937eabb9

application/controllers/Index.php

@@ -6,12 +6,12 @@ class IndexController extends \Our\Controller_Abstract  {
     public $memberId;
     public $messageService;
     public function init(){
-        $valid_ip = array('192.168.1.80','192.168.1.211','106.14.14.233','47.99.100.113','47.97.168.24');
-        $client_ip = $_SERVER['REMOTE_ADDR'];
-        if ( ! in_array($client_ip, $valid_ip))
-        {
-            throw new \Exception('ip error!!!');
-        }
+//        $valid_ip = array('192.168.1.80','192.168.1.211','106.14.14.233','47.99.100.113','47.97.168.24');
+//        $client_ip = $_SERVER['REMOTE_ADDR'];
+//        if ( ! in_array($client_ip, $valid_ip))
+//        {
+//            throw new \Exception('ip error!!!');
+//        }
     }
     public function is_https() {
         if ( !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {

application/library/Lock/RedisLock.php

@@ -23,8 +23,14 @@ class RedisLock implements \Lock\ILock{
 
     public function getLock($key, $timeout=self::EXPIRE)
     {
+
         $currMicroTime = $this->getMicrotime();
         $is_lock = $this->lockRedis->tableSetnx($key, $currMicroTime+10);
+        $i = 0;
+        while($is_lock==false&&$i<3){
+            $is_lock = $this->lockRedis->tableSetnx($key, $currMicroTime+10);
+            $i++;
+        }
         // 不能获取锁
         if(!$is_lock){
             //判断锁是否过期

application/library/Order/OrderConfirmUtil.php

@@ -383,7 +383,7 @@ class OrderConfirmUtil {
                 }
                 $deliveryFee = \Our\ApiConst::zero;
             }
-            if($deliveryFee!=$requestData['deliveryFee']){
+            if(intval($deliveryFee)!=$requestData['deliveryFee']){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::wrongStoreDeliveryFeeForOrder);
             }
             $delivery = array();
@@ -1013,7 +1013,7 @@ class OrderConfirmUtil {
         if($blGoodsList){
             $dbName = \Our\DbNameConst::masterDBConnectName;
             $pBundlingDao = \DAO\PBundlingModel::getInstance($dbName);
-            $pBundlingResult = $pBundlingDao->updateBlStorage($blGoodsList);
+            $pBundlingResult = $pBundlingDao->updateBlStorage($blGoodsList,$op);
             if(!$pBundlingResult){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::blGoodsStorageToDBFailedForOrder);
             }

application/library/Our/Controller/Abstract.php

@@ -14,7 +14,7 @@ abstract class Controller_Abstract extends \Yaf\Controller_Abstract {
         if($version){
             define('CURRENTVERSION',$version);
         }else{
-            define('CURRENTVERSION',\Our\NameConst::versionDefault);
+            define('CURRENTVERSION',\Our\NameConst::versionOne);
         }
     }
 

application/library/Our/DescribeConst.php

@@ -158,6 +158,9 @@ class DescribeConst
     const refundRetund='退货';
     const refundSuccess='退款成功';
 
+    const alreadyRecieve='已收货';
+    const alreadyComplete='已完成';
+
     const sellerRefuseReturn='卖家拒绝退货';
     const sellerAgreeReturn='卖家同意退货';
 

application/library/Payment/WxPay.php

@@ -61,6 +61,8 @@ class WxPay extends \Payment\TencentPay
 
 
     public function refund($param){
+      //  return  $this->commonRefund($param);
+       // return $this->serviceRefund($param);
         if($param['subMchId']){
             return $this->serviceRefund($param);
         }else{

application/models/Business/Cart/CartService.php

@@ -717,7 +717,7 @@ class CartServiceModel extends \Business\AbstractModel{
             $deliverySetting['sellerDistribution'] = $store['seller_distribution'];
             if($deliverySetting['sellerDistribution']){
                 $deliverySetting['leftAmount'] = \Our\ApiConst::zero;
-                $deliverySetting['inServiceAreaFlag'] = \Our\ApiConst::zero;
+                $deliverySetting['inServiceAreaFlag'] = \Our\ApiConst::one;
                 //var_dump(json_encode($store));
                 if((isset($store['start_shipping_price'])&&$store['start_shipping_price']>\Our\ApiConst::zero)&&$storeCarts['storeTotalPrice']<$store['start_shipping_price']){
                     //$deliverySetting['sellerDistribution'] = \Our\ApiConst::zero;
@@ -729,7 +729,8 @@ class CartServiceModel extends \Business\AbstractModel{
                 }
                 $deliverySetting['deliverTimeList'] =array();
                 if($address){
-                    $result = \Store\StoreUtil::getInstance()->checkAddressInServiceArea(array('lng'=>$address['lng'],'lat'=>$address['lat']),$storeId);
+                    //$result = \Store\StoreUtil::getInstance()->checkAddressInServiceArea(array('lng'=>$address['lng'],'lat'=>$address['lat']),$storeId);
+                    $result = true;
                     $storeDistance = \Our\CommonExtension::getDistance($address['lat'],$address['lng'],$store['store_latitude'],$store['store_longitude'],\Our\ApiConst::one);
                     if($result){
                         $deliverySetting['inServiceAreaFlag'] = \Our\ApiConst::one;
@@ -741,14 +742,14 @@ class CartServiceModel extends \Business\AbstractModel{
                             $deliverySetting['other'] = $deliverTimeList['other']?$deliverTimeList['other']:\Our\ApiConst::zero;
                         }
                     }
-                }else{
+                }/*else{
                     $sess=\Yaf\Session::getInstance();
                     $currentAddress = $sess->get('currentAddress');
                     $result = \Store\StoreUtil::getInstance()->checkAddressInServiceArea(array('lng'=>$currentAddress['lng'],'lat'=>$currentAddress['lat']),$storeId);
                     if($result){
                         $deliverySetting['inServiceAreaFlag'] = \Our\ApiConst::one;
                     }
-                }
+                }*/
             }else{
                 $deliverySetting['sellerDistribution'] = \Our\ApiConst::zero;
             }

application/models/Business/Order/OrderService.php

@@ -575,6 +575,22 @@ class OrderServiceModel extends \Business\AbstractModel
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
         $order = $orderDao->findByOrderId($orderId,$orderDao->getOrderDetailField());
+        $waitReceiveCount=ApiConst::zero;
+        $waitDeliveryCount=ApiConst::zero;
+        $waitGetCount=ApiConst::zero;
+        if(in_array($order['orderState'],array(ApiConst::orderStateWaitSend,ApiConst::orderStateWaitRecieve))){
+            if($order['shippingType']==ApiConst::bySelf){
+                $waitGetCount=ApiConst::reduceOne;
+            }
+            if($order['shippingType']==ApiConst::bySeller){
+                $waitDeliveryCount=ApiConst::reduceOne;
+            }
+        }
+        if($order['orderState']==ApiConst::orderStateWaitConfirm){
+            $waitReceiveCount=-1;
+        }
+
+
         $storeDao=\DAO\StoreModel::getInstance();
         //判断订单目前状态是否允许取消
         $isAllowCancel = $orderDao->isAllowCancel($order);
@@ -607,9 +623,9 @@ class OrderServiceModel extends \Business\AbstractModel
                 $push=\Our\Push::getInstance();
                 $pushData=array('storeId'=>$order['storeId'],
                     'type'=>ApiConst::messageWaitReceive,
-                    'waitReceiveCount'=>ApiConst::reduceOne,
-                    'waitDeliveryCount'=>ApiConst::zero,
-                    'waitGetCount'=>ApiConst::zero,
+                    'waitReceiveCount'=>$waitReceiveCount,
+                    'waitDeliveryCount'=>$waitDeliveryCount,
+                    'waitGetCount'=>$waitGetCount,
                     'orderCount'=>ApiConst::reduceOne,
                     'waitRefundProccessCount'=>ApiConst::zero,
                     'waitRefundReceiveCount'=>ApiConst::zero,

application/models/DAO/Goods.php

@@ -483,7 +483,11 @@ class GoodsModel extends \DAO\AbstractModel {
         return true;
     }
 
-
+    public function update($data, $where){
+        $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $result = $this->db->update($this->_tableName)->rows($data)->where($where)->execute();
+        return $result;
+    }
 
     /**
      * 获取格式化的规格值

application/models/DAO/Goods/GoodsSnapshot.php

+<?php
+
+namespace DAO\Goods;
+
+
+class GoodsSnapshotModel extends \DAO\AbstractModel
+{
+
+
+    
+
+    /**
+     * 表名
+     *
+     * @var string
+     */
+    protected $_tableName = 'han_goods_snapshot';
+
+    /**
+     * 主键
+     *
+     * @var string
+     */
+    protected $_primaryKey = 'id';
+
+    public function init()
+    {
+    }
+
+
+    public function insert($data)
+    {
+        $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        return $this->db->insert($this->_tableName)->rows($data)->execute();
+    }
+
+    public function save($data, $where){
+        $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $result = $this->db->update($this->_tableName)->rows($data)->where($where)->execute();
+        return $result;
+    }
+
+    /**
+     * 类实例
+     *
+     * @var \DAO\UserModel
+     */
+    private static $_instance = null;
+
+    /**
+     * 获取类实例
+     *
+     * @return \DAO\UserModel
+     */
+    public static function getInstance()
+    {
+        if (!(self::$_instance instanceof self)) {
+            self::$_instance = new self();
+        }
+
+        return self::$_instance;
+    }
+
+
+}

application/models/DAO/Order/Order.php

@@ -143,10 +143,10 @@ class OrderModel extends \DAO\AbstractModel
     public function isAllowCancel($order)
     {
         if($order['paymentTime']==ApiConst::zero){
-            if ($order['orderState'] == ApiConst::orderStateWaitPay || $order['orderState'] == ApiConst::orderStateWaitConfirm || (($order['orderState'] == ApiConst::orderStateWaitSend || $order['orderState'] == ApiConst::orderStateWaitRecieve) && $order['isReceivePayment'] == ApiConst::noreceivePayment)) {
-                return true;
-            } else {
+            if(($order['addTime']+ApiConst::tenMinSecond)<TIMESTAMP){
                 return false;
+            }else{
+                return true;
             }
         }else{
             if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP){
@@ -155,6 +155,20 @@ class OrderModel extends \DAO\AbstractModel
                 return true;
             }
         }
+        //原来的
+//        if($order['paymentTime']==ApiConst::zero){
+//            if ($order['orderState'] == ApiConst::orderStateWaitPay || $order['orderState'] == ApiConst::orderStateWaitConfirm || (($order['orderState'] == ApiConst::orderStateWaitSend || $order['orderState'] == ApiConst::orderStateWaitRecieve) && $order['isReceivePayment'] == ApiConst::noreceivePayment)) {
+//                return true;
+//            } else {
+//                return false;
+//            }
+//        }else{
+//            if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP){
+//                return false;
+//            }else{
+//                return true;
+//            }
+//        }
 
     }
 

application/models/DAO/Order/RefundReturn.php

@@ -25,7 +25,7 @@ class RefundReturnModel extends \DAO\AbstractModel
      * @var string
      */
     protected $_tableName = 'han_refund_return';
-    public $refundDetailField = 'is_platform_in as isPlatformIn,seller_state as sellerState,platform_state as platformState,refund_id as refundId,order_id as orderId,store_id as storeId,order_goods_id as orderGoodsId';
+    public $refundDetailField = 'is_platform_in as isPlatformIn,seller_state as sellerState,platform_state as platformState,refund_id as refundId,order_id as orderId,store_id as storeId,order_goods_id as orderGoodsId,refund_type as refundType,return_type as returnType,goods_state as goodsState';
     public $refundReturnField = "seller_state,refund_state,is_platform_in,platform_state";
     private $sumField = "order_id as orderId,buyer_id as buyerId,store_id as storeId,goods_num as goodsNum,refund_amount as refundAmount,is_suc_refund as isSucRefund,gmt_update as gmtUpdate";
     private $sumRefundAmount = " sum(refund_amount) as sumRefundAmont";
@@ -212,8 +212,37 @@ class RefundReturnModel extends \DAO\AbstractModel
 
     public function getStatusExtent($returnRefund, $isSeller = false)
     {
+//        //  if($returnRefund['refundState']!=ApiConst::refundCompleted){
+//        if ($returnRefund['sellerState'] == ApiConst::refundSellerAgree) {
+//            if ($returnRefund['refundState'] == ApiConst::refundCompleted) {
+//                return OrderConst::complete;
+//            }
+//            if ($returnRefund['refundType'] == ApiConst::refundTypeMoney) {
+//                return OrderConst::sellerAgree;
+//            }
+//            if ($returnRefund['refundType'] == ApiConst::refundTypeGoods) {
+//                if ($returnRefund['isSucRefund'] == ApiConst::refundSuccess) {
+//                    return OrderConst::alreadyReufndMoney;
+//                }
+//                if ($returnRefund['goodsState'] == ApiConst::goodsStateUnRecieve) {
+//                    return OrderConst::goodsStateUnRecieve;
+//                }
+//                if ($returnRefund['goodsState'] == ApiConst::goodsStateRecieved) {
+//                    return OrderConst::goodsStateRecieved;
+//                }
+//                if ($returnRefund['returnType'] == ApiConst::returnTypeNotReturn) {
+//                    return OrderConst::sellerAgreeReturn;
+//                }
+//                if ($returnRefund['returnType'] == ApiConst::returnTypeMustReturn) {
+//                    return OrderConst::waitSellerRecieve;
+//                }
+//            }
+//        }
         //  if($returnRefund['refundState']!=ApiConst::refundCompleted){
         if ($returnRefund['sellerState'] == ApiConst::refundSellerAgree) {
+            if ($returnRefund['refundState'] == ApiConst::refundCompleted) {
+                return OrderConst::complete;
+            }
             if ($returnRefund['isSucRefund'] == ApiConst::refundSuccess) {
                 return OrderConst::alreadyReufndMoney;
             }
@@ -221,21 +250,41 @@ class RefundReturnModel extends \DAO\AbstractModel
                 return OrderConst::sellerAgree;
             }
             if ($returnRefund['refundType'] == ApiConst::refundTypeGoods) {
-                if ($returnRefund['isSucRefund'] == ApiConst::refundSuccess) {
-                    return OrderConst::alreadyReufndMoney;
-                }
                 if ($returnRefund['goodsState'] == ApiConst::goodsStateUnRecieve) {
-                    return OrderConst::goodsStateUnRecieve;
+                   return  OrderConst::goodsStateUnRecieve;
                 }
-                if ($returnRefund['goodsState'] == ApiConst::goodsStateRecieved) {
-                    return OrderConst::goodsStateRecieved;
-                }
-                if ($returnRefund['returnType'] == ApiConst::returnTypeNotReturn) {
-                    return OrderConst::sellerAgreeReturn;
-                }
-                if ($returnRefund['returnType'] == ApiConst::returnTypeMustReturn) {
-                    return OrderConst::waitSellerRecieve;
+                if ($returnRefund['isSucRefund'] == ApiConst::refundSuccess) {
+                    if($returnRefund['goodsState'] == ApiConst::goodsStateRecieved){
+                      return  OrderConst::complete;
+                    }
+                    if($isSeller){
+                        if ($returnRefund['returnType'] == ApiConst::returnTypeNotReturn) {
+                            $stateName= OrderConst::complete;
+                        }
+                        if ($returnRefund['returnType'] == ApiConst::returnTypeMustReturn) {
+                            $stateName=OrderConst::alreadyReufndMoney;
+                        }
+                    }else{
+                        if ($returnRefund['returnType'] == ApiConst::returnTypeNotReturn) {
+                            $stateName= OrderConst::sellerAgreeReturn;
+                        }
+                        if ($returnRefund['returnType'] == ApiConst::returnTypeMustReturn) {
+                            $stateName=OrderConst::waitSellerRecieve;
+                        }
+                    }
+
+                }else{
+                    if($returnRefund['goodsState'] == ApiConst::goodsStateRecieved){
+                        return  OrderConst::goodsStateRecieved;
+                    }
+                    if ($returnRefund['returnType'] == ApiConst::returnTypeNotReturn) {
+                        $stateName= OrderConst::sellerAgreeReturn;
+                    }
+                    if ($returnRefund['returnType'] == ApiConst::returnTypeMustReturn) {
+                        $stateName=OrderConst::waitSellerRecieve;
+                    }
                 }
+                return $stateName;
             }
         }
         if ($returnRefund['sellerState'] == ApiConst::refundSellerRefuse) {
@@ -419,6 +468,7 @@ class RefundReturnModel extends \DAO\AbstractModel
         $param['refundFee'] = $orderInfo['refund_amount'];//退款金额
         $param['storeId'] = $orderInfo['store_id'];
         $param['buyerId'] = $orderInfo['buyer_id'];
+
         if (CURRENTVERSION != \Our\NameConst::versionDefault && in_array(intval($orderInfo['payment_type']), array(ApiConst::wxAppPayType, ApiConst::wxProgram))) {
             $mchIdArray = \DAO\StoreModel::getInstance()->getStoreWxMchId($param['storeId']);
             if ($mchIdArray['errorCode'] > 0) {

conf/application.ini

@@ -285,21 +285,21 @@ elastic.master.scheme="http";
 [ccwdevelop : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "192.168.1.201"
+resources.database.params.hostname = "127.0.0.1"
 resources.database.params.port     = 3306
-resources.database.params.database = "qmcs_ccw"
+resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "123456"
+resources.database.params.password = "root"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "192.168.1.201"
+resources.database.slave.params.hostname = "127.0.0.1"
 resources.database.slave.params.port     = 3306
-resources.database.slave.params.database = "qmcs_ccw"
+resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
-resources.database.slave.params.password = "123456"
+resources.database.slave.params.password = "root"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
@@ -316,10 +316,10 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
 
 password.key='~!@#$`1234qwertasdfgzxcvb';
 
-redis.database.params.host = "192.168.1.180"
+redis.database.params.host = "127.0.0.1"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
-redis.database.params.password = "23456ertyu"
+redis.database.params.password = ""
 
 out.config="/data/config";
 ;锁文件
@@ -328,13 +328,13 @@ out.locks="/data/locks";
 
 ;redis.database.params.password = "test"
 ;推送配置
-push.clientHost="ws://192.168.1.180:9502"
-push.host="192.168.1.180"
+push.clientHost="ws://127.0.0.1:9502"
+push.host="127.0.0.1"
 push.port="9503"
 push.open=1
 push.user.service.id=293
 push.user.service.type=7
-elastic.master.host="192.168.1.180"
+elastic.master.host="127.0.0.1"
 elastic.master.port="9200"
 elastic.master.scheme="http";
 ;resources.database.params.hostname = "127.0.0.1"
@@ -390,21 +390,21 @@ elastic.master.scheme="http";
 [lyztest : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "192.168.134.18"
+resources.database.params.hostname = "106.14.14.233"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "123456"
+resources.database.params.password = "!@#$%12345werty"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "192.168.134.18"
+resources.database.slave.params.hostname = "106.14.14.233"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
-resources.database.slave.params.password = "123456"
+resources.database.slave.params.password = "!@#$%12345werty"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
@@ -412,7 +412,7 @@ resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
 password.key='~!@#$`1234qwertasdfgzxcvb'
 
-redis.database.params.host = "127.0.0.1"
+redis.database.params.host = "192.168.134.18"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
 ;redis.database.params.password = "23456ertyu"

scripts/crontab/goods/updateGoodsSnapshot.php

+<?php
+
+/**
+ * 添加商品快照
+ * 执行一次
+ */
+define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../../../')); //指向public的上一级
+require APPLICATION_PATH . '/scripts/crontab/common.php';
+
+
+$goodsList = \DAO\GoodsModel::getInstance()->getList(array('snapshot_id'=>0),'*');
+foreach ($goodsList as $goods) {
+    $snaId = \DAO\Goods\GoodsSnapshotModel::getInstance()->insert(array('content'=>serialize($goods),'type'=>1));
+    \DAO\GoodsModel::getInstance()->update(array('snapshot_id'=>$snaId),array('goods_id'=>$goods['goods_id']));
+}