合并代码

puzhibing

2024-12-23 f242052d9726908a1ae7ebe97e76c237e5ce3fba

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

@@ -55,11 +55,12 @@
      SysUser sysUser = sysUserClient.getSysUser(userid).getData();
      GoodsBargainPrice bargainPrice = this.getOne(new LambdaQueryWrapper<GoodsBargainPrice>().eq(GoodsBargainPrice::getShopId, sysUser.getObjectId())
            .eq(GoodsBargainPrice::getGoodsId, id).eq(GoodsBargainPrice::getDelFlag, 0).last(" order by create_time desc limit 0, 1"));
      GoodsBargainPriceInfo info = new GoodsBargainPriceInfo();
      if(null == bargainPrice){
         return null;
         return info;
      }
      List<GoodsBargainPriceDetail> list = goodsBargainPriceDetailService.list(new LambdaQueryWrapper<GoodsBargainPriceDetail>().eq(GoodsBargainPriceDetail::getGoodsBargainPriceId, bargainPrice.getId()));
      GoodsBargainPriceInfo info = new GoodsBargainPriceInfo();

      info.setId(bargainPrice.getId().toString());
      info.setList(list);
      info.setAuditMsg(bargainPrice.getAuditMsg());