代码提交

k94314517

2024-07-26 34486b14dd302b23d4baea8194f45cff9a429d73

代码提交

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -695,7 +695,7 @@
            Response response = client.newCall(request).execute();
            if (response.isSuccessful()) {
                InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
              /* ByteArrayOutputStream baos = new ByteArrayOutputStream();
               /*ByteArrayOutputStream baos = new ByteArrayOutputStream();
                    byte[] buffer = new byte[1024];
                    int len = -1;
                    while ((len = inputStream.read(buffer)) != -1) {

 server/service/src/main/java/com/doumee/service/business/ShopService.java

@@ -93,6 +93,8 @@
     */
    PageData<Shop> findPage(PageWrap<Shop> pageWrap);

    List<Shop> getUserShopList(Long userId);

    /**
     * 条件统计
     *

 server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java

@@ -216,7 +216,7 @@
    public BjParamConfigResponse getBjParamConfig(){
        BjParamConfigResponse bjParamConfigResponse = new BjParamConfigResponse();
        List<BjParam> bjParamList =  bjParamMapper.selectList(new QueryWrapper<BjParam>()
               .lambda().eq(BjParam::getIsdeleted,Constants.ZERO));
               .lambda().eq(BjParam::getIsdeleted,Constants.ZERO).orderByAsc(BjParam::getSortnum));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(bjParamList)){
            List<BjParam> roughList = bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")&& StringUtils.isEmpty(i.getParentId())).collect(Collectors.toList());
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(roughList)){

 server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java

@@ -338,6 +338,11 @@
        ztContentListRequest.setId(id);
        ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
        if(Objects.nonNull(response)){
//            if(StringUtils.isNotBlank(response.getPanorama())){
//                response.setPanorama(
//                        response.getPanorama().replace("https://720.","https://720-3.").replace("https://720-2.","https://720-3.")
//                );
//            }
            //查询导购信息 进行信息绑定与返回
            if(StringUtils.isNotBlank(salesId)){
                Users users = usersMapper.selectById(salesId);

 server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java

@@ -1032,4 +1032,44 @@
        );
    }

    @Override
    public List<Shop> getUserShopList(Long userId) {
        Users users = usersMapper.selectById(userId);
        if(Objects.isNull(users)){
            return new ArrayList<>();
        }
        Shop userShop = shopMapper.selectById(users.getDepartmentId());
        if(Objects.isNull(userShop)){
            return new ArrayList<>();
        }
        List<Shop> shopList = shopMapper.selectList(new QueryWrapper<Shop>()
                .lambda()
                .eq(Shop::getScode,userShop.getScode())
                .eq(Shop::getType,Constants.TWO)
                .eq(Shop::getSecondType,Constants.THREE)
        );
        //查询经营范围信息
        List<CategorySeg> categorySegAllList = categorySegMapper.selectList(new QueryWrapper<CategorySeg>().lambda()
                .isNotNull(CategorySeg::getOrgId)
                .eq(CategorySeg::getIsdeleted,Constants.ZERO));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categorySegAllList)){
            for (Shop shop:shopList) {
                if(StringUtils.isBlank(shop.getOrgId())){
                    continue;
                }
                List<CategorySeg> categorySegList = categorySegAllList.stream().filter(i->i.getOrgId().equals(shop.getOrgId())).collect(Collectors.toList());
                List<UnitCodeVo> unitCodeVoList =systemDictDataBiz.getUnitList();
                List<String> seqNameList = new ArrayList<>();
                for(CategorySeg model : categorySegList){
                    String seqName = systemDictDataBiz.getUnitName(model.getUnitCode(),unitCodeVoList);
                    if(Objects.nonNull(seqName)){
                        seqNameList.add(seqName);
                    }
                }
                shop.setSeqNameList(seqNameList);
            }
        }
        return shopList;
    }

}

 server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java

@@ -441,7 +441,7 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"更新手机号失败");
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"获取手机号失败");
    }



 server/web/src/main/java/com/doumee/api/web/PersonnelApi.java

@@ -151,6 +151,16 @@
    }

    @UserLoginRequired
    @ApiOperation(value = "获取员工管理门店列表", notes = "员工端小程序")
    @GetMapping("/userShopList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<List<Shop>> userShopList () {
        return ApiResponse.success(shopService.getUserShopList(getMemberId()));
    }

    @UserLoginRequired
    @ApiOperation(value = "门店详情", notes = "员工端小程序")
    @GetMapping("/shopDetail")
    @ApiImplicitParams({