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

application/library/Our/ImageConst.php

@@ -99,5 +99,10 @@ class ImageConst{
     const goodsDetailImgSize = 750;
     const goodsCollectionImgSize = 336;
     const footPrintGoodsImgSize = 216;
+    const circleStoreLabel = 124;
+    const commentCircleStoreLabel = 48;
+    const storeQualificationImg = 188;
+    const storeCollectionImg = 112;
     const homeIndexHotGoodsImageSize =250;
+
 }

application/models/Business/Goods/CommentService.php

@@ -61,7 +61,8 @@ class CommentServiceModel extends \Business\AbstractModel {
             $groupId = $comment['goods_id'];
         }
         $attr = \DAO\GoodsModel::getInstance()->getFormatGoodsAttr($comment['goods_spec']);
-        list($storeInfo,$storeLabel) = \DAO\StoreModel::getInstance()->get($comment['store_id']);
+        $storeInfo = \DAO\StoreModel::getInstance()->get($comment['store_id'],false);
+        $storeLabel = \DAO\StoreModel::getInstance()->getStoreLabelSrc($storeInfo['store_label'],\Our\ImageConst::commentCircleStoreLabel);
         $goodsDao = \DAO\GoodsModel::getInstance();
         $goods = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsRedisModel::getInstance(),array(&$goodsDao, 'find'),array(array('goods_id'=>$comment['goods_id']),'*'),\Our\ApiConst::oneHour,array($comment['goods_id']));
         return array('content'=>$comment['content'],'addTime'=>$comment['addtime'],'goodsName'=>$comment['goods_name'],'goodsImage'=>\Our\ImageUtil::getGoodsImgUrl($comment['goods_image'],\Our\ImageConst::CommentDetailGoodsImgSize),'goodsAttr'=>$attr,'goodsPrice'=>(int)$comment['goods_pay_price'],'storeLabel'=>$storeLabel,'storeName'=>$storeInfo['store_name'],'storeId'=>$comment['store_id'],'goodsCommonId'=>$goodsCommonId,'groupId'=>$groupId);

application/models/Business/Goods/GoodsCommonService.php

@@ -451,7 +451,6 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
             \DAO\MemberModel::getInstance()->_changeNum(\Our\NameConst::goodsCollection,$memberId);
             return true;
         }
-        \Error\ErrorModel::throwException(\Error\CodeConfigModel::commonError);
     }
 
 

application/models/Business/Order/OrderService.php

@@ -53,7 +53,7 @@ class OrderServiceModel extends \Business\AbstractModel
 
     private function getGoodsDetailField()
     {
-        return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_group as goodsGroup';
+        return $this->orderGoodsField . ',goods_commonid as goodsCommonId,goods_commonid as goodsCommonid,goods_group as goodsGroup';
     }
 
     public function getOrderIndexWhere($memberId, $keyword, $pageIndex, $pageSize)
@@ -486,26 +486,28 @@ class OrderServiceModel extends \Business\AbstractModel
 
         if (!empty($orders)) {
             $orderIds = array_column($orders, 'orderId');
-//            $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
-//            $storeCartsList=array();
-//            $storeCarts=array();
-//            $storeCarts['storeCarts']=array();
-//            foreach($orderGoods as $orderGood){
-//                $orderGood['type']=!empty($orderGood['goodsGroup'])? \Our\ApiConst::addBundingToCart:\Our\ApiConst::addGoodsToCart;
-//                $orderGood['goodsNum']=-$orderGood['goodsNum'];
-//                $orderGood['goodsList']=\Our\Common::isSerialized($orderGood['goodsGroup'])?unserialize($orderGood['goodsGroup']):array();
-//                array_push($storeCarts['storeCarts'],$orderGood);
-//            }
-//            if(!empty($storeCarts['storeCarts'])){
-//                array_push($storeCartsList,$storeCarts);
-//            }
-//            // $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField);
-//            try{
-//                $orderConfirmUtilDao->updateGoodsStorage($storeCartsList);
-//            }catch(\Exception $ex){
-//                throw new \Exception('商品库存更新失败:'.$ex->getMessage(),$ex->getCode());
-//            }
-//            exit;
+            $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
+            $storeCartsList=array();
+            $storeCarts=array();
+            $storeCarts['storeCarts']=array();
+            foreach($orderGoods as $orderGood){
+                $orderGood['type']=!empty($orderGood['goodsGroup'])? \Our\ApiConst::addBundingToCart:\Our\ApiConst::addGoodsToCart;
+                $orderGood['goodsNum']=$orderGood['goodsNum'];
+                $orderGood['goodsList']=\Our\Common::isSerialized($orderGood['goodsGroup'])?unserialize($orderGood['goodsGroup']):array();
+                array_push($storeCarts['storeCarts'],$orderGood);
+            }
+            if(!empty($storeCarts['storeCarts'])){
+                array_push($storeCartsList,$storeCarts);
+            }
+            // $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField);
+            try{
+                $orderConfirmUtilDao->updateGoodsStorage($storeCartsList,\Our\ApiConst::plus);
+            }catch(\Exception $ex){
+                $orderidsStr=implode(',',array_column($orders,'orderId'));
+                echo '商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
+            }
+            echo 1;
+            exit;
 
                 foreach ($orders as $order) {
                     //更新订单信息
@@ -516,7 +518,7 @@ class OrderServiceModel extends \Business\AbstractModel
                             $this->changeOrderStateCancelUnconditional($order);
                         }
                     }
-                    $orderDao->deleteOrderCache($order['buyerId'],$order['orderId'],$order['storeId']);
+                    $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId']);
                 }
             $push = Push::getInstance();
             $push->pushOrderCloseMessage($orders);

application/models/Business/Order/RefundService.php

@@ -53,7 +53,7 @@ class RefundServiceModel extends \Business\AbstractModel
 
     private function getGoodsDetailField()
     {
-        return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_spec as goodsSpec ';
+        return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_commonid as goodsCommonId,goods_spec as goodsSpec ';
     }
 
     /**

application/models/Business/Store/ShopkeeperService.php

@@ -341,7 +341,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 
     private function getGoodsDetailField()
     {
-        return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_spec as goodsSpec ';
+        return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_commonid as goodsCommonId,goods_goods_spec as goodsSpec ';
     }
 
     /**

application/models/Business/Store/StoreService.php

@@ -154,7 +154,7 @@ class StoreServiceModel extends \Business\AbstractModel{
             $storeDetailImg = unserialize($storeInfo['store_detail_image']);
             if($storeDetailImg && is_array($storeDetailImg)){
                 foreach ($storeDetailImg as $v){
-                    $detailImg[] = \DAO\StoreModel::getInstance()->getStoreLabelSrc($v);
+                    $detailImg[] = \DAO\StoreModel::getInstance()->getStoreLabelSrc($v, \Our\ImageConst::storeQualificationImg);
                 }
             }
         }
@@ -368,7 +368,6 @@ class StoreServiceModel extends \Business\AbstractModel{
             \DAO\MemberModel::getInstance()->_changeNum(\Our\NameConst::storeCollection,$memberId);
             return true;
         }
-        \Error\ErrorModel::throwException(\Error\CodeConfigModel::commonError);
     }
 
     /**

application/models/Business/User/MemberCenterService.php

@@ -125,7 +125,7 @@ class MemberCenterServiceModel extends \Business\AbstractModel
         if(is_array($list) && !empty($list)){
             foreach ($list as $v){
                 $v['evaluation_score'] ? $grade = number_format(($v['evaluation_score']/3/$v['evaluation_number']),1,'.',''):$grade = '5.0';
-                $stores[] = array('favid'=>$v['favid'],'storeId'=>$v['store_id'],'storeLabel'=>\DAO\StoreModel::getInstance()->getStoreLabelSrc($v['store_label']),'storeName'=>$v['store_name'],'grade'=>$grade,'collectCount'=>$favoritesInstance->getFavoritesStoreCountByStoreId($v['store_id']));
+                $stores[] = array('favid'=>$v['favid'],'storeId'=>$v['store_id'],'storeLabel'=>\DAO\StoreModel::getInstance()->getStoreLabelSrc($v['store_label'],\Our\ImageConst::storeCollectionImg),'storeName'=>$v['store_name'],'grade'=>$grade,'collectCount'=>$favoritesInstance->getFavoritesStoreCountByStoreId($v['store_id']));
             }
         }
         return array('stores'=>$stores,'totalCount'=>$totalCount);

application/models/Business/User/SalespersonService.php

@@ -86,7 +86,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
                 if($goodsList[$v['goodsId']]) {
                     $goods['goodsId'] = $v['goodsId'];
                     $goods['goodsCommonId'] = $goodsList[$v['goodsId']]['goods_commonid'];
-                    $goods['goodsImage'] = \Our\ImageUtil::getGoodsImgUrl($goodsList[$v['goodsId']]['goods_image'],\Our\ApiConst::SaleGoodsImgSize);
+                    $goods['goodsImage'] = \Our\ImageUtil::getGoodsImgUrl($goodsList[$v['goodsId']]['goods_image'],\Our\ImageConst::SaleGoodsImgSize);
                     $goods['goodsName'] = $goodsList[$v['goodsId']]['goods_name'];
                     $goods['goodsCount'] = (int)$v['goodsCount'];
                     $hashData[$v['sale_act_id']][$v['sale_act_id'].'_'.$memberId.'_'.$v['goodsId']] = serialize($goods);
@@ -116,7 +116,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
                 if(!in_array($id,$existIds)){
                     if($goodsList[$id]) {
                         $data = [
-                            'goodsImage'=>\Our\ImageUtil::getGoodsImgUrl($goodsList[$id]['goods_image'],\Our\ApiConst::SaleGoodsImgSize),
+                            'goodsImage'=>\Our\ImageUtil::getGoodsImgUrl($goodsList[$id]['goods_image'],\Our\ImageConst::SaleGoodsImgSize),
                             'goodsName'=>$goodsList[$id]['goods_name'],
                             'goodsCount'=>0,
                             'goodsId'=>$id,

application/models/DAO/Goods.php

@@ -317,7 +317,8 @@ class GoodsModel extends \DAO\AbstractModel {
             $dataIds[] = $datas[$i]['goodsId'];
             $updateAllSql .= $updateSql;
             if ($i % 1000 == 0 && $i != 0) {
-                $updateAllSql .= \Our\Common::format('END where goods_id in ({0})',implode(',',$dataIds));
+                $updateAllSql = trim($updateAllSql,',');
+                $updateAllSql .= \Our\Common::format(' END where goods_id in ({0})',implode(',',$dataIds));
                 $one = $this->db->update($this->_tableName)->query($updateAllSql);
                 if (!$one) {
                     $error++;
@@ -327,7 +328,8 @@ class GoodsModel extends \DAO\AbstractModel {
             }
         }
         if ($updateAllSql != $baseSql) {
-            $updateAllSql .= \Our\Common::format('END where goods_id in ({0})',implode(',',$dataIds));
+            $updateAllSql = trim($updateAllSql,',');
+            $updateAllSql .= \Our\Common::format(' END where goods_id in ({0})',implode(',',$dataIds));
             $one = $this->db->update($this->_tableName)->query($updateAllSql);
             if (!$one) {
                 $error++;

application/models/DAO/GoodsCommon.php

@@ -208,20 +208,21 @@ class GoodsCommonModel extends \DAO\AbstractModel {
         $datas = array_values($dataList);
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $error = 0;
-        $baseSql = "UPDATE {$this->_tableName} set goods_storage = case goods_commonid ";
+        $baseSql = "UPDATE {$this->_tableName} set ";
         $updateAllSql = $baseSql;
         $dataIds = array();
         if($updateSaleNumFlag&&$op!=\Our\ApiConst::set){
             $updateSaleNumOp = $op==\Our\ApiConst::minus?'+':'-';
         }
         for ($i = 0; $i < count($datas); $i++) {
-            $updateSql = \Our\Common::format(" WHEN {0} THEN goods_storage{1}{2} ", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum']);
+            $updateSql = \Our\Common::format(" goods_storage = case goods_commonid  WHEN {0} THEN goods_storage{1}{2}, ", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum']);
             if($updateSaleNumFlag){
-                $updateSql = \Our\Common::format(" WHEN {0} THEN goods_storage{1}{2} END,sale_num = case goods_commonid when {0} THEN sale_num {3}{2} END", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum'],$updateSaleNumOp);
+                $updateSql = \Our\Common::format(" goods_storage = case goods_commonid  WHEN {0} THEN goods_storage{1}{2} END,sale_num = case goods_commonid when {0} THEN sale_num {3}{2} END,", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum'],$updateSaleNumOp);
             }
             $dataIds[] = $datas[$i]['goodsCommonId'];
             $updateAllSql .= $updateSql;;
             if ($i % 1000 == 0 && $i != 0) {
+                $updateAllSql = trim($updateAllSql,',');
                 $updateAllSql .= \Our\Common::format(' where goods_commonid in ({0})',implode(',',$dataIds));
                 $one = $this->db->update($this->_tableName)->query($updateAllSql);
                 if (!$one) {
@@ -232,6 +233,7 @@ class GoodsCommonModel extends \DAO\AbstractModel {
             }
         }
         if ($updateAllSql != $baseSql) {
+            $updateAllSql = trim($updateAllSql,',');
             $updateAllSql .= \Our\Common::format(' where goods_commonid in ({0})',implode(',',$dataIds));
             $one = $this->db->update($this->_tableName)->query($updateAllSql);
 

application/models/DAO/Store.php

@@ -77,18 +77,21 @@ class StoreModel extends \DAO\AbstractModel
     }
 
     /**
-     * 店铺头像
+     * 店铺头像/资质图片
      *
      * @param $storeLabel
      * @return string
      */
-    public function getStoreLabelSrc($storeLabel)
+    public function getStoreLabelSrc($storeLabel, $width = \Our\ImageConst::circleStoreLabel, $height = 0)
     {
+        $width = $width * \Our\ImageConst::sizeScale;
+        $height ? $height = $height * \Our\ImageConst::sizeScale : $height = $width;
         if ($storeLabel) {
             $storeLabel = \Our\Common::getStaticFile($storeLabel, \Our\ImageConst::storeLabel, 'ossHost');
         } else {
             $storeLabel = \Our\Common::getStaticFile(ImageConst::defaultStoreLabelName, ImageConst::defaultPath);
         }
+        $storeLabel .= "?x-oss-process=image/resize,m_fill,h_{$height},w_{$width}";
         return $storeLabel;
     }
     /**