message

application/models/Business/Store/DeliveryService.php

@@ -129,20 +129,28 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $where['store_id']=$storeId;
         $where['member_id']=$member['memberId'];
         $res=$deliveryManDao->getByWhere($where);
-        if($res){
+
+        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){
+            $res['isDel']=ApiConst::zero;
+            $deliveryManWhere['id']=$res['id'];
+            $resData= $deliveryManDao->update($deliveryManWhere,$res);
+        }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);
+        }
+
         if(!$resData){
             ErrorModel::throwException(CodeConfigModel::addDeliveryManError);
         }

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