|
@@ -33,9 +33,12 @@ import com.slodon.b2b2c.model.member.MemberFollowProductModel;
|
|
|
import com.slodon.b2b2c.model.member.MemberFollowStoreModel;
|
|
|
import com.slodon.b2b2c.model.promotion.PromotionCommonModel;
|
|
|
import com.slodon.b2b2c.model.seller.StoreModel;
|
|
|
+import com.slodon.b2b2c.model.seller.StoreNameModel;
|
|
|
import com.slodon.b2b2c.model.seller.StoreSiteInfoModel;
|
|
|
import com.slodon.b2b2c.model.system.RegionCityModel;
|
|
|
+import com.slodon.b2b2c.seller.example.StoreNameExample;
|
|
|
import com.slodon.b2b2c.seller.pojo.Store;
|
|
|
+import com.slodon.b2b2c.seller.pojo.StoreName;
|
|
|
import com.slodon.b2b2c.system.example.RegionCityExample;
|
|
|
import com.slodon.b2b2c.system.pojo.RegionCity;
|
|
|
import com.slodon.b2b2c.system.pojo.SysSeo;
|
|
@@ -108,8 +111,10 @@ public class GoodsDetailsController extends BaseController {
|
|
|
|
|
|
@Resource
|
|
|
private GoodsAnnexModel goodsAnnexModel;
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private StoreSiteInfoModel storeSiteInfoModel;
|
|
|
+ @Resource
|
|
|
+ private StoreNameModel storeNameModel;
|
|
|
|
|
|
@ApiOperation("获取商品详情---静态数据")
|
|
|
@ApiImplicitParams({
|
|
@@ -167,8 +172,23 @@ public class GoodsDetailsController extends BaseController {
|
|
|
List<GoodsPicture> goodsPictureList = goodsPictureModel.getGoodsPictureList(goodsPictureExample, null);
|
|
|
String webSite = WebUtil.getWebSite(request);
|
|
|
Store store = storeModel.getStoreByStoreId(goods.getStoreId());
|
|
|
+ Integer isOwnStore = store.getIsOwnStore();
|
|
|
+ String deliverScore = store.getDeliverScore();
|
|
|
+ Integer followNumber=store.getFollowNumber();
|
|
|
+ String descriptionScore = store.getDescriptionScore();
|
|
|
+ String serviceScore=store.getServiceScore();
|
|
|
if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)) {
|
|
|
store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(goods.getStoreId(), webSite);
|
|
|
+ StoreNameExample storeNameExample = new StoreNameExample();
|
|
|
+ storeNameExample.setStoreId(goods.getStoreId());
|
|
|
+ storeNameExample.setWebSite(webSite);
|
|
|
+ StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
|
|
|
+ store.setStoreName(storeName != null ? storeName.getStoreName() : "未知");
|
|
|
+ store.setIsOwnStore(isOwnStore);
|
|
|
+ store.setDeliverScore(deliverScore);
|
|
|
+ store.setFollowNumber(followNumber);
|
|
|
+ store.setDescriptionScore(descriptionScore);
|
|
|
+ store.setServiceScore(serviceScore);
|
|
|
}
|
|
|
//默认店铺logo
|
|
|
if (StringUtils.isEmpty(store.getStoreLogo())) {
|
|
@@ -293,6 +313,25 @@ public class GoodsDetailsController extends BaseController {
|
|
|
List<GoodsPicture> goodsPictureList = goodsPictureModel.getGoodsPictureList(goodsPictureExample, null);
|
|
|
|
|
|
Store store = storeModel.getStoreByStoreId(goods.getStoreId());
|
|
|
+ String webSite = WebUtil.getWebSite(request);
|
|
|
+ Integer isOwnStore = store.getIsOwnStore();
|
|
|
+ String deliverScore = store.getDeliverScore();
|
|
|
+ Integer followNumber=store.getFollowNumber();
|
|
|
+ String descriptionScore = store.getDescriptionScore();
|
|
|
+ String serviceScore=store.getServiceScore();
|
|
|
+ if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)) {
|
|
|
+ store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(goods.getStoreId(), webSite);
|
|
|
+ StoreNameExample storeNameExample = new StoreNameExample();
|
|
|
+ storeNameExample.setStoreId(goods.getStoreId());
|
|
|
+ storeNameExample.setWebSite(webSite);
|
|
|
+ StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
|
|
|
+ store.setStoreName(storeName != null ? storeName.getStoreName() : "未知");
|
|
|
+ store.setIsOwnStore(isOwnStore);
|
|
|
+ store.setDeliverScore(deliverScore);
|
|
|
+ store.setFollowNumber(followNumber);
|
|
|
+ store.setDescriptionScore(descriptionScore);
|
|
|
+ store.setServiceScore(serviceScore);
|
|
|
+ }
|
|
|
//默认店铺logo
|
|
|
if (StringUtils.isEmpty(store.getStoreLogo())) {
|
|
|
store.setStoreLogo(stringRedisTemplate.opsForValue().get("default_image_store_logo"));
|