Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

订单order_id使用时间戳

Browse Source
This commit is contained in:
xiezhijun 2021-04-06 15:52:26 +08:00
parent ba10d518de
commit 45a47a29a4
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
View File

@ -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());

2
stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
View File

@ -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>

4
stdiet-ui/src/components/OrderAdd/index.vue
View File

@ -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) => {

4
stdiet-ui/src/components/OrderEdit/index.vue
View File

@ -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) => {