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

application/library/Our/Common.php

@@ -278,6 +278,12 @@ class Common
         $result=trim($result);
         return $result;
     }
+    public static function getDivNum(){
+
+    }
+    public static function mutiplicative($num){
+     return    intval(bcmul($num, \Our\ApiConst::oneHandred));
+    }
     /**
      * sql字符串格式化
      * @param unknown $phone

application/models/Business/Order/OrderService.php

@@ -327,6 +327,7 @@ 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());
+        $storeDao=\DAO\StoreModel::getInstance();
         //判断订单目前状态是否允许取消
         $isAllowCancel = $orderDao->isAllowCancel($order);
         if ($isAllowCancel) {
@@ -361,6 +362,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 //\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
                 if ($memberId) {
                     $orderDao->deleteOrderCache($memberId, $orderId, $order['storeId'],true);
+                    $storeDao->deleteStoreCache($order['storeId'],$orderId);
                     // $memberDao->fromOrderStateToOrderState($memberId,$order['order_state'],ApiConst::orderStateCancel);
                 }
             }

application/models/Business/Store/DeliveryService.php

@@ -7,6 +7,7 @@ use DAO\StoreModel;
 use Error\CodeConfigModel;
 use Error\ErrorModel;
 use Our\ApiConst;
+use Our\Common;
 use Our\DbNameConst;
 use Yaf\Exception;
 
@@ -31,8 +32,16 @@ class DeliveryServiceModel extends \Business\AbstractModel
     public function selectDeliveryMan($data)
     {
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
+        $storeDao=\DAO\StoreModel::getInstance();
         $qmDeliveryManLog = \DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDao->setDb($orderDao->dbName);
+        $orderD= $orderDao->find($data['order_id'],$orderDao->getOrderDetailField());
+//        if( $orderD['diliveryman_id']== $data['id']){
+//            ErrorModel::throwException(CodeConfigModel::alreadyExsitQmDeliveryLog);
+//        }
+        if(!$data['distributionFee']){
+            ErrorModel::throwException(CodeConfigModel::paramsError);
+        }
         $orderDao->db->doTransaction();
         $orderData['diliveryman_id'] = $data['id'];
         $orderRes = $orderDao->updateByOrderId($orderData, $data['orderId']);
@@ -44,7 +53,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $qmDeliveryManLogData['store_id'] = $data['storeId'];
         $qmDeliveryManLogData['order_id'] = $data['orderId'];
         $qmDeliveryManLogData['delivery_state'] = ApiConst::deliveryStateWait;
-        $qmDeliveryManLogData['distribution_fee'] = $data['distributionFee'];
+        $qmDeliveryManLogData['distribution_fee'] =$data['distributionFee'];
         $qmDeliveryManLogData['order_type'] = $data['orderType'];
         $qmDeliveryManLogData['get_time'] = TIMESTAMP;
        // $qmDeliveryWhere['diliveryman_id']= $qmDeliveryManLogData['diliveryman_id'];
@@ -60,7 +69,9 @@ class DeliveryServiceModel extends \Business\AbstractModel
             $orderDao->db->doRollback();
             ErrorModel::throwException(CodeConfigModel::selectDeliveryFail);
         }
-        $orderDao->deleteOrderCache(null, $data['orderId'], $data['storeId'], true);
+
+        $orderDao->deleteOrderCache(null, $data['orderId'], $data['storeId'], true,false,$orderD['buyerId']);
+        $storeDao->deleteStoreCache($data['storeId'],$data['orderId']);
         $orderDao->db->doCommit();
         return $res;
     }

application/models/Business/Store/ShopkeeperService.php

@@ -331,7 +331,6 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                     if ($this->clientType && $this->clientType == NameConst::pcClient) {
                         $value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额
                         $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
-
                        // $value['orderAmount'] = $value['orderAmount'];
                         $value['reciverInfo'] = unserialize($value['reciverInfo']);
                         $value['reciverInfo']  =$orderCommonDao->getReciverInfo( $value['reciverInfo'] );

application/models/DAO/Order/Order.php

@@ -847,10 +847,13 @@ class OrderModel extends \DAO\AbstractModel
     {
         return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getShopKeeperCountByStoreId'), array(),array($storeId));
     }
-
+    public function deleteDeliveryLogCache($memberId){
+        \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getListByDeliverymanIdAndType'), array(), array($memberId));
+    }
     //删除订单列表缓存
     public function deleteGetListByMemberId($storeId)
     {
+
         return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getList'), array(), array($storeId));
     }
 

application/models/DAO/Store.php

@@ -250,8 +250,10 @@ class StoreModel extends \DAO\AbstractModel
         }
     }
     public function deleteStoreCache($storeId,$orderId){
+        $qmDeliveryManLogDao =\DAO\Order\QmDeliverymanLogModel::getInstance();
         if(!empty($storeId)){
             \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this, 'getList'), array(), array($storeId));
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$qmDeliveryManLogDao, 'getList'), array(), array($storeId));
         }
         if(!empty($orderId)){
             $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);

application/models/Error/CodeConfig.php

@@ -738,7 +738,7 @@ class CodeConfigModel
             self::bundlingGoodsNotExist => '组合销售商品不存在',
             self::confirmReceiveError => '确认收款失败',
             self::alreadyExsitDeliveryMan=>'您的店铺已经存在此配送员',
-            self::alreadyExsitQmDeliveryLog=>'配送订单已存在',
+            self::alreadyExsitQmDeliveryLog=>'已经分配此配送员',
             self::notExsitDeliveryMan=>'用户不存在或未绑定手机号码',
             self::addDeliveryManError=>'添加配送员失败',
             self::noStorageForBundlingGoods => '组合销售商品库存不存在',