From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
index e4c3f49..a70df4b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
@@ -121,6 +121,7 @@
agencyTaskRecord.setDelFlag(0);
agencyTaskRecord.setUserId(merFollowAgencyTaskDto.getUserId());
agencyTaskRecord.setFollowType(merFollowAgencyTaskDto.getFollowType());
+ agencyTaskRecord.setCustomeFollowType(merFollowAgencyTaskDto.getCustomeFollowType());
agencyTaskRecord.setCallPhone(merFollowAgencyTaskDto.getCallPhone());
agencyTaskRecord.setCallTime(followPhoneDto.getCallTime());
agencyTaskRecord.setFollowContent(followPhoneDto.getFollowContent());
@@ -130,6 +131,13 @@
}
}else{
agencyTaskRecord = new AgencyTaskRecord();
+ agencyTaskRecord.setTaskId(merFollowAgencyTaskDto.getTaskId());
+ agencyTaskRecord.setDelFlag(0);
+ agencyTaskRecord.setUserId(merFollowAgencyTaskDto.getUserId());
+ agencyTaskRecord.setFollowType(merFollowAgencyTaskDto.getFollowType());
+ agencyTaskRecord.setCustomeFollowType(merFollowAgencyTaskDto.getCustomeFollowType());
+ agencyTaskRecord.setFollowContent(merFollowAgencyTaskDto.getFollowContent());
+ agencyTaskRecord.setCreateTime(new Date());
//创建任务详情文件
String picture = merFollowAgencyTaskDto.getPicture();
String video = merFollowAgencyTaskDto.getVideo();
--
Gitblit v1.7.1