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

application/library/Our/NameConst.php

@@ -149,6 +149,7 @@ class NameConst {
     const waitShipments = 'waitShipments';//待发货
     const waitReceiving = 'waitReceiving';//待收货
     const waitEvaluate = 'waitEvaluate';//待评价
+    const waitSelfLifting = 'waitSelfLifting';//待自提
     const refund = 'refund';//退款中
     const storeCollection = 'storeCollection';//店铺收藏数量
     const goodsCollection = 'goodsCollection';//商品收藏数量

application/models/Business/Store/StoreService.php

@@ -133,7 +133,11 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $favType = 1;
             }
         }
-        return array('storeLabel'=>$storeLabel,'storeName'=>$storeInfo['store_name'],'grade'=>$grade,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'favType'=>$favType,'monthlySalesCount'=>$monthlySalesCount,'defaultDeliveryTime'=>$defaultDeliveryTime,'freeShippingPrice'=>$storeInfo['free_shipping_price'],'storeDistance'=>$distince,'storeNotice'=>$storeInfo['store_notice'],'startShippingPrice'=>$storeInfo['start_shipping_price'],'memberId'=>$storeInfo['member_id'],'inStoreService'=>$in_store_service_flag,'adv'=>$adv,'memberId'=>$storeInfo['member_id']);
+        //营业时间
+        $businessHours = $storeInfo['store_start_time'].' - '.$storeInfo['store_close_time'];
+        $sellerDistribution = $storeInfo['seller_distribution'];
+        $buyerDistribution = $storeInfo['buyer_distribution'];
+        return array('storeLabel'=>$storeLabel,'storeName'=>$storeInfo['store_name'],'grade'=>$grade,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'favType'=>$favType,'monthlySalesCount'=>$monthlySalesCount,'defaultDeliveryTime'=>$defaultDeliveryTime,'freeShippingPrice'=>$storeInfo['free_shipping_price'],'storeDistance'=>$distince,'storeNotice'=>$storeInfo['store_notice'],'startShippingPrice'=>$storeInfo['start_shipping_price'],'memberId'=>$storeInfo['member_id'],'inStoreService'=>$in_store_service_flag,'adv'=>$adv,'memberId'=>$storeInfo['member_id'],'businessHours'=>$businessHours,'sellerDistribution'=>$sellerDistribution,'buyerDistribution'=>$buyerDistribution);
     }
 
     /**

application/models/Business/User/FeedBackService.php

@@ -19,7 +19,7 @@ class FeedBackServiceModel extends \Business\AbstractModel
      * @return bool
      * @throws \Exception
      */
-    public function saveFeedback($param, $storeId, $memberId) {
+    public function saveStoreFeedback($param, $storeId, $memberId) {
         $storeDAO = \DAO\StoreModel::getInstance();
         $feedbackDescribe = trim($param['feedbackDescribe']);
         if(!$feedbackDescribe){
@@ -41,6 +41,51 @@ class FeedBackServiceModel extends \Business\AbstractModel
         return true;
 
     }
+
+    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 || mb_strlen($feedbackDescribe) < 10){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyFeedbackDescribe);
+        }
+//        if(!$telephone){
+//            \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyFeedbackDescribe);
+//        }
+//        $return = \Our\Common::checkMobilePhone($telephone);
+//        if($return === false){
+//            \Error\ErrorModel::throwException(\Error\CodeConfigModel::feedbackTelError);
+//        }
+        $imgArr = array();
+        for ($i = 0 ; $i < 2 ; $i++){
+            $number = str_replace(array(0,1,2),array('A','B','C'),$i);
+            $image = $param['image'.$number];
+            if($image && $type == 0){
+                $time = date('YmdHis_');
+                $file_name = $time.\Our\Validate::getNumberString();
+                $result = \Our\ImageUtil::uploadBase64Image($image,\Our\ImageConst::feedback,$file_name);
+                if($result){
+                    $result = \Our\Common::getStaticFile($file_name,\Our\ImageConst::feedback);
+                    $imgArr[] = pathinfo($result)['basename'];
+                }
+            }else{
+                $imgArr[] = pathinfo($image)['basename'];
+            }
+        }
+        $insert = array();
+        $insert['feedback_image'] = serialize($imgArr);
+        $insert['feedback_describe'] = $feedbackDescribe;
+        $insert['feedback_time'] = time();
+        $insert['feedback_telephone'] = $telephone;
+        $insert['member_id'] = $memberId;
+
+        $return = \DAO\FeedBackModel::getInstance()->insert($insert);
+        if(!$return){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveFeedbackError);
+        }
+    }
     private static $_instance = null;
 
     /**

application/models/Business/User/MemberCenterService.php

@@ -89,8 +89,10 @@ class MemberCenterServiceModel extends \Business\AbstractModel
             $memberCenter[NameConst::waitShipments] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateWaitSend,'buyer_id'=>$memberId));
             //待收货数量
             $memberCenter[NameConst::waitReceiving] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateWaitRecieve,'buyer_id'=>$memberId));
+            //待自提数量
+            $memberCenter[NameConst::waitSelfLifting] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateComplete,'buyer_id'=>$memberId,'evaluation_state'=>ApiConst::waitEvaluation));
             //待评价数量
-            $memberCenter[NameConst::waitEvaluate] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateComplete,'buyer_id'=>$memberId,'evaluation_state'=>ApiConst::waitEvaluation));
+            $memberCenter[NameConst::waitEvaluate] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateWaitRecieve,'buyer_id'=>$memberId,'shipping_type'=>ApiConst::bySelf));
             //退款中数量
             $memberCenter[NameConst::refund] = \DAO\Order\RefundReturnModel::getInstance()->getCount('refund_state != '.ApiConst::refundStateComplete.' AND buyer_id = '.$memberId);
             //店铺收藏数量
@@ -121,6 +123,10 @@ class MemberCenterServiceModel extends \Business\AbstractModel
                 $memberCenter[NameConst::waitReceiving] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateWaitRecieve,'buyer_id'=>$memberId));
                 $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitReceiving,$memberCenter[NameConst::waitReceiving]);
             }
+            if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitSelfLifting) === false){
+                $memberCenter[NameConst::waitSelfLifting] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateComplete,'buyer_id'=>$memberId,'evaluation_state'=>ApiConst::waitEvaluation));
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitSelfLifting,$memberCenter[NameConst::waitSelfLifting]);
+            }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitEvaluate) === false){
                 $memberCenter[NameConst::waitEvaluate] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateComplete,'buyer_id'=>$memberId,'evaluation_state'=>ApiConst::waitEvaluation));
                 $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitEvaluate,$memberCenter[NameConst::waitEvaluate]);

application/models/Error/CodeConfig.php

@@ -790,7 +790,7 @@ class CodeConfigModel
             self::saleNotJoin => '你没有参加这个销售活动',
             self::saleActOrGoodsNotExist => '活动或商品不存在',
             //意见信箱
-            self::emptyFeedbackDescribe => '反馈内容不能为空',
+            self::emptyFeedbackDescribe => '请填写10个字以上的清楚问题描述以便我们提供更好的帮助',
             self::emptyFeedbackTelepone => '联系方式不能为空',
             self::saveFeedbackError => '保存意见反馈信息失败',
             self::feedbackTelError => '手机号码格式错误',

application/modules/Client/controllers/Feedback.php

@@ -7,7 +7,7 @@ class FeedbackController extends \Our\Controller_AbstractClient {
     }
 
     public function saveFeedbackAction(){
-        $msg = \Business\User\FeedBackServiceModel::getInstance()->saveFeedback($this->req[\Our\NameConst::data], $this->storeId, $this->memberId);
+        $msg = \Business\User\FeedBackServiceModel::getInstance()->saveStoreFeedback($this->req[\Our\NameConst::data], $this->storeId, $this->memberId);
         $this->success('');
     }
 }
\ No newline at end of file