From 69f4e7bafd3d81696aa00affd6b9ddfa6b50503f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 08 二月 2025 13:36:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java
index 461c468..5efbbb1 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java
+++ b/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);
}
}
--
Gitblit v1.7.1