合并代码

puzhibing

2024-12-24 7cddb7125f2095facea68c11068e269809ef4108

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java

@@ -85,7 +85,7 @@
            goodsVO.setGoodsId(goods.getId());
            goodsVO.setGoodsName(goods.getName());
            R<Price> r = remoteOrderGoodsClient.getGoodsPrice(loginUserApplet.getUserid(), goods.getId(), null);
            if (R.isSuccess(r)){
            if (null != r.getData()){
                Price price = r.getData();
                goodsVO.setSellingPrice(price.getCash());
                goodsVO.setIntegral(price.getPoint());
@@ -103,8 +103,8 @@

        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
        AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
        BigDecimal sellingPrice;
        Integer integral;
        BigDecimal sellingPrice = BigDecimal.ZERO;
        Integer integral = 0;

        GoodsArea goodsArea = goodsAreaMapper.selectOne(new LambdaQueryWrapper<GoodsArea>()
                .eq(GoodsArea::getGoodsId, goodsId)
@@ -120,9 +120,10 @@
            GoodsVip goodsVip = goodsVipService.getOne(new LambdaQueryWrapper<GoodsVip>()
                    .eq(GoodsVip::getVip, vipSetting.getId())
                    .eq(GoodsVip::getGoodsId, goodsId));

            sellingPrice = goodsVip.getSellingPrice();
            integral = goodsVip.getIntegral();
            if(null != goodsVip){
                sellingPrice = goodsVip.getSellingPrice();
                integral = goodsVip.getIntegral();
            }
        }

        Goods goods = this.getById(goodsId);