From 25ef334e692ff6a3119fb906b08f2869649cd1c7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 18:10:12 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 2 +-
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 12 ++++++++++++
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 33 ++++++++++++++++++++++++++-------
3 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index e38d579..e54f6f7 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -533,7 +533,7 @@
accept(2, "宸叉帴鍗�"),
doing(3, "杩涜涓�"),
done(4, "宸插畬鎴�"),
- cancel(99, "鍖呰宸�"),
+ cancel(99, "宸插彇娑�"),
;
// 鎴愬憳鍙橀噺
private int key;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index f17f61e..71b0ec2 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -102,8 +102,10 @@
@ApiModelProperty(value = "棰勪及璐圭敤", example = "1")
private Long estimatedAccount;
+
@ApiModelProperty(value = "瀹為檯鏀粯璐圭敤", example = "1")
private Long payAccount;
+
@ApiModelProperty(value = "瀹炴敹璐圭敤", example = "1")
private Long receiveAccount;
@@ -151,6 +153,7 @@
private Integer acceptMemberId;
@ApiModelProperty(value = "鎺ュ崟绫诲瀷:0=鎵嬪姩鎺ュ崟锛�1=绯荤粺娲惧崟锛�", example = "1")
+ @ExcelColumn(name = "鎺ュ崟鏂瑰紡",index = 14,width = 10,valueMapping = "0=鎵嬪姩鎺ュ崟;1=绯荤粺娲惧崟;")
private Integer acceptType;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@@ -288,6 +291,15 @@
private Date acceptTimeEnd;
+ @ApiModelProperty(hidden = true)
+ @TableField(exist = false)
+ @ExcelColumn(name = "棰勪及閲戦锛堝厓锛�",index = 12,width = 10)
+ private double estimatedAccountYuan;
+
+ @ApiModelProperty(hidden = true)
+ @TableField(exist = false)
+ @ExcelColumn(name = "瀹炰粯閲戦锛堝厓锛�",index = 13,width = 10)
+ private double payAccountYuan;
@ApiModelProperty(value = "瀹屾垚鏃堕棿璧�")
@TableField(exist = false)
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..3795bcd 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
@@ -465,6 +465,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 +475,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