sale

application/library/Our/ImageConst.php

@@ -111,6 +111,7 @@ class ImageConst{
     const groupGoodsImg = 160; //组合详情页的搭配商品
     const storeGroupImg = 186; //店铺促销
     const storeGroupGoodsImg = 130;
+    const salestoreImg = 129;//销售详情店铺头像
 
     const cartBlImage = 184;
     const cartBlDetailImage = 148;

application/models/Business/Goods/GoodsCommonService.php

@@ -414,7 +414,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $html = array('width'=>750,'height'=>$commonInfo['goods_height'],'url'=>\Our\Common::getBaseUrl().'/index/goodsDetail?goodsCommonId='.$goodsCommonId);
         if($commonInfo['is_del'] == 1) $commonInfo['goods_state'] = 0;
         unset($attrs['commonInfo']);
-        return array_merge(array('storeId'=>$commonInfo['store_id'],'goodsId'=>$commonInfo['goodsId'],'goodsName'=>$commonInfo['goods_name'],'goodsVerify'=>$commonInfo['goods_verify'],'goodsState'=>$commonInfo['goods_state'],'saleCount'=>$commonInfo['sale_num'],'collectionState'=>$collectionState,'isOwn'=>$isOwn,'isHot'=>$commonInfo['goods_hot'],'isRecoment'=>$commonInfo['goods_commend'],'isFree'=>$commonInfo['goods_free'],'isVirtual'=>$commonInfo['is_virtual'],'goodsMostLimit'=>$commonInfo['goods_most_limit'],'goodsLeastLimit'=>$commonInfo['goods_least_limit'],'goodsTotalLimit'=>$commonInfo['goods_total_limit'],'address'=>$area,'range'=>$rangePrice,'productData'=>$productData,'htmlContent'=>$html,'videoUrl'=>$commonInfo['goods_youku_url'],'inStoreService'=>$in_store_service_flag),$attrs);
+        return array_merge(array('storeId'=>$commonInfo['store_id'],'goodsId'=>$commonInfo['goodsId'],'goodsName'=>$commonInfo['goods_name'],'goodsVerify'=>$commonInfo['goods_verify'],'goodsState'=>$commonInfo['goods_state'],'saleCount'=>$commonInfo['sale_num'],'collectionState'=>$collectionState,'isOwn'=>$isOwn,'isHot'=>$commonInfo['goods_hot'],'isRecoment'=>$commonInfo['goods_commend'],'isFree'=>$commonInfo['goods_free'],'isVirtual'=>$commonInfo['is_virtual'],'goodsMostLimit'=>$commonInfo['goods_most_limit'],'goodsLeastLimit'=>$commonInfo['goods_least_limit'],'goodsTotalLimit'=>$commonInfo['goods_total_limit'],'address'=>$area,'range'=>$rangePrice,'productData'=>$productData,'htmlContent'=>$html,'videoUrl'=>$commonInfo['goods_youku_url'],'subheading'=>$commonInfo['goods_jingle'],'inStoreService'=>$in_store_service_flag),$attrs);
     }
     public function getAttr($goodsCommonId,$memberId = null){
         $goodsCommonId = (int)$goodsCommonId;

application/models/Business/User/SalespersonService.php

@@ -80,6 +80,8 @@ class SalespersonServiceModel extends \Business\AbstractModel
 
         $orderGoodsList = \Our\RedisHelper::cachedFunction(\Redis\Db1\SaleOrderRedisModel::getInstance(),array(&$saleOrderDAO, 'getOrderGoodsList'),array("sale_act_id in(".implode(',',$saleActArr).") AND sale_id = {$memberId} AND goods_id in(".implode(',',$goodsIds).")",'sum(goods_num) AS goodsCount,goods_name AS goodsName,goods_image AS goodsImage,goods_id AS goodsId,sale_act_id','goods_id',[],'sale_act_id'),\Our\ApiConst::halfDaySecond,array($memberId));
         $existIds = [];
+        $storeModelDAO = \DAO\StoreModel::getInstance();
+        //数据处理
         if($orderGoodsList && is_array($orderGoodsList)) {
             foreach ($orderGoodsList as $v){
                 $existIds[] = $v['goodsId'];
@@ -96,16 +98,18 @@ class SalespersonServiceModel extends \Business\AbstractModel
                 if(key_exists($v['sale_act_id'],$acts)){
                     array_push($acts[$v['sale_act_id']]['goods'],$goods);
                 }else{
+                    $storeInfo = $storeModelDAO->getStoreInfoCache($actList[$v['sale_act_id']]['store_id']);
+                    $storeLabel = $storeInfo->getStoreLabelSrc($storeInfo['store_label'],\Our\ImageConst::salestoreImg);
                     $qrCode = \Our\Common::getStaticFile($tempActs[$v['sale_act_id']],\Our\ImageConst::salesmanQr);
                     $hashData[$v['sale_act_id']][$v['sale_act_id'].'_'.$memberId] = $qrCode;
                     $acts[$v['sale_act_id']] = [
                         'storeId'=>$actList[$v['sale_act_id']]['store_id'],
-                        'storeName'=>$actList[$v['sale_act_id']]['store_name'],
+                        'storeName'=>$storeInfo['store_name'],
                         'actId'=>$v['sale_act_id'],
                         'actName'=>$actList[$v['sale_act_id']]['sale_title'],
                         'qrCode'=>$qrCode,
-                        'memberName'=>$memberName,
-                        'memberAvatarUrl'=>$memberAvatarUrl,
+                        'memberName'=>$storeInfo['store_name'],
+                        'memberAvatarUrl'=>$storeLabel,
                         'goods'=>$goods ? array($goods) : $goods
                     ];
                 }
@@ -113,6 +117,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
         }
         if(is_array($goodsIds) && $goodsIds) {
             foreach ($goodsIds as $id){
+                //没有销售量的商品，即在sale_order表中不存在数据的商品
                 if(!in_array($id,$existIds)){
                     if($goodsList[$id]) {
                         $data = [
@@ -129,15 +134,17 @@ class SalespersonServiceModel extends \Business\AbstractModel
                     if(key_exists($saleGoods[$id],$acts)){
                         array_push($acts[$saleGoods[$id]]['goods'],$data);
                     }else{
+                        $storeInfo = $storeModelDAO->getStoreInfoCache($actList[$saleGoods[$id]]['store_id']);
+                        $storeLabel = $storeInfo->getStoreLabelSrc($storeInfo['store_label'],\Our\ImageConst::salestoreImg);
                         $qrCode = \Our\Common::getStaticFile($tempActs[$saleGoods[$id]],\Our\ImageConst::salesmanQr);
                         $acts[$saleGoods[$id]] = [
                             'storeId'=>$actList[$saleGoods[$id]]['store_id'],
-                            'storeName'=>$actList[$saleGoods[$id]]['store_name'],
+                            'storeName'=>$storeInfo['store_name'],
                             'actId'=>$saleGoods[$id],
                             'actName'=>$actList[$saleGoods[$id]]['sale_title'],
                             'qrCode'=>$qrCode,
-                            'memberName'=>$memberName,
-                            'memberAvatarUrl'=>$memberAvatarUrl,
+                            'memberName'=>$storeInfo['store_name'],
+                            'memberAvatarUrl'=>$storeLabel,
                             'goods'=>$data ? array($data) : $data
                         ];
                         $hashData[$saleGoods[$id]][$saleGoods[$id].'_'.$memberId] = $qrCode;
@@ -231,15 +238,18 @@ class SalespersonServiceModel extends \Business\AbstractModel
             $qrcode = \Redis\Db1\SaleOrderRedisModel::getInstance()->tableHGet('orderGoods_'.$actId,$actId.'_'.$memberId);
             $goods = \Redis\Db1\SaleOrderRedisModel::getInstance()->tableHGet('orderGoods_'.$actId,$actId.'_'.$memberId.'_'.$goodsId);
         }
+        $storeModelDAO = \DAO\StoreModel::getInstance();
         if($act && $qrcode && $goods) {
             $act = unserialize($act);
             $goods = unserialize($goods);
+            $storeInfo = $storeModelDAO->getStoreInfoCache($act['store_id']);
+            $storeLabel = $storeInfo->getStoreLabelSrc($storeInfo['store_label'],\Our\ImageConst::salestoreImg);
             $info['storeId'] = $act['store_id'];
-            $info['storeName'] = $act['store_name'];
+            $info['storeName'] = $storeInfo['store_name'];
             $info['actName'] = $act['sale_title'];
             $info['qrCode'] = $qrcode;
-            $info['memberName'] = $memberName;
-            $info['memberAvatarUrl'] = $memberAvatarUrl;
+            $info['memberName'] = $storeInfo['store_name'];
+            $info['memberAvatarUrl'] = $storeLabel;
             $info = array_merge($info,$goods);
         }else{
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::saleActOrGoodsNotExist);