From 7a9bb67bf8134359e54788f5440ad32383130a4d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 13:48:21 +0800
Subject: [PATCH] DEMO初步完成
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java | 3 ++-
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml | 4 +++-
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java | 2 +-
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml | 12 +++++++-----
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java | 4 ++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java | 14 +++++++++++++-
6 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
index bce2262..fd87234 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
@@ -5,6 +5,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.domain.R;
@@ -51,7 +52,7 @@
* 文件上传请求
*/
@PostMapping("uploadOSS")
- public R<String> uploadOSS(MultipartFile file)
+ public R<String> uploadOSS(@RequestPart("file")MultipartFile file)
{
try
{
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java
index ea09488..ed97c4b 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java
@@ -80,8 +80,8 @@
if (ossClient != null) {
ossClient.shutdown();
}
- return result.getResponse().getErrorResponseAsString();
}
+ return result.getResponse().getErrorResponseAsString();
}
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java
index 7e3a9f1..5d2ddf7 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java
@@ -26,6 +26,10 @@
@ApiModelProperty("任务内容")
private String taskContent;
+ @ApiModelProperty("处理内容")
+ private String dealContent;
+
+
@ApiModelProperty("今日标记")
private Integer todayFlag;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
index 2e21710..d38ec62 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
@@ -6,8 +6,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.shop.domain.pojo.shop.ShopRelTag;
+import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
import com.ruoyi.shop.mapper.shop.ShopStaffMapper;
+import com.ruoyi.shop.service.shop.ShopRelUserService;
+import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.shop.ShopStaffService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
@@ -30,7 +33,11 @@
@Service
public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff> implements ShopStaffService {
+ @Resource
+ private ShopService shopService;
+ @Resource
+ private ShopRelUserService shopRelUserService;
/**
*
* @param userId
@@ -54,7 +61,12 @@
MerStaffInfoVo merStaffInfoVo = new MerStaffInfoVo();
ShopStaff shopStaff = this.getByUserId(userId);
BeanUtils.copyProperties(shopStaff,merStaffInfoVo);
-
+ ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
+ Shop shop = shopService.getByShopId(shopRelUser.getShopId());
+ merStaffInfoVo.setShopName(shop.getShopName());
+ merStaffInfoVo.setShopAddress(shop.getShopAddress());
+ merStaffInfoVo.setShopServicePhone(shop.getShopServicePhone());
+ merStaffInfoVo.setBusinessTime(shop.getBusinessStartTime()+"-"+shop.getBusinessEndTime());
return merStaffInfoVo;
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml
index bcc970a..cb07761 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml
@@ -17,8 +17,10 @@
SELECT
task_id taskId,
task_date taskDate,
- task_content taskContent
+ task_content taskContent,
+ tmtr.follow_content dealContent
FROM t_agency_task tat
+ LEFT JOIN t_member_task_record tmtr ON tmt.task_id = tmtr.task_id
WHERE del_flag = 0 AND shop_id = #{param.shopId} AND agency_id = #{param.agencyId}
<if test="param.taskStatus!=null and param.taskStatus == 0">
AND task_status = 0 AND task_date < #{param.nowDay}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml
index 630908a..6b5dacb 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml
@@ -81,12 +81,14 @@
<select id="pageMerMemberTask" resultType="com.ruoyi.shop.domain.vo.MerMemberTaskPageVo">
SELECT
- task_id taskId,
- task_date taskDate,
- task_content taskContent,
+ tmt.task_id taskId,
+ tmt.task_date taskDate,
+ tmt.task_content taskContent,
+ tmtr.follow_content dealContent,
CASE WHEN task_date = #{param.today} THEN 1 ELSE 0 END todayFlag
- FROM t_member_task
- WHERE del_flag = 0 AND shop_id = #{param.shopId} AND user_id = #{param.memberUserId}
+ FROM t_member_task tmt
+ LEFT JOIN t_member_task_record tmtr ON tmt.task_id = tmtr.task_id
+ WHERE tmt.del_flag = 0 AND tmt.shop_id = #{param.shopId} AND tmt.user_id = #{param.memberUserId}
ORDER BY todayFlag,task_date DESC
</select>
</mapper>
--
Gitblit v1.7.1