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

application/models/Business/User/SalespersonService.php

@@ -209,7 +209,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
 //            $where = sprintf($where,ApiConst::orderStateComplete,ApiConst::zero,ApiConst::zero,ApiConst::refundSellerRefuse,ApiConst::platNotIn,ApiConst::platIn,ApiConst::refundPlatformRefuse);
         }else{
 //            $where .=" AND (order_state < %s  OR (order_state = %s AND refund_id > %s AND (seller_state != %s OR (is_platform_in = %s AND platform_state != %s ))))";
-            $where .= " AND order_state < 40 OR (order_state = 40 AND is_refund = 1)";
+            $where .= " AND (order_state < 40 OR (order_state = 40 AND is_refund = 1))";
 //            $where = sprintf($where,ApiConst::orderStateComplete,ApiConst::orderStateComplete,ApiConst::zero,ApiConst::refundSellerRefuse,ApiConst::platIn,ApiConst::refundPlatformRefuse);
         }
         $goodsList = $saleOrderDAO->getOrderGoodsList($where,'member_id,member_name AS memberName,member_avatar AS memberAvatar,sum(goods_num) AS goodsNum','member_id',$limit);

scripts/crontab/order/evaluate.php

@@ -50,7 +50,7 @@ class cliOrderEvaluate extends basecli
             echo "*** Debug mode ***\n";
         }
         // Step: 02 检查是否已有相同CLI在运行中
-        $lockDir=$this->_getBaseFileName('orderEvaluate');
+        $lockDir=$this->_getBaseFileName('order');
         if(!$this->mkdirs($lockDir)){
             echo '****create dir fail  ****';
             exit;

scripts/crontab/order/saleGoods.php

@@ -50,7 +50,7 @@ class cliSaleOrder extends basecli
             echo "*** Debug mode ***\n";
         }
         // Step: 02 检查是否已有相同CLI在运行中
-        $lockDir=$this->_getBaseFileName('orderSaleGoods');
+        $lockDir=$this->_getBaseFileName('order');
         if(!$this->mkdirs($lockDir)){
             echo '****create dir fail  ****';
             exit;