From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/service/business/impl/OrderLogServiceImpl.java | 95 ++++++++++++++++++++---------------------------
1 files changed, 40 insertions(+), 55 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrderLogServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrderLogServiceImpl.java
index 945b237..6d8492a 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrderLogServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrderLogServiceImpl.java
@@ -1,25 +1,29 @@
package com.doumee.service.business.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.OrderLogMapper;
import com.doumee.dao.business.model.OrderLog;
import com.doumee.service.business.OrderLogService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 璁㈠崟鎿嶄綔鏃ュ織Service瀹炵幇
- * @author 姹熻箘韫�
- * @date 2025/07/09 12:00
+ * @author rk
+ * @date 2026/04/13
*/
@Service
public class OrderLogServiceImpl implements OrderLogService {
@@ -35,7 +39,9 @@
@Override
public void deleteById(Integer id) {
- orderLogMapper.deleteById(id);
+ orderLogMapper.update(new UpdateWrapper<OrderLog>().lambda()
+ .set(OrderLog::getDeleted, Constants.ONE)
+ .eq(OrderLog::getId, id));
}
@Override
@@ -46,10 +52,12 @@
@Override
public void deleteByIdInBatch(List<Integer> ids) {
- if (CollectionUtils.isEmpty(ids)) {
+ if (ids == null || ids.isEmpty()) {
return;
}
- orderLogMapper.deleteBatchIds(ids);
+ for (Integer id : ids) {
+ this.deleteById(id);
+ }
}
@Override
@@ -59,17 +67,21 @@
@Override
public void updateByIdInBatch(List<OrderLog> orderLogs) {
- if (CollectionUtils.isEmpty(orderLogs)) {
+ if (orderLogs == null || orderLogs.isEmpty()) {
return;
}
- for (OrderLog orderLog: orderLogs) {
+ for (OrderLog orderLog : orderLogs) {
this.updateById(orderLog);
}
}
@Override
public OrderLog findById(Integer id) {
- return orderLogMapper.selectById(id);
+ OrderLog orderLog = orderLogMapper.selectById(id);
+ if (Objects.isNull(orderLog)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ return orderLog;
}
@Override
@@ -83,60 +95,33 @@
QueryWrapper<OrderLog> wrapper = new QueryWrapper<>(orderLog);
return orderLogMapper.selectList(wrapper);
}
-
+
@Override
public PageData<OrderLog> findPage(PageWrap<OrderLog> pageWrap) {
IPage<OrderLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<OrderLog> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(OrderLog::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getDeleted() != null) {
- queryWrapper.lambda().eq(OrderLog::getDeleted, pageWrap.getModel().getDeleted());
- }
- if (pageWrap.getModel().getCreateUser() != null) {
- queryWrapper.lambda().eq(OrderLog::getCreateUser, pageWrap.getModel().getCreateUser());
- }
- if (pageWrap.getModel().getCreateTime() != null) {
- queryWrapper.lambda().ge(OrderLog::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
- queryWrapper.lambda().le(OrderLog::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
- }
- if (pageWrap.getModel().getUpdateUser() != null) {
- queryWrapper.lambda().eq(OrderLog::getUpdateUser, pageWrap.getModel().getUpdateUser());
- }
- if (pageWrap.getModel().getUpdateTime() != null) {
- queryWrapper.lambda().ge(OrderLog::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
- queryWrapper.lambda().le(OrderLog::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(OrderLog::getRemark, pageWrap.getModel().getRemark());
- }
+ pageWrap.getModel().setDeleted(Constants.ZERO);
+ queryWrapper.lambda().eq(OrderLog::getDeleted, pageWrap.getModel().getDeleted());
if (pageWrap.getModel().getOrderId() != null) {
queryWrapper.lambda().eq(OrderLog::getOrderId, pageWrap.getModel().getOrderId());
}
- if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(OrderLog::getTitle, pageWrap.getModel().getTitle());
- }
- if (pageWrap.getModel().getLogInfo() != null) {
- queryWrapper.lambda().eq(OrderLog::getLogInfo, pageWrap.getModel().getLogInfo());
- }
- if (pageWrap.getModel().getObjType() != null) {
- queryWrapper.lambda().eq(OrderLog::getObjType, pageWrap.getModel().getObjType());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(OrderLog::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getBeforeInfo() != null) {
- queryWrapper.lambda().eq(OrderLog::getBeforeInfo, pageWrap.getModel().getBeforeInfo());
- }
- if (pageWrap.getModel().getAfterInfo() != null) {
- queryWrapper.lambda().eq(OrderLog::getAfterInfo, pageWrap.getModel().getAfterInfo());
+ if (StringUtils.isNotBlank(pageWrap.getModel().getTitle())) {
+ queryWrapper.lambda().like(OrderLog::getTitle, pageWrap.getModel().getTitle());
}
if (pageWrap.getModel().getOrderStatus() != null) {
queryWrapper.lambda().eq(OrderLog::getOrderStatus, pageWrap.getModel().getOrderStatus());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (pageWrap.getModel().getObjType() != null) {
+ queryWrapper.lambda().eq(OrderLog::getObjType, pageWrap.getModel().getObjType());
+ }
+ if (pageWrap.getModel().getOptUserType() != null) {
+ queryWrapper.lambda().eq(OrderLog::getOptUserType, pageWrap.getModel().getOptUserType());
+ }
+ if (pageWrap.getModel().getOptUserId() != null) {
+ queryWrapper.lambda().eq(OrderLog::getOptUserId, pageWrap.getModel().getOptUserId());
+ }
+ for (PageWrap.SortData sortData : pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
} else {
--
Gitblit v1.9.3