商业街bug修改

puhanshu

2022-01-14 51ee3c4db2eb49062d3236bf44f95dc22f8f6ac9

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java

@@ -133,6 +133,9 @@
            if(comActDO!=null){
                convenientMerchantDO.setCommunityName(comActDO.getName());
            }
            else {
                convenientMerchantDO.setCommunityName("西区社区");
            }
        }
        String account = convenientMerchantDTO.getAccount();
        if (isNotBlank(account)) {
@@ -286,6 +289,15 @@
        page.setSize(pagePopularMerchantDTO.getPageSize());
        page.setCurrent(pagePopularMerchantDTO.getPageNum());
        IPage<ConvenientMerchantVO> merchantVOList = this.baseMapper.getPopularMerchants(page, pagePopularMerchantDTO.getCommunityId(), currentMon);
        if(pagePopularMerchantDTO.getPageNum().equals(1L)){
            //第一页默认把犇师傅维修中心加载到第一个
            List<ConvenientMerchantVO> merchantList = this.baseMapper.selectMerchantByName(pagePopularMerchantDTO.getCommunityId(), currentMon);
            if(merchantList != null && merchantList.size() > 0){
                merchantList.addAll(merchantVOList.getRecords());
                merchantVOList.setRecords(merchantList);
            }

        }
        return R.ok(merchantVOList);
    }

@@ -420,4 +432,20 @@
        this.baseMapper.batchUpdateMerchantViewNum(viewVOList);
        return R.ok();
    }

    /**
     * check商家/店铺是否有效
     * @param userId
     * @return
     */
    @Override
    public Boolean checkStoreIsValid(Long userId) {
        R<LoginUserInfoVO> loginUserInfo = userService.getUserInfoByUserId(userId.toString());
        LoginUserInfoVO loginUserInfoVO =
                JSONObject.parseObject(JSONObject.toJSONString(loginUserInfo.getData()), LoginUserInfoVO.class);
        if (isNull(loginUserInfoVO) || !loginUserInfoVO.getType().equals(10) || loginUserInfoVO.getStatus() != 1) {
            return false;
        }
        return true;
    }
}