From d1cab4b2f2690d1331f12f0d9de78bbbf926f390 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 3b88218..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
@@ -80,13 +80,13 @@
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);
@@ -94,6 +94,7 @@
//添加明细
List<GoodsBargainPriceDetail> list = vo.getList();
for (GoodsBargainPriceDetail goodsBargainPriceDetail : list) {
+ goodsBargainPriceDetail.setId(null);
goodsBargainPriceDetail.setGoodsBargainPriceId(bargainPrice.getId());
}
goodsBargainPriceDetailService.saveBatch(list);
--
Gitblit v1.7.1