提交

jiangping

2024-07-16 4f7ffc5b5525c0a4a463c530d0fe18060627740d

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

@@ -114,7 +114,15 @@

    @Override
    public Users findById(Long id) {
        return usersMapper.selectById(id);
        MPJLambdaWrapper<Users> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.leftJoin(Shop.class,Shop::getId,Users::getDepartmentId)
                .selectAs(Shop::getName,Users::getShopName)
                .selectAs(Shop::getAddress,Users::getShopAddress)
                .selectAs(Shop::getType,Users::getShopType)
                .selectAs(Shop::getSecondType,Users::getShopSecType)
                .selectAll(Users.class)
                .eq(Users::getId,id);
        return usersMapper.selectJoinOne(Users.class,queryWrapper);
    }

    @Override
@@ -608,11 +616,16 @@
    public     String getUserCard(Users users){
        String path = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode();
        String folder = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.USERS_FILE).getCode();
        if(StringUtils.isNotBlank(users.getCardImg()) && !StringUtils.equals(users.getCardImg(),"-")){
            return  path + folder+users.getCardImg();
        }
        String defualtHeader = systemDictDataBiz.queryByCode(Constants.WEIXIN_DEFAULT_IMGS, Constants.USER_CARD_HEADER_IMG).getCode();
        String defualtPhone = systemDictDataBiz.queryByCode(Constants.WEIXIN_DEFAULT_IMGS, Constants.USER_CARD_PHONE_IMG).getCode();
        String defualtAddr = systemDictDataBiz.queryByCode(Constants.WEIXIN_DEFAULT_IMGS, Constants.USER_CARD_ADDR_IMG).getCode();
        String imgurl =StringUtils.isNotBlank(users.getImgurl())?path+users.getImgurl():defualtHeader;
        String qrcode =StringUtils.isNotBlank(users.getQrcodeImg())?path+users.getQrcodeImg():null;
        String defualtShop = systemDictDataBiz.queryByCode(Constants.WEIXIN_DEFAULT_IMGS, Constants.USER_CARD_SHOP_IMG).getCode();
        String defualtLogo = systemDictDataBiz.queryByCode(Constants.WEIXIN_DEFAULT_IMGS, Constants.USER_CARD_LOGO_IMG).getCode();
        String imgurl =StringUtils.isNotBlank(users.getImgurl())?path+folder+users.getImgurl():defualtHeader;
        String qrcode =StringUtils.isNotBlank(users.getQrcodeImg())?path+folder+users.getQrcodeImg():null;
        InputStream inputStream = GeneratePicUtil.generateUserCardImg(
                imgurl
                ,qrcode
@@ -620,14 +633,21 @@
                ,"导购"
                ,StringUtils.defaultString(users.getPhone(),"-")
                ,StringUtils.defaultString(users.getShopAddress(),"-")
                ,"ZBOM志邦家居｜"+ StringUtils.defaultString(users.getShopName(),"-")
                , StringUtils.defaultString(users.getShopName(),"-")
                ,defualtPhone
                ,defualtAddr);
                ,defualtAddr
                ,defualtShop
                ,defualtLogo);
        TyyZosUtil obs = new TyyZosUtil( systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ENDPOINT).getCode(),
                systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ACCESS_ID).getCode(),
                systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ACCESS_KEY).getCode());
        String fileName =folder+ DateUtil.getNowShortDate()+"/"+UUID.randomUUID().toString() + ".jpg";
        String key = DateUtil.getNowShortDate()+"/"+UUID.randomUUID().toString() + ".jpg";
        String fileName =folder+ key;
        if (obs.uploadInputstreamObject(inputStream,systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.BUCKETNAME).getCode(), fileName)) {
            Users update = new Users();
            update.setId(users.getId());
            update.setCardImg(key);
            usersMapper.updateById(update);
            return  path+fileName;
        }
        return null;