修改bug

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/goods/front/GoodsDetailsController.java

@@ -13,6 +13,7 @@ import com.slodon.b2b2c.core.util.StringUtil;
 import com.slodon.b2b2c.core.util.UserUtil;
 import com.slodon.b2b2c.core.util.WebUtil;
 import com.slodon.b2b2c.enums.SeoTypeConstant;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.goods.dto.CalculateExpressDTO;
 import com.slodon.b2b2c.goods.dto.GoodsAddDTO;
 import com.slodon.b2b2c.goods.dto.GoodsRankListDTO;
@@ -32,6 +33,7 @@ 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.StoreSiteInfoModel;
 import com.slodon.b2b2c.model.system.RegionCityModel;
 import com.slodon.b2b2c.seller.pojo.Store;
 import com.slodon.b2b2c.system.example.RegionCityExample;
@@ -43,6 +45,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.beanutils.PropertyUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.util.CollectionUtils;
@@ -105,6 +108,8 @@ public class GoodsDetailsController extends BaseController {
 
     @Resource
     private GoodsAnnexModel goodsAnnexModel;
+    @Autowired
+    private StoreSiteInfoModel storeSiteInfoModel;
 
     @ApiOperation("获取商品详情---静态数据")
     @ApiImplicitParams({
@@ -160,8 +165,11 @@ public class GoodsDetailsController extends BaseController {
             goodsPictureExample.setSpecValueIdIn(product.getSpecValueIds());
         }
         List<GoodsPicture> goodsPictureList = goodsPictureModel.getGoodsPictureList(goodsPictureExample, null);
-
+        String webSite = goods.getWebSite();
         Store store = storeModel.getStoreByStoreId(goods.getStoreId());
+        if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)) {
+            store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(goods.getStoreId(), webSite);
+        }
         //默认店铺logo
         if (StringUtils.isEmpty(store.getStoreLogo())) {
             store.setStoreLogo(stringRedisTemplate.opsForValue().get("default_image_store_logo"));

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/admin/AdminStoreController.java

@@ -423,6 +423,7 @@ public class AdminStoreController extends BaseController {
         List<StoreVO> vos = new ArrayList<>();
         StoreExample storeExample = new StoreExample();
         storeExample.setState(StoreConst.STORE_STATE_OPEN);
+        storeExample.setBusinessState(StoreConst.STORE_BUSINESS_STATE_OPEN);
         storeExample.setStoreNameLike(storeName);
         storeExample.setPager(pager);
         List<Store> storeList = new ArrayList<>();

xinkeaboard-server/doc/DDL/update.sql

@@ -345,6 +345,9 @@ ALTER TABLE member_product_look_log MODIFY COLUMN goods_brief VARCHAR(1000) COMM
 update msg_store_tpl set email_content='{"email_subject":"新询盘提醒-{$siteName}","email_content":"<h2>尊敬的客户，您好：</h2><p>收到询盘信息如下：</p><p>姓 名：{$name}</p><p>邮 箱：{$email}</p><p>国家/地区：{$country}</p><p>联系方式：{$phoneCode}-{$phone}</p><p>数 量：{$quantity}</p><p>询盘内容：{$message}</p><p>访问链接：{$pageUrl}</p>"}'  where tpl_code ='enquiry_reminder'
 
 
+ALTER TABLE enquiry MODIFY COLUMN page_url VARCHAR(2048) COMMENT '询盘来源页面URL';
+
+