From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
index 53ae5b0..3bf2a48 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
@@ -15,6 +15,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.time.LocalDate;
import java.util.Date;
/**
@@ -52,10 +54,11 @@
shopTask.setDelFlag(0);
shopTask.setShopId(mgtFollowShopTaskDto.getShopId());
shopTask.setFollowType(mgtFollowShopTaskDto.getFollowType());
- shopTask.setNextFollowDate(DateUtils.getDate());
+ shopTask.setNextFollowDate(DateUtils.toDate(LocalDate.now()));
shopTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
shopTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
shopTask.setCreateTime(new Date());
+ shopTask.setTaskDate(DateUtils.toDate(LocalDate.now()));
this.saveOrUpdate(shopTask);
//创建任务记录
ShopTaskRecord shopTaskRecord = new ShopTaskRecord();
@@ -89,10 +92,15 @@
shopNextTask.setDelFlag(0);
shopNextTask.setShopId(mgtFollowShopTaskDto.getShopId());
shopNextTask.setFollowType(mgtFollowShopTaskDto.getFollowType());
- shopNextTask.setNextFollowDate(mgtFollowShopTaskDto.getNextTaskDate());
shopNextTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
shopNextTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
shopNextTask.setCreateTime(new Date());
+ try {
+ shopNextTask.setNextFollowDate(DateUtils.parseDate(mgtFollowShopTaskDto.getNextTaskDate(),"yyyy-MM-dd"));
+ shopNextTask.setTaskDate(DateUtils.parseDate(mgtFollowShopTaskDto.getNextTaskDate(),"yyyy-MM-dd"));
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
this.saveOrUpdate(shopNextTask);
}
--
Gitblit v1.7.1