From 1c3b9ecea77b913a9ce70ede8ddbb4bcea998b71 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 15:15:34 +0800
Subject: [PATCH] DEMO初步完成
---
ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml | 6 +++++-
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml | 20 ++++++++++----------
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java | 4 +++-
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java | 4 ++++
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml | 2 +-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java | 6 ++++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java | 1 +
7 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java
index d34b1ec..5597ebd 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java
@@ -55,4 +55,10 @@
@ApiModelProperty(value = "商户营业时间")
private String businessTime;
+ /**
+ * 商户类型1.经销商2.代理商
+ */
+ @ApiModelProperty(value = "商户类型1.经销商2.代理商")
+ private Integer shopType;
+
}
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 ed97c4b..ad8a7ee 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
@@ -52,8 +52,10 @@
OSS ossClient = createOss();
PutObjectResult result = null;
try {
+
String fileName = FileUploadUtils.extractFilename(file);
- String objectName = filePath + uuid;
+ String prefix = fileName.substring(fileName.lastIndexOf("."));
+ String objectName = filePath + uuid + prefix;
InputStream inputStream = file.getInputStream();
// 创建PutObjectRequest对象。
PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, objectName, inputStream);
diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
index 62804cd..ff40e2c 100644
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -3,7 +3,11 @@
port: 8031
# Spring
-spring:
+spring:
+ servlet:
+ multipart:
+ max-file-size: 100MB
+ max-request-size: 200MB
application:
# 应用名称
name: ruoyi-file
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java
index 6694580..948b5d3 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java
@@ -1,8 +1,10 @@
package com.ruoyi.shop.domain.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -26,6 +28,8 @@
private String callPhone;
@ApiModelProperty("电话时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private Date callTime;
@ApiModelProperty("跟踪内容")
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 d38ec62..980cd74 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
@@ -67,6 +67,7 @@
merStaffInfoVo.setShopAddress(shop.getShopAddress());
merStaffInfoVo.setShopServicePhone(shop.getShopServicePhone());
merStaffInfoVo.setBusinessTime(shop.getBusinessStartTime()+"-"+shop.getBusinessEndTime());
+ merStaffInfoVo.setShopType(shop.getShopType());
return merStaffInfoVo;
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml
index b948b86..dbfa572 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml
@@ -83,7 +83,7 @@
cer_number cerNumber,
cer_picture cerPicture
FROM t_shop_certificate
- WHRER del_flag = 0 AND shop_id = #{param.shopId}
+ WHERE del_flag = 0 AND shop_id = #{param.shopId}
<if test="param.status != null and param.status == 1">
AND cer_status = 1
</if>
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 cb07761..d46485b 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
@@ -15,26 +15,26 @@
<select id="pageMerAgencyTask" resultType="com.ruoyi.shop.domain.vo.MerAgencyTaskPageVo">
SELECT
- task_id taskId,
- task_date taskDate,
- task_content taskContent,
+ tat.task_id taskId,
+ tat.task_date taskDate,
+ tat.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}
+ LEFT JOIN t_agency_task_record tmtr ON tat.task_id = tmtr.task_id
+ WHERE tat.del_flag = 0 AND tat.shop_id = #{param.shopId} AND tat.agency_id = #{param.agencyId}
<if test="param.taskStatus!=null and param.taskStatus == 0">
- AND task_status = 0 AND task_date < #{param.nowDay}
+ AND tat.task_status = 0 AND tat.task_date < #{param.nowDay}
</if>
<if test="param.taskStatus!=null and param.taskStatus == 1">
- AND task_status = 0 AND task_date = #{param.nowDay}
+ AND tat.task_status = 0 AND tat.task_date = #{param.nowDay}
</if>
<if test="param.taskStatus!=null and param.taskStatus == 2">
- AND task_status = 2
+ AND tat.task_status = 2
</if>
<if test="param.taskStatus!=null and param.taskStatus == 3">
- AND task_status = 0 AND task_date > #{param.nowDay}
+ AND tat.task_status = 0 AND tat.task_date > #{param.nowDay}
</if>
- ORDER BY task_date DESC
+ ORDER BY tat.task_date DESC
</select>
</mapper>
--
Gitblit v1.7.1