Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-24 fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3

 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());
@@ -79,20 +80,21 @@
      SysUser sysUser = sysUserClient.getSysUser(userid).getData();
      GoodsBargainPrice bargainPrice = this.getOne(new LambdaQueryWrapper<GoodsBargainPrice>().eq(GoodsBargainPrice::getShopId, sysUser.getObjectId())
            .eq(GoodsBargainPrice::getGoodsId, vo.getGoodsId()).eq(GoodsBargainPrice::getDelFlag, 0).last(" order by create_time desc limit 0, 1"));
      if(null != bargainPrice && 1 == bargainPrice.getAuditStatus()){
      if(null != bargainPrice && 0 == bargainPrice.getAuditStatus()){
         return R.fail("特价申请正在审核中");
      }
      bargainPrice = new GoodsBargainPrice();
      bargainPrice.setShopId(sysUser.getObjectId());
      bargainPrice.setGoodsId(vo.getGoodsId());
      bargainPrice.setAuditStatus(1);
      bargainPrice.setAuditStatus(0);
      bargainPrice.setDelFlag(0);
      bargainPrice.setCreateTime(LocalDateTime.now());
      bargainPrice.setCreateUserId(userid);
      this.updateById(bargainPrice);
      this.save(bargainPrice);
      //添加明细
      List<GoodsBargainPriceDetail> list = vo.getList();
      for (GoodsBargainPriceDetail goodsBargainPriceDetail : list) {
         goodsBargainPriceDetail.setId(null);
         goodsBargainPriceDetail.setGoodsBargainPriceId(bargainPrice.getId());
      }
      goodsBargainPriceDetailService.saveBatch(list);
@@ -101,6 +103,6 @@

   @Override
   public IPage<GoodsBargainPrice> queryGoodsBargainPricePage(Page<GoodsBargainPrice> page, GoodsBargainPrice goodsBargainPrice) {
      return null;
      return this.baseMapper.queryGoodsBargainPricePage(page,goodsBargainPrice);
   }
}