From add91dff9f6e4809959121d7147212c5273f9ee4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 09:21:32 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 6ad3885..f9a8129 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
@@ -386,6 +386,7 @@
if(Objects.isNull(orders)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+ orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
//闄勪欢淇℃伅
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,orders.getId())
.eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjType,Constants.ONE).orderByAsc(Multifile::getId));
@@ -465,6 +466,8 @@
for (Orders orders:iPage.getRecords()) {
this.getOrderContent(orders);
orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
+ orders.setEstimatedAccountYuan(Objects.nonNull(orders.getEstimatedAccount())&&orders.getEstimatedAccount()>0?orders.getEstimatedAccount()/100:0L);
+ orders.setPayAccountYuan(Objects.nonNull(orders.getPayAccount())&&orders.getPayAccount()>0?orders.getPayAccount()/100:0L);
}
return PageData.from(iPage);
}
@@ -473,22 +476,39 @@
if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
orders.setOrderContent(Constants.workType.getName(orders.getWorkType()) +" | " + orders.getCategoryName());
if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
- orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum1()+"鏂�");
+ if(Objects.nonNull(orders.getPriceNum1())){
+ orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum1()+"鏂�");
+ }
}else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
- orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum2()+"浜�");
+ if(Objects.nonNull(orders.getPriceNum2())) {
+ orders.setOrderContent(orders.getOrderContent() + " | " + orders.getPriceNum2() + "浜�");
+ }
}else{
if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)||Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
- orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum2()+"浜�");
+ if(Objects.nonNull(orders.getPriceNum2())) {
+ orders.setOrderContent(orders.getOrderContent() + " | " + orders.getPriceNum2() + "浜�");
+ }
}else{
- orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum1()+"鏂�");
+ if(Objects.nonNull(orders.getPriceNum1())) {
+ orders.setOrderContent(orders.getOrderContent() + " | " + orders.getPriceNum1() + "鏂�");
+ }
}
}
}else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
- orders.setOrderContent( orders.getCategoryName() + " | " + orders.getTransportTypeName() +" | " + orders.getTransportNum() +"鏂�");
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getCategoryName())){
+ orders.setOrderContent( orders.getCategoryName() +
+ (StringUtils.isEmpty(orders.getTransportTypeName())?"":" | " + orders.getTransportTypeName() ) +
+ (Objects.isNull(orders.getTransportNum())?null:" | " + orders.getTransportNum() +"鏂�"));
+ }
+
if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
- orders.setOrderContent(orders.getOrderContent()+" | 鐢ㄨ溅" +orders.getPriceNum2()+"澶�");
+ if(Objects.nonNull(orders.getPriceNum2())) {
+ orders.setOrderContent(orders.getOrderContent() + " | 鐢ㄨ溅" + orders.getPriceNum2() + "澶�");
+ }
}else{
- orders.setOrderContent(orders.getOrderContent()+" | 鐢ㄨ溅" +orders.getPriceNum2()+"娆�");
+ if(Objects.nonNull(orders.getPriceNum2())) {
+ orders.setOrderContent(orders.getOrderContent() + " | 鐢ㄨ溅" + orders.getPriceNum2() + "娆�");
+ }
}
}else{
if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getWayInfo())){
--
Gitblit v1.9.3