From 4384ad3db8f10b7add5f287681c069d4efb1e0ee Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 11:54:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 ab2b0df..891cdd5 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
@@ -211,6 +211,7 @@
|| Objects.isNull(orders.getEndDate())
|| StringUtil.isBlank(orders.getLocation())
|| StringUtil.isBlank(orders.getLocationRemark())
+ || StringUtil.isBlank(orders.getLinkPhone())
|| Objects.isNull(orders.getLat())
|| Objects.isNull(orders.getLgt())
|| Objects.isNull(orders.getCategoryId())
@@ -243,6 +244,7 @@
|| Objects.isNull(orders.getTransportNum())
|| StringUtils.isEmpty(orders.getTransportUnit())
|| StringUtils.isEmpty(orders.getLocationEnd())
+ || StringUtils.isEmpty(orders.getCarUnit())
|| Objects.isNull(orders.getLatEnd())
|| Objects.isNull(orders.getLgtEnd())
|| CollectionUtils.isEmpty(orders.getWayInfoDTOList())
@@ -392,12 +394,12 @@
if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
orders.setPriceUnit("鍏�/鏂�");
}else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
- orders.setPriceUnit("鍏�/浜�*澶�");
+ orders.setPriceUnit("鍏�/浜�/澶�");
}else{
if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
- orders.setPriceUnit("鍏�/浜�*澶�");
+ orders.setPriceUnit("鍏�/浜�/澶�");
}else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
- orders.setPriceUnit("鍏�/浜�*灏忔椂");
+ orders.setPriceUnit("鍏�/浜�/灏忔椂");
}else{
orders.setPriceUnit("鍏�/鏂�");
}
--
Gitblit v1.9.3