From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 53936a5..12d79cb 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -28,6 +28,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Slf4j
@@ -93,8 +94,8 @@
}
@Override
- public boolean updateSettle2(Long orderId, Long settle, Integer plt) {
- return this.baseMapper.updateSettle2(orderId, settle, plt) > 0;
+ public boolean updateSettle2(Long orderId, Long settle, Integer plt, String inTime) {
+ return this.baseMapper.updateSettle2(orderId, settle, plt, inTime) > 0;
}
@Override
@@ -126,14 +127,15 @@
boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
- if (!this.updateSettle2(order.getId(), 4L, pltType)) {
+ if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMdd))) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
} else {
- if (!Cools.isEmpty(pltType)) {
+ if (pltType != null && pltType > 0) {
order.setPltType(pltType);
- super.updateById(order);
}
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
+ super.updateById(order);
}
--
Gitblit v1.9.1