From 3866617456dcec496400ba3e31831dce99003ffa Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 10:07:11 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 10 ++++++++++
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 0 deletions(-)
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 71b0ec2..67a3239 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
@@ -99,6 +99,7 @@
@ApiModelProperty(value = "璐圭敤鏍囧噯", example = "1")
private Long price;
+
@ApiModelProperty(value = "棰勪及璐圭敤", example = "1")
private Long estimatedAccount;
@@ -203,6 +204,12 @@
@ApiModelProperty(value = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�", example = "1")
private Integer cancelType;
+ @ApiModelProperty(value = "鏀粯鏂瑰紡锛�0=寰俊锛�1=鍏朵粬", example = "1")
+ private Integer payMethod;
+
+ @ApiModelProperty(value = "鏀粯鏃堕棿", example = "1")
+ private Date payTime;
+
@ApiModelProperty(value = "鍥剧墖")
@TableField(exist = false)
private List<Multifile> multifileList;
@@ -280,6 +287,9 @@
@TableField(exist = false)
private Date createTimeEnd;
+ @ApiModelProperty(value = "璐圭敤鏍囧噯鍗曚綅", example = "1")
+ @TableField(exist = false)
+ private String priceUnit;
@ApiModelProperty(value = "鎺ュ崟鏃堕棿璧�")
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 f9a8129..4e6467d 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
@@ -387,6 +387,28 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
+
+ if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
+ if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
+ orders.setPriceUnit("鍏�/鏂�");
+ }else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
+ orders.setPriceUnit("鍏�/浜�*澶�");
+ }else{
+ if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
+ orders.setPriceUnit("鍏�/浜�*澶�");
+ }else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
+ orders.setPriceUnit("鍏�/浜�*灏忔椂");
+ }else{
+ orders.setPriceUnit("鍏�/鏂�");
+ }
+ }
+ }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
+ if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
+ orders.setPriceUnit("鍏�/澶�");
+ }else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
+ orders.setPriceUnit("鍏�/娆�");
+ }
+ }
//闄勪欢淇℃伅
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));
@@ -1066,6 +1088,8 @@
.set(Orders::getUpdateTime,"now()")
.set(Orders::getStatus,Constants.ordersStatus.wait)
.set(Orders::getPayStatus,Constants.ONE)
+ .set(Orders::getPayTime,"now()")
+ .set(Orders::getPayMethod,Constants.ZERO)
.set(Orders::getWxExternalNo,paymentNo)
.eq(Orders::getId,orders.getId())
);
@@ -1085,6 +1109,8 @@
.set(Orders::getUpdateTime,"now()")
.set(Orders::getStatus,Constants.FOUR)
.set(Orders::getPayStatus,Constants.ONE)
+ .set(Orders::getPayTime,"now()")
+ .set(Orders::getPayMethod,Constants.ZERO)
.set(Orders::getWxExternalNo,paymentNo)
.set(Orders::getFinishTime,"now()")
.eq(Orders::getId,orders.getId())
@@ -1324,6 +1350,14 @@
//todo 鑷姩娲惧崟
public void autoGrabOrders(){
+// String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_DISPATCH_DISTANCE).getCode();
+// List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
+// .eq(Orders::getStatus,Constants.FOUR).eq(Orders::getCommentStatus,Constants.ZERO)
+// .apply(" DATE_ADD(finish_time, INTERVAL 7 DAY) < now() ")
+// .last("limit 100")
+// );
+
+
}
--
Gitblit v1.9.3