Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-26 a988a89e6b0cd75a5df4691eb8196c0ef9513a05

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

@@ -1,6 +1,8 @@
package com.ruoyi.other.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
@@ -53,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());
@@ -87,7 +90,7 @@
      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) {
@@ -96,4 +99,9 @@
      goodsBargainPriceDetailService.saveBatch(list);
      return R.ok();
   }

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