fix: 修改登录页面UI

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/MemberFollowStoreController.java

@@ -3,6 +3,7 @@ package com.slodon.b2b2c.controller.member.front;
 import com.slodon.b2b2c.core.constant.GoodsConst;
 import com.slodon.b2b2c.core.constant.StoreConst;
 import com.slodon.b2b2c.core.controller.BaseController;
+import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.i18n.Language;
 import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.PagerInfo;
@@ -10,6 +11,7 @@ import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.AssertUtil;
 import com.slodon.b2b2c.core.util.UserUtil;
 import com.slodon.b2b2c.core.util.WebUtil;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.goods.example.GoodsExample;
 import com.slodon.b2b2c.goods.pojo.Goods;
 import com.slodon.b2b2c.member.example.MemberFollowStoreExample;
@@ -18,13 +20,16 @@ import com.slodon.b2b2c.member.pojo.MemberFollowStore;
 import com.slodon.b2b2c.model.goods.GoodsModel;
 import com.slodon.b2b2c.model.member.MemberFollowStoreModel;
 import com.slodon.b2b2c.model.seller.StoreModel;
+import com.slodon.b2b2c.model.seller.StoreSiteInfoModel;
 import com.slodon.b2b2c.seller.pojo.Store;
 import com.slodon.b2b2c.vo.member.FollowStoreVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -55,6 +60,8 @@ public class MemberFollowStoreController extends BaseController {
     private StoreModel storeModel;
     @Resource
     private StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    private StoreSiteInfoModel storeSiteInfoModel;
 
     @ApiOperation("关注/取消关注商铺")
     @ApiImplicitParams({
@@ -90,7 +97,7 @@ public class MemberFollowStoreController extends BaseController {
     @GetMapping("list")
     public JsonResult<FollowStoreVO> getList(HttpServletRequest request) {
         Member member = UserUtil.getUser(request, Member.class);
-
+        String webSite = WebUtil.getWebSite( request);
         //根据条件查询集合
         MemberFollowStoreExample example = new MemberFollowStoreExample();
         example.setMemberId(member.getMemberId());
@@ -106,6 +113,20 @@ public class MemberFollowStoreController extends BaseController {
                 //查询店铺
                 Store store = storeModel.getStoreByStoreId(memberFollowStore.getStoreId());
                 AssertUtil.notNull(store, "店铺不存在");
+                Integer state = store.getState();
+                Integer isOwnStore = store.getIsOwnStore();
+                String serviceScore = store.getServiceScore();
+                Integer followNumber = store.getFollowNumber();
+                if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)){
+                    store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(store.getStoreId(), WebSiteConstant.MEMBER_DISTRIBUTOR);
+                    if (StringUtils.isEmpty(store.getStoreId())){
+                        throw new MallException("店铺不存在");
+                    }
+                    store.setState(state);
+                    store.setIsOwnStore(isOwnStore);
+                    store.setServiceScore(serviceScore);
+                    store.setFollowNumber(followNumber);
+                }
                 //默认店铺logo
                 if (StringUtils.isEmpty(store.getStoreLogo())) {
                     store.setStoreLogo(stringRedisTemplate.opsForValue().get("default_image_store_logo"));
@@ -113,6 +134,7 @@ public class MemberFollowStoreController extends BaseController {
                 FollowStoreVO.MemberFollowStoreVO followStoreVO = new FollowStoreVO.MemberFollowStoreVO(memberFollowStore, store);
                 //查询店铺推荐商品信息,最多三件
                 GoodsExample goodsExample = new GoodsExample();
+                goodsExample.setWebSite(webSite);
                 goodsExample.setStoreId(memberFollowStore.getStoreId());
                 goodsExample.setStoreIsRecommend(GoodsConst.STORE_IS_RECOMMEND_YES);
                 goodsExample.setState(GoodsConst.GOODS_STATE_UPPER);
@@ -136,6 +158,7 @@ public class MemberFollowStoreController extends BaseController {
                 String dayDate = simpleDateFormat.format(calendar.getTime());
                 //该店铺本月上新的商品
                 GoodsExample newGoodsExample = new GoodsExample();
+                newGoodsExample.setWebSite(webSite);
                 newGoodsExample.setStoreId(store.getStoreId());
                 newGoodsExample.setState(GoodsConst.GOODS_STATE_UPPER);
                 newGoodsExample.setOnlineTimeLikeAfter(dayDate);