From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 362f771..3b88218 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
@@ -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);
+ }
}
--
Gitblit v1.7.1