From 45a47a29a42c43a2e15c15b3ed5b62cf797e4dfb Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Tue, 6 Apr 2021 15:52:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95order=5Fid=E4=BD=BF=E7=94=A8?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/stdiet/custom/service/impl/SysOrderServiceImpl.java | 2 +-
.../src/main/resources/mapper/custom/SysOrderMapper.xml | 2 ++
stdiet-ui/src/components/OrderAdd/index.vue | 4 ++--
stdiet-ui/src/components/OrderEdit/index.vue | 4 ++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
index 738e85c3b..a51367076 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
@@ -305,7 +305,7 @@ public class SysOrderServiceImpl implements ISysOrderService {
continue;
}
//判断前一个订单的结束时间是否大于第二个订单的
- if(lastServerEndTime != null && ChronoUnit.DAYS.between(lastServerEndTime, DateUtils.dateToLocalDate(sysOrder.getStartTime())) != 1){
+ if(lastServerEndTime != null && ChronoUnit.DAYS.between(lastServerEndTime, DateUtils.dateToLocalDate(sysOrder.getStartTime())) <= 0){
newStartTime = lastServerEndTime.plusDays(1);
//本月第一天
LocalDate monthStart = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
index 60bbc7a68..6962cad0b 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
@@ -183,6 +183,7 @@
<insert id="insertSysOrder" parameterType="SysOrder" useGeneratedKeys="true" keyProperty="orderId">
insert into sys_order
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="orderId != null">order_id,</if>
<if test="customer != null and customer != ''">customer,</if>
<if test="cusId != null">cus_id,</if>
<if test="phone != null">phone,</if>
@@ -224,6 +225,7 @@
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="orderId != null">#{orderId},</if>
<if test="customer != null and customer != ''">#{customer},</if>
<if test="cusId != null">#{cusId},</if>
<if test="phone != null">#{phone},</if>
diff --git a/stdiet-ui/src/components/OrderAdd/index.vue b/stdiet-ui/src/components/OrderAdd/index.vue
index 09bc56ee7..da1379a3d 100644
--- a/stdiet-ui/src/components/OrderAdd/index.vue
+++ b/stdiet-ui/src/components/OrderAdd/index.vue
@@ -313,11 +313,11 @@ export default {
if (!this.form.orderTime) {
return callback(new Error("请先选择成交时间"));
}
- if (
+ /*if (
dayjs(this.form.startTime).diff(dayjs(this.form.orderTime), "day") < 0
) {
return callback(new Error("开始时间不能先于成交时间"));
- }
+ }*/
callback();
};
const checkOrderTime = (rule, value, callback) => {
diff --git a/stdiet-ui/src/components/OrderEdit/index.vue b/stdiet-ui/src/components/OrderEdit/index.vue
index 5c385b34d..b4d3bb8c5 100644
--- a/stdiet-ui/src/components/OrderEdit/index.vue
+++ b/stdiet-ui/src/components/OrderEdit/index.vue
@@ -271,11 +271,11 @@ export default {
if (!this.form.orderTime) {
return callback(new Error("请先选择成交时间"));
}
- if (
+ /*if (
dayjs(this.form.startTime).diff(dayjs(this.form.orderTime), "day") < 0
) {
return callback(new Error("开始时间不能先于成交时间"));
- }
+ }*/
callback();
};
const checkOrderTime = (rule, value, callback) => {