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

application/models/Business/Store/StoreService.php

@@ -54,7 +54,7 @@ class StoreServiceModel extends \Business\AbstractModel{
                 if($param['sid']) {
                     $sale = \DAO\SaleModel::getInstance()->getOne(array('sale_id'=>$param['sid']),'sale_act_id,member_id');
                     if($sale) {
-                        \DAO\SaleMemberModel::getInstance()->insert(array('sale_id'=>$sale['member_id'],'sale_act_id'=>$sale['sale_act_id'],'member_id'=>$memberId,'storeId'=>$storeId));
+                        \DAO\SaleMemberModel::getInstance()->insertOrUpdate(array('sale_id'=>$sale['member_id'],'sale_act_id'=>$sale['sale_act_id'],'member_id'=>$memberId,'storeId'=>$storeId));
                     }
                 }
             }else{
@@ -67,9 +67,10 @@ class StoreServiceModel extends \Business\AbstractModel{
                     $scan_sale_ids = $sess->get('scan_sale_ids');
                     is_array($scan_sale_ids) ? $scan_sale_ids = $scan_sale_ids : $scan_sale_ids = [];
                     $sid = (int)$param['sid'];
-                    array_push($scan_sale_ids,$sid);
-                    //$scan_sale_ids[$sid.','.$aid] = array('sid'=>$sid,'aid'=>$aid);
-                    $sess['scan_sale_ids'] = array_unique($scan_sale_ids);
+                    $scan_sale_ids[$sid] = $storeId;
+                    //array_push($scan_sale_ids,$sid);
+                    //$scan_sale_ids[$sid.','.$aid] = array($sid=>$storeId);
+                    $sess['scan_sale_ids'] = $scan_sale_ids;
                 }
             }
         }

application/models/Business/User/FeedBackService.php

@@ -14,14 +14,16 @@ class FeedBackServiceModel extends \Business\AbstractModel
     public function saveFeedback($param,$memberId){
         $feedbackDescribe = trim($param['feedbackDescribe']);
         $feedbackTelepone = trim($param['feedbackTelepone']);
+        $feedbackTelephone = trim($param['feedbackTelephone']);
+        $telephone = $feedbackTelepone ?  $feedbackTelepone : $feedbackTelephone;
         $type = (int)$param['type'];
         if(!$feedbackDescribe){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyFeedbackDescribe);
         }
-        if(!$feedbackTelepone){
+        if(!$telephone){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyFeedbackDescribe);
         }
-        $return = \Our\Common::checkMobilePhone($feedbackTelepone);
+        $return = \Our\Common::checkMobilePhone($telephone);
         if($return === false){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::feedbackTelError);
         }
@@ -44,7 +46,7 @@ class FeedBackServiceModel extends \Business\AbstractModel
         $insert['feedback_image'] = serialize($imgArr);
         $insert['feedback_describe'] = $feedbackDescribe;
         $insert['feedback_time'] = time();
-        $insert['feedback_telepone'] = $feedbackTelepone;
+        $insert['feedback_telepone'] = $telephone;
         $insert['member_id'] = $memberId;
 
         $return = \DAO\FeedBackModel::getInstance()->insert($insert);

application/models/DAO/SaleMember.php

@@ -117,6 +117,14 @@ class SaleMemberModel extends \DAO\AbstractModel {
         return $this->db->insert($this->_tableName)->rows($data)->execute();
     }
 
+    public function insertOrUpdate($data){
+        $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $baseSql = "insert  into {$this->_tableName}(sale_id,sale_act_id,member_id,store_id) values({0},{1},{2},{3}) ON DUPLICATE KEY UPDATE  sale_id=VALUES (sale_id)";
+        $sql = \Our\Common::format($baseSql, $data['sale_id'], $data['sale_act_id'],$data['member_id'],$data['store_id']);
+        return $this->db->insert($this->_tableName)->query($sql);
+    }
+
+
     public function insertAllOrUpdate($datas){
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $error = 0;
@@ -149,6 +157,7 @@ class SaleMemberModel extends \DAO\AbstractModel {
         return true;
     }
 
+
     /**
      * 类实例
      *