Skip to content

M
my-yaf-project
Commit 8b28ea44 authored by wwccw0591's avatar wwccw0591
Browse files
Options

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

parents 6966a8d1 053360e3
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 2 deletions
application/models/Business/Goods/GoodsCommonService.php
View file @ 8b28ea44
...@@ -365,7 +365,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -365,7 +365,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
if($image && is_array($image)){ if($image && is_array($image)){
$i = 0; $i = 0;
foreach ($image as $k=>$v){ foreach ($image as $k=>$v){
$image[$k]['goods_image'] = \Our\ImageUtil::getGoodsImgUrl($v['goods_image'],\Our\ImageConst::SpecSelectGoodsImgSize); //$image[$k]['goods_image'] = \Our\ImageUtil::getGoodsImgUrl($v['goods_image'],\Our\ImageConst::SpecSelectGoodsImgSize);
$image[$k]['goods_image'] = \Our\ImageUtil::getGoodsImgUrl($v['goods_image'],\Our\ImageConst::goodsDetailImgSize);
$attrImage[$v['attr_name']][$v['attr_value']][] = $image[$k]['goods_image']; $attrImage[$v['attr_name']][$v['attr_value']][] = $image[$k]['goods_image'];
if($i < 5 && !$haveImg){ if($i < 5 && !$haveImg){
$images[] = \Our\ImageUtil::getGoodsImgUrl($v['goods_image'],\Our\ImageConst::goodsDetailImgSize); $images[] = \Our\ImageUtil::getGoodsImgUrl($v['goods_image'],\Our\ImageConst::goodsDetailImgSize);
...@@ -388,7 +389,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -388,7 +389,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
if(key_exists($v1,$attrImage[$k])){ if(key_exists($v1,$attrImage[$k])){
$tempArr['images'][] = array('attrValue'=>$v1,'images'=>$attrImage[$k][$v1]); $tempArr['images'][] = array('attrValue'=>$v1,'images'=>$attrImage[$k][$v1]);
}else{ }else{
$tempArr['images'][] = array('attrValue'=>$v1,'images'=>[]); $tempArr['images'][] = array('attrValue'=>$v1,'images'=>$images);
} }
} }
$tempArr['isPrimeAttribute'] = 1; $tempArr['isPrimeAttribute'] = 1;
......
application/models/Business/Message/MessageService.php
View file @ 8b28ea44
...@@ -146,6 +146,11 @@ class MessageServiceModel extends \Business\AbstractModel ...@@ -146,6 +146,11 @@ class MessageServiceModel extends \Business\AbstractModel
// $storeData = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$store, 'getInfoById'), array($userid, $store->detailField), \Our\ApiConst::oneDaySecond,array($userid)); // $storeData = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$store, 'getInfoById'), array($userid, $store->detailField), \Our\ApiConst::oneDaySecond,array($userid));
$storeData=$store->getStoreInfoCache($userid); $storeData=$store->getStoreInfoCache($userid);
$avatar = $storeData['store_label']; $avatar = $storeData['store_label'];
if ($avatar) {
$avatar = \Our\Common::getStaticFile($avatar, \Our\ImageConst::storeLabel, 'ossHost');
} else {
$avatar = \Our\Common::getStaticFile(ImageConst::defaultStoreLabelName, ImageConst::defaultPath);
}
// $avatar = $store->getInfoById($userid, 'store_label', 'store_label'); // $avatar = $store->getInfoById($userid, 'store_label', 'store_label');
// $avatar = $storeData[ApiConst::one]; // $avatar = $storeData[ApiConst::one];
} }
......
public/test/message/get1.php 0 → 100644
View file @ 8b28ea44
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>获得已发送消息的用户列表和(系统消息，订单消息，快递用户消息最后一条消息）</title>
<style>
</style>
</head>
<body>
<form action="/message/get" method="post">
用户登录状态key:<input name="data[key]" value="fd4b739c4815297044191451eabf0eb5"/><br />
<input type="submit" value="提交">
</form>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment