From ce920867ae3a55d17ce5caf30961b6d51e2a7078 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 七月 2025 09:03:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 36a4040..73c6b13 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -1,5 +1,8 @@
package com.doumee.service.business.impl;
+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;
@@ -10,11 +13,14 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import java.util.List;
+import java.util.Objects;
/**
* 璁㈠崟淇℃伅璁板綍Service瀹炵幇
@@ -29,9 +35,44 @@
@Override
public Integer create(Orders orders) {
+
+
ordersMapper.insert(orders);
return orders.getId();
}
+
+
+
+ public void initVerification(Orders orders){
+ if(Objects.isNull(orders)
+ || Objects.isNull(orders.getType())
+ || Objects.isNull(orders.getStartDate())
+ || Objects.isNull(orders.getEndDate())
+ || StringUtil.isBlank(orders.getLocation())
+ || StringUtil.isBlank(orders.getLocationRemark())
+ || Objects.isNull(orders.getLat())
+ || Objects.isNull(orders.getLgt())
+ || Objects.isNull(orders.getCategoryId())
+ || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Objects.isNull(orders.getWorkType()))
+ || Objects.isNull(orders.getPriceNum1())
+ || (!( Constants.equalsInteger(orders.getType(),Constants.ZERO)
+ && Constants.equalsInteger(orders.getWorkType(),Constants.TWO) ) && Objects.isNull(orders.getPrice()) )
+ || ( Constants.equalsInteger(orders.getType(),Constants.ONE) && Objects.isNull(orders.getTransportTypeId()) )
+
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+
+ if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
+
+
+ }
+
+
+ }
+
+
+
@Override
public void deleteById(Integer id) {
@@ -171,9 +212,6 @@
if (pageWrap.getModel().getPayAccount() != null) {
queryWrapper.lambda().eq(Orders::getPayAccount, pageWrap.getModel().getPayAccount());
}
- if (pageWrap.getModel().getReviceAccount() != null) {
- queryWrapper.lambda().eq(Orders::getReviceAccount, pageWrap.getModel().getReviceAccount());
- }
if (pageWrap.getModel().getPriceRemark() != null) {
queryWrapper.lambda().eq(Orders::getPriceRemark, pageWrap.getModel().getPriceRemark());
}
@@ -253,9 +291,6 @@
}
if (pageWrap.getModel().getIsUpdate() != null) {
queryWrapper.lambda().eq(Orders::getIsUpdate, pageWrap.getModel().getIsUpdate());
- }
- if (pageWrap.getModel().getBlackRecive() != null) {
- queryWrapper.lambda().eq(Orders::getBlackRecive, pageWrap.getModel().getBlackRecive());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
--
Gitblit v1.9.3