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

application/library/Payment/Pay.php

@@ -47,7 +47,8 @@ class Pay {
             $return = $wxLitePay->doPay($orderInfo);
             $prepayId = $wxLitePay->getPrepayId();
             if($prepayId) {
-                \DAO\Order\OrderModel::getInstance()->update(array('pay_sn'=>$data['paySn']), array('prepay_id'=>$prepayId));
+                $dbName = \Our\DbNameConst::masterDBConnectName;
+                \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$data['paySn']), array('prepay_id'=>$prepayId));
             }
         }else if($data['channel'] == \Our\NameConst::qqAppChannel){
             $qPay = QPay::getInstance();

application/models/Business/Store/DeliveryService.php

@@ -130,23 +130,36 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $where['member_id']=$member['memberId'];
         $res=$deliveryManDao->getByWhere($where);
         if($res){
+            $res=$res[ApiConst::zero];
+        }
+        if($res && !$res['isDel']){
             ErrorModel::throwException(CodeConfigModel::alreadyExsitDeliveryMan);
         }
-        $trueName=$trueName?$trueName:$member['memberName'];
-        $deliveryManData['true_name']=$trueName;
-        $deliveryManData['mobile']=$memberMobile;
-        $deliveryManData['scores']=ApiConst::five;
-        $deliveryManData['store_id']=$storeId;
-        $deliveryManData['add_time']=TIMESTAMP;
-        $deliveryManData['update_time']=TIMESTAMP;
-        $deliveryManData['member_id']=$member['memberId'];
-        $deliveryManData['bind_status']=ApiConst::one;
-        $deliveryManData['is_del']=ApiConst::zero;
-        $resData=$deliveryManDao->insert($deliveryManData);
+        if($res['isDel']==ApiConst::deleteStateOne){
+            $updateData['is_del']=ApiConst::zero;
+            $updateData['true_name']=$trueName;
+            $updateData['update_time']=TIMESTAMP;
+            $deliveryManWhere['id']=$res['id'];
+            $resData= $deliveryManDao->update($deliveryManWhere,$updateData);
+            $memberData['diliveryman_id'] =$res['id'];
+            $resData=$res['id'];
+        }else{
+            $trueName=$trueName?$trueName:$member['memberName'];
+            $deliveryManData['true_name']=$trueName;
+            $deliveryManData['mobile']=$memberMobile;
+            $deliveryManData['scores']=ApiConst::five;
+            $deliveryManData['store_id']=$storeId;
+            $deliveryManData['add_time']=TIMESTAMP;
+            $deliveryManData['update_time']=TIMESTAMP;
+            $deliveryManData['member_id']=$member['memberId'];
+            $deliveryManData['bind_status']=ApiConst::one;
+            $deliveryManData['is_del']=ApiConst::zero;
+            $resData=$deliveryManDao->insert($deliveryManData);
+            $memberData['diliveryman_id']=$resData;
+        }
         if(!$resData){
             ErrorModel::throwException(CodeConfigModel::addDeliveryManError);
         }
-        $memberData['diliveryman_id']=$resData;
         $memberDao->saveInfo($memberData,$member['memberId']);
         $storeDao->deleteStoreCache($storeId);
         $storeDao->deleteStoreRefundCache($storeId);

application/models/Business/Store/ShopkeeperService.php

@@ -509,6 +509,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         }
         $diliveryMan = \DAO\Order\DiliverymanModel::getInstance();
         $diliveryMans=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$diliveryMan, 'getDeliveryManByStoreId'), array($storeId), \Our\ApiConst::oneDaySecond, array($storeId));
+       // $diliveryMans=$diliveryMan->getDeliveryManByStoreId($storeId);
         foreach($diliveryMans as &$dilivery){
             $dilivery['memberAvatar']=$memberDao->getMemberAvatar($dilivery['memberId']);
         }

application/models/DAO/Order/Diliveryman.php

@@ -71,7 +71,17 @@ class DiliverymanModel extends \DAO\AbstractModel
         $result=$this->find($where);
         return $result;
     }
-
+    /**
+     * 插入数据
+     * @param $data
+     * @param $where
+     * @return mixed
+     */
+    public function update($where,$data)
+    {
+        $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
+    }
     /**
      * 插入数据
      * @param $data