From 39748c770c83ff1b1e4593c5f24b147361e587c0 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期三, 10 五月 2023 11:16:49 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/MyBatisPlusConfig.java | 18
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ConsumerGoodsMapper.xml | 3
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommendCooperationServiceImpl.java | 59 +++++
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopSuggestMapper.xml | 11
ruoyi-modules/ruoyi-order/pom.xml | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java | 3
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommendCooperationMapper.xml | 19 +
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java | 3
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/config/MyBatisPlusConfig.java | 14
ruoyi-modules/ruoyi-system/pom.xml | 4
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopSuggestDto.java | 22 ++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommendCooperationService.java | 35 +++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java | 3
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java | 19 +
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 20 +
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerRecommendCooperationDto.java | 25 ++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopSuggestMapper.java | 14 +
ruoyi-modules/ruoyi-member/pom.xml | 4
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java | 34 +++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java | 30 ++
ruoyi-api/ruoyi-api-system/pom.xml | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java | 3
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml | 8
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/config/MyBatisPlusConfig.java | 14
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java | 3
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java | 15
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java | 8
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml | 11
ruoyi-modules/ruoyi-shop/pom.xml | 4
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml | 12
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommendCooperationMapper.java | 29 ++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopRecommendPageDto.java | 20 +
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java | 6
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java | 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/MyBatisPlusConfig.java | 14
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 64 ++++-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java | 6
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java | 3
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopRecommendPageVo.java | 34 +++
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml | 7
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 7
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java | 8
/dev/null | 7
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java | 6
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java | 2
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml | 4
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml | 2
50 files changed, 540 insertions(+), 114 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
index 9150033..ea905b5 100644
--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ b/ruoyi-api/ruoyi-api-system/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
<!-- pagehelper 包含该依赖存在版本冲突，因此不建议和 mp 一起混用 -->
<exclusions>
<exclusion>
@@ -50,7 +50,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
index 2c6dd74..b3ef126 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
@@ -74,6 +74,12 @@
*/
@TableField("real_name")
private String realName;
+
+ /**
+ * 昵称
+ */
+ @TableField("nick_name")
+ private String nickName;
/**
* 手机号
*/
diff --git a/ruoyi-modules/ruoyi-member/pom.xml b/ruoyi-modules/ruoyi-member/pom.xml
index 0ee7e42..c194e48 100644
--- a/ruoyi-modules/ruoyi-member/pom.xml
+++ b/ruoyi-modules/ruoyi-member/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
<!-- pagehelper 包含该依赖存在版本冲突，因此不建议和 mp 一起混用 -->
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/config/MyBatisPlusConfig.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/config/MyBatisPlusConfig.java
index 5268ca7..a011d69 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/config/MyBatisPlusConfig.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/config/MyBatisPlusConfig.java
@@ -1,8 +1,7 @@
package com.ruoyi.member.config;
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -21,10 +20,9 @@
* MyBatisPlus拦截器（用于分页）
*/
@Bean
- public MybatisPlusInterceptor paginationInterceptor() {
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- //添加MySQL的分页拦截器
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
+ @ConditionalOnMissingBean
+ public PaginationInterceptor paginationInterceptor() {
+ PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+ return paginationInterceptor;
}
}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
index ed80863..b48f213 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
@@ -97,4 +97,6 @@
memberService.editMerMemberTags(merMemberTagEditDto);
return R.ok();
}
+
+
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java
index 8a55d3e..828c1c9 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java
@@ -43,4 +43,7 @@
@ApiModelProperty(name = "调理问题")
private List<String> memberNurse;
+
+ @ApiModelProperty(name = "创建时间")
+ private Date createTime;
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
index e43dc66..ef57ef9 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
@@ -28,6 +28,9 @@
@ApiModelProperty("用户头像")
private String avatar;
+ @ApiModelProperty("用户生日")
+ private String birthday;
+
@ApiModelProperty(value = "用户标签")
private String userTags;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java
index d770f30..828da62 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java
@@ -48,5 +48,5 @@
* @param merCashMemberPageDto
* @return
*/
- List<MerCashMemberPageVo> pageMerCashMember(Page page, MerCashMemberPageDto merCashMemberPageDto);
+ List<MerCashMemberPageVo> pageMerCashMember(Page page, @Param("param")MerCashMemberPageDto merCashMemberPageDto);
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 91d33bc..86004d0 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -142,7 +142,8 @@
sysUser = new SysUser();
sysUser.setUserName(memberId);
sysUser.setUserType("03");
- sysUser.setNickName("微信用户");
+ sysUser.setNickName("鸿瑞堂用户");
+ sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
String password = "hongruitang";
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser = sysUserService.registerUser(sysUser).getData();
@@ -150,6 +151,8 @@
member = new Member();
member.setUserId(sysUser.getUserId());
member.setDelFlag(0);
+ member.setNickName("鸿瑞堂用户");
+ member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
member.setMemberId(memberId);
member.setWxUnionid(unionid);
member.setMiniOpenid(openid);
@@ -237,7 +240,7 @@
sysUser.setPhonenumber(mobile);
sysUserService.updateUserMobile(sysUser);
member.setMobile(mobile);
- member.setRealName(sysUser.getNickName());
+ member.setNickName(sysUser.getNickName());
this.saveOrUpdate(member);
appUserAuthorizeVo.setMobile(mobile);
appUserAuthorizeVo.setNickName(sysUser.getNickName());
@@ -308,7 +311,7 @@
Member member = this.getByUserId(appEditUserDto.getUserId());
switch (editType){
case 1:
- member.setRealName(editValue);
+ member.setNickName(editValue);
member.setUpdateTime(new Date());
member.setUpdateUserId(appEditUserDto.getUserId());
this.saveOrUpdate(member);
@@ -354,12 +357,12 @@
@Override
public MerMemberInfoVo getMerMemberInfo(Long userId){
MerMemberInfoVo merMemberInfoVo = new MerMemberInfoVo();
- SysUser sysUser = sysUserService.getSysUser(userId).getData();
Member member = this.getByUserId(userId);
merMemberInfoVo.setUserId(userId);
- merMemberInfoVo.setNickName(sysUser.getNickName());
- merMemberInfoVo.setPhonenumber(sysUser.getPhonenumber());
- merMemberInfoVo.setAvatar(sysUser.getAvatar());
+ merMemberInfoVo.setNickName(member.getNickName());
+ merMemberInfoVo.setPhonenumber(member.getMobile());
+ merMemberInfoVo.setAvatar(member.getAvatar());
+ merMemberInfoVo.setBirthday(member.getBirthday());
//未完成
return merMemberInfoVo;
@@ -400,6 +403,9 @@
MerMemberBasicFileVo merMemberBasicFileVo = new MerMemberBasicFileVo();
Member member = this.getByUserId(userId);
BeanUtils.copyProperties(member, merMemberBasicFileVo);
+ merMemberBasicFileVo.setNickName(member.getNickName());
+ merMemberBasicFileVo.setPhonenumber(member.getMobile());
+ merMemberBasicFileVo.setCreateTime(member.getCreateTime());
List<MemberNurse> memberNurseList = memberNurseService.listByUserId(userId);
List<String> valueList = memberNurseList.stream().map(k->k.getNurse()).collect(Collectors.toList());
merMemberBasicFileVo.setMemberNurse(valueList);
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
index 3caaae1..590bb94 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
@@ -11,6 +11,7 @@
<result property="miniOpenid" column="mini_openid" />
<result property="wxUnionid" column="wx_unionid" />
<result property="relationShopId" column="relation_shop_id" />
+ <result property="nickName" column="nick_name" />
<result property="realName" column="real_name" />
<result property="mobile" column="mobile" />
<result property="gender" column="gender" />
@@ -27,7 +28,7 @@
</resultMap>
<sql id="selectMemberVo">
- select user_id, del_flag, member_id, member_no, wx_openid, mini_openid, wx_unionid, relation_shop_id, real_name, mobile, gender, referrer, customer_source, level, birthday, create_time, update_time, update_user_id, user_tags, avatar, binding_flag from t_member
+ select user_id, del_flag, member_id, member_no, wx_openid, mini_openid, wx_unionid, relation_shop_id, nick_name, real_name, mobile, gender, referrer, customer_source, level, birthday, create_time, update_time, update_user_id, user_tags, avatar, binding_flag from t_member
</sql>
<select id="selectMemberList" parameterType="com.ruoyi.system.api.domain.poji.member.Member" resultMap="MemberResult">
@@ -142,7 +143,7 @@
<select id="pageMerMember" resultType="com.ruoyi.member.domain.vo.MerMemberPageVo">
SELECT
tm.user_id userId,
- tm.real_name nickName,
+ tm.nick_name nickName,
tm.avatar avatar,
CASE tm.gender WHEN 0 THEN '男' WHEN 1 THEN '女' ELSE '未知' END gender,
tm.mobile mobile,
@@ -152,7 +153,7 @@
tm.birthday birthday,
tm.user_tags userTags
FROM t_member tm
- WHERE tm.relationShopId = #{param.shopId}
+ WHERE tm.relation_shop_id = #{param.shopId}
<if test="param.keyword != null and param.keyword != ''">
AND (tm.real_name LIKE CONCAT('%',#{param.keyword},'%') OR tm.mobile LIKE CONCAT('%',#{param.keyword},'%') OR tm.referrer LIKE CONCAT('%',#{param.keyword},'%'))
</if>
@@ -161,10 +162,10 @@
<select id="pageMerCashMember" resultType="com.ruoyi.member.domain.vo.MerCashMemberPageVo">
SELECT
tm.user_id userId,
- tm.real_name nickName,
+ tm.nick_name nickName,
tm.mobile mobile
FROM t_member tm
- WHERE tm.relationShopId = #{param.shopId}
+ WHERE tm.relation_shop_id = #{param.shopId}
<if test="param.keyword != null and param.keyword != ''">
AND (tm.real_name LIKE CONCAT('%',#{param.keyword},'%') OR tm.mobile LIKE CONCAT('%',#{param.keyword},'%'))
</if>
diff --git a/ruoyi-modules/ruoyi-order/pom.xml b/ruoyi-modules/ruoyi-order/pom.xml
index 85420d9..1a76f59 100644
--- a/ruoyi-modules/ruoyi-order/pom.xml
+++ b/ruoyi-modules/ruoyi-order/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
<!-- pagehelper 包含该依赖存在版本冲突，因此不建议和 mp 一起混用 -->
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/MyBatisPlusConfig.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/MyBatisPlusConfig.java
index 9043b26..c5e4de5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/MyBatisPlusConfig.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/MyBatisPlusConfig.java
@@ -1,8 +1,8 @@
package com.ruoyi.order.config;
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -21,10 +21,12 @@
* MyBatisPlus拦截器（用于分页）
*/
@Bean
- public MybatisPlusInterceptor paginationInterceptor() {
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- //添加MySQL的分页拦截器
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
+ @ConditionalOnMissingBean
+ public PaginationInterceptor paginationInterceptor() {
+ PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+ return paginationInterceptor;
}
+
+
+
}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java
index 4fcfe18..6373bb1 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java
@@ -8,12 +8,14 @@
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.UserServiceRecordService;
import com.ruoyi.system.api.domain.poji.member.Member;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -24,7 +26,9 @@
* @date 2023年05月05日
* @version: 1.0
*/
-@Data
+@Api(value = "商户端服务相关接口", tags = "商户端服务相关接口", description = "商户端服务相关接口")
+@RestController
+@RequestMapping("/mer/consumer")
public class MerConsumerController {
@Autowired
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
index bbddb84..afc33b3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
@@ -21,4 +21,7 @@
@ApiModelProperty(value = "实收金额")
private BigDecimal relReceiveMoney;
+
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relPayMoney;
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java
index eac3bdb..b3f8cc9 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java
@@ -28,6 +28,9 @@
@ApiModelProperty("商品名称")
private String goodsName;
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
@ApiModelProperty("商品图片")
private String goodsPicture;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 3c76a3a..0c6a023 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -524,14 +524,15 @@
public MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto){
String orderId = merVerifyOrderDto.getOrderId();
BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
+ BigDecimal relPayMoney = merVerifyOrderDto.getRelPayMoney();
Date nowTime = new Date();
//更新订单信息
Order order = this.getById(orderId);
order.setOrderStatus(3);
order.setUseTime(nowTime);
order.setUseUserId(merVerifyOrderDto.getUserId());
- order.setOfflinePayMoney(relReceiveMoney);
- order.setPayMoney(order.getPayMoney().add(relReceiveMoney));
+ order.setOfflinePayMoney(relPayMoney);
+ order.setPayMoney(relReceiveMoney.add(relPayMoney));
order.setCloseFlag(1);
this.saveOrUpdate(order);
//创建服务商品
@@ -788,7 +789,7 @@
for(MerOrderPageVo merOrderPageVo : merOrderPageVoList){
userId = merOrderPageVo.getUserId();
member = remoteMemberService.getMember(userId).getData();
- merOrderPageVo.setUserName(member.getRealName());
+ merOrderPageVo.setUserName(member.getNickName());
merOrderPageVo.setUserMobile(member.getMobile());
orderFrom = merOrderPageVo.getOrderFrom();
orderFromDesc = "商城订单";
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ConsumerGoodsMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ConsumerGoodsMapper.xml
index 73993ee..5dc6e36 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ConsumerGoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ConsumerGoodsMapper.xml
@@ -146,6 +146,7 @@
tcg.shop_id shopId,
tcg.goods_type goodsType,
tg.goods_name goodsName,
+ tg.goods_introduction goodsIntroduction,
tgf.file_url goodsPicture,
tg.goods_nurses goodsNurses,
tcg.cycle_num_flag cycleNumFlag,
@@ -166,6 +167,7 @@
tcg.shop_id shopId,
tcg.goods_type goodsType,
tg.goods_name goodsName,
+ tg.goods_introduction goodsIntroduction,
tgf.file_url goodsPicture,
tg.goods_nurses goodsNurses,
tcg.cycle_num_flag cycleNumFlag,
@@ -186,6 +188,7 @@
tcg.shop_id shopId,
tcg.goods_type goodsType,
tg.goods_name goodsName,
+ tg.goods_introduction goodsIntroduction,
tgf.file_url goodsPicture,
tg.goods_nurses goodsNurses,
tcg.cycle_num_flag cycleNumFlag,
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml
index 314acf7..0d30b10 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml
@@ -88,11 +88,11 @@
ORDER BY tusr.create_time DESC
</select>
- <select id="pageUserServiceRecord" resultType="com.ruoyi.order.domain.vo.MerServiceRecordPageVo">
+ <select id="pageMerMemberServiceRecord" resultType="com.ruoyi.order.domain.vo.MerServiceRecordPageVo">
SELECT
- tcg.consumer_goods_names consumerGoodsNames,
- tcg.service_type serviceType,
- tcg.create_time createTime
+ tusr.consumer_goods_names consumerGoodsNames,
+ tusr.service_type serviceType,
+ tusr.create_time createTime
FROM t_user_service_record tusr
WHERE tusr.del_flag = 0 AND tusr.user_id = #{param.memberUserId} AND tusr.shop_id = #{param.shopId}
ORDER BY tusr.create_time DESC
diff --git a/ruoyi-modules/ruoyi-shop/pom.xml b/ruoyi-modules/ruoyi-shop/pom.xml
index 015e757..1962773 100644
--- a/ruoyi-modules/ruoyi-shop/pom.xml
+++ b/ruoyi-modules/ruoyi-shop/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
<!-- pagehelper 包含该依赖存在版本冲突，因此不建议和 mp 一起混用 -->
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/config/MyBatisPlusConfig.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/config/MyBatisPlusConfig.java
index 9faae51..19e58e8 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/config/MyBatisPlusConfig.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/config/MyBatisPlusConfig.java
@@ -1,8 +1,7 @@
package com.ruoyi.shop.config;
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -21,10 +20,9 @@
* MyBatisPlus拦截器（用于分页）
*/
@Bean
- public MybatisPlusInterceptor paginationInterceptor() {
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- //添加MySQL的分页拦截器
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
+ @ConditionalOnMissingBean
+ public PaginationInterceptor paginationInterceptor() {
+ PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+ return paginationInterceptor;
}
}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index c6a0eb7..d10738d 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -3,21 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.domain.dto.MerAgencyPageDto;
-import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
-import com.ruoyi.shop.domain.dto.MerShopCertificateEditDto;
-import com.ruoyi.shop.domain.dto.MerShopCertificateListDto;
-import com.ruoyi.shop.domain.vo.MerAgencyPageVo;
-import com.ruoyi.shop.domain.vo.MerMemberTaskPageVo;
-import com.ruoyi.shop.domain.vo.MerShopCertificateListVo;
-import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
-import com.ruoyi.shop.service.shop.ShopCertificateService;
-import com.ruoyi.shop.service.shop.ShopService;
-import com.ruoyi.shop.service.shop.ShopStaffService;
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MerEditUserDto;
-import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.shop.domain.dto.*;
+import com.ruoyi.shop.domain.vo.*;
+import com.ruoyi.shop.service.shop.*;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
import io.swagger.annotations.Api;
@@ -51,6 +40,12 @@
@Autowired
private ShopStaffService shopStaffService;
+
+ @Autowired
+ private RecommendCooperationService recommendCooperationService;
+
+ @Autowired
+ private ShopSuggestService shopSuggestService;
/**
* 未完成实际统计
@@ -117,6 +112,45 @@
return R.ok();
}
+ @RequestMapping(value = "/pageMerShopRecommend", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商户推荐列表")
+ public R<Page<MerShopRecommendPageVo>> pageMerShopRecommend(@RequestBody MerShopRecommendPageDto merShopRecommendPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merShopRecommendPageDto.setUserId(userId);
+ Page<MerShopRecommendPageVo> page = new Page<>();
+ page.setSize(merShopRecommendPageDto.getPageSize());
+ page.setCurrent(merShopRecommendPageDto.getPageNum());
+ List<MerShopRecommendPageVo> merShopRecommendPageVoList = recommendCooperationService.pageMerShopRecommend(page,merShopRecommendPageDto);
+ return R.ok(page.setRecords(merShopRecommendPageVoList));
+ }
+ @RequestMapping(value = "/recommendCooperation", method = RequestMethod.POST)
+ @ApiOperation(value = "推荐合作")
+ public R recommendCooperation(@RequestBody MerRecommendCooperationDto merRecommendCooperationDto) {
+ Long userId = SecurityUtils.getUserId();
+ merRecommendCooperationDto.setUserId(userId);
+ recommendCooperationService.recommendCooperation(merRecommendCooperationDto);
+ return R.ok();
+ }
+ @RequestMapping(value = "/pageMerShopSuggest", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商户建议")
+ public R<Page<MerShopSuggestVo>> pageMerShopSuggest(@RequestBody MerPageDto merPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merPageDto.setUserId(userId);
+ Page<MerShopSuggestVo> page = new Page<>();
+ page.setSize(merPageDto.getPageSize());
+ page.setCurrent(merPageDto.getPageNum());
+ List<MerShopSuggestVo> merShopSuggestVoList = shopSuggestService.pageMerShopSuggest(page,merPageDto);
+ return R.ok(page.setRecords(merShopSuggestVoList));
+ }
+
+ @RequestMapping(value = "/suggest", method = RequestMethod.POST)
+ @ApiOperation(value = "建议")
+ public R suggest(@RequestBody MerShopSuggestDto merShopSuggestDto) {
+ Long userId = SecurityUtils.getUserId();
+ merShopSuggestDto.setUserId(userId);
+ shopSuggestService.suggest(merShopSuggestDto);
+ return R.ok();
+ }
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
index a947e00..0b9bbc9 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
@@ -30,7 +30,7 @@
* @date 2023年05月06日
* @version: 1.0
*/
-@Api(value = "商户端会员相关接口", tags = "商户端会员相关接口", description = "商户端会员相关接口")
+@Api(value = "商户端任务相关接口", tags = "商户端任务相关接口", description = "商户端任务相关接口")
@RestController
@RequestMapping("/mer/task")
public class MerTaskController {
@@ -104,7 +104,7 @@
}
@RequestMapping(value = "/pageMerAgencyTaskRecord", method = RequestMethod.POST)
- @ApiOperation(value = "分页获取商户会员跟进任务记录列表")
+ @ApiOperation(value = "分页获取商户代理商跟进任务记录列表")
public R<Page<MerAgencyTaskRecordPageVo>> pageMerAgencyTaskRecord(@RequestBody MerAgencyTaskPageDto merAgencyTaskPageDto) {
Long userId = SecurityUtils.getUserId();
merAgencyTaskPageDto.setUserId(userId);
@@ -116,7 +116,7 @@
}
@RequestMapping(value = "/createAgencyTask", method = RequestMethod.POST)
- @ApiOperation(value = "新建会员跟进任务")
+ @ApiOperation(value = "新建代理商跟进任务")
public R createAgencyTask(@RequestBody MerCreateAgencyTaskDto merCreateAgencyTaskDto) {
Long userId = SecurityUtils.getUserId();
merCreateAgencyTaskDto.setUserId(userId);
@@ -125,7 +125,7 @@
}
@RequestMapping(value = "/followAgencyTask", method = RequestMethod.POST)
- @ApiOperation(value = "会员任务跟进")
+ @ApiOperation(value = "会员代理商跟进")
public R followAgencyTask(@RequestBody MerFollowAgencyTaskDto merFollowAgencyTaskDto) {
Long userId = SecurityUtils.getUserId();
merFollowAgencyTaskDto.setUserId(userId);
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java
index 3069d90..1738ec6 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java
@@ -16,4 +16,7 @@
@ApiModelProperty(name = "会员用户id")
private Long memberUserId;
+
+ @ApiModelProperty(name = "今日",hidden = true)
+ private String today;
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerRecommendCooperationDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerRecommendCooperationDto.java
new file mode 100644
index 0000000..3753930
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerRecommendCooperationDto.java
@@ -0,0 +1,25 @@
+package com.ruoyi.shop.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerRecommendCooperationDto
+ * @description: TODO
+ * @date 2023年05月09日
+ * @version: 1.0
+ */
+@Data
+public class MerRecommendCooperationDto extends MerBaseDto {
+
+ @ApiModelProperty(name = "被推荐人")
+ private String recommendedName;
+
+ @ApiModelProperty(name = "被推荐人电话")
+ private String recommendedPhone;
+
+ @ApiModelProperty(name = "备注")
+ private String remark;
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopRecommendPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopRecommendPageDto.java
new file mode 100644
index 0000000..2859607
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopRecommendPageDto.java
@@ -0,0 +1,20 @@
+package com.ruoyi.shop.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerShopRecommendPageVo
+ * @description: TODO
+ * @date 2023年05月09日
+ * @version: 1.0
+ */
+@Data
+public class MerShopRecommendPageDto extends MerPageDto {
+
+ @ApiModelProperty(name = "搜索关键词")
+ private String keyword;
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopSuggestDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopSuggestDto.java
new file mode 100644
index 0000000..ab6fc6f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopSuggestDto.java
@@ -0,0 +1,22 @@
+package com.ruoyi.shop.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author jqs34
+ * @ClassName MerShopSuggestVo
+ * @description: TODO
+ * @date 2023年05月09日
+ * @version: 1.0
+ */
+@Data
+public class MerShopSuggestDto extends MerBaseDto {
+
+ @ApiModelProperty(name = "建议内容")
+ private String suggestContent;
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommandCooperation.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java
similarity index 84%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommandCooperation.java
rename to ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java
index be00f7c..26b597f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommandCooperation.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java
@@ -8,8 +8,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.Version;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -25,8 +23,8 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@TableName("t_recommand_cooperation")
-public class RecommandCooperation extends Model<RecommandCooperation> {
+@TableName("t_recommend_cooperation")
+public class RecommendCooperation extends Model<RecommendCooperation> {
private static final long serialVersionUID = 1L;
@@ -40,16 +38,19 @@
*/
@TableField("del_flag")
private Integer delFlag;
+
+ @TableField("shop_id")
+ private Long shopId;
/**
- * 签约状态
+ * 签约状态1.未签约2已签约
*/
@TableField("corp_status")
private Integer corpStatus;
/**
* 推荐人id
*/
- @TableField("recommand_user_id")
- private Long recommandUserId;
+ @TableField("recommend_user_id")
+ private Long recommendUserId;
/**
* 被推荐人
*/
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java
index f4a9815..65e706e 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java
@@ -44,6 +44,12 @@
*/
@TableField("user_id")
private Long userId;
+
+ /**
+ * 用户id
+ */
+ @TableField("shop_id")
+ private Long shopId;
/**
* 员工姓名
*/
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
index 4dffedb..7f19cc5 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
@@ -40,6 +40,9 @@
*/
@TableField("del_flag")
private Integer delFlag;
+
+ @TableField("Shop_id")
+ private Long shopId;
/**
* 建议内容
*/
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java
index 94f3f34..e7416ca 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java
@@ -24,7 +24,7 @@
@ApiModelProperty("任务内容")
private String taskContent;
- @ApiModelProperty("任务内容")
+ @ApiModelProperty("今日标记")
private Integer todayFlag;
}
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 c4bfa6d..7e3a9f1 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,7 +26,7 @@
@ApiModelProperty("任务内容")
private String taskContent;
- @ApiModelProperty("任务内容")
+ @ApiModelProperty("今日标记")
private Integer todayFlag;
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopRecommendPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopRecommendPageVo.java
new file mode 100644
index 0000000..6b56a33
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopRecommendPageVo.java
@@ -0,0 +1,34 @@
+package com.ruoyi.shop.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerShopRecommendPageVo
+ * @description: TODO
+ * @date 2023年05月09日
+ * @version: 1.0
+ */
+@Data
+public class MerShopRecommendPageVo {
+
+ @ApiModelProperty(name = "推荐id")
+ private Long id;
+
+ @ApiModelProperty(name = "签约状态1.未签约2已签约")
+ private Integer corpStatus;
+
+ @ApiModelProperty(name = "被推荐人")
+ private String recommendedName;
+
+ @ApiModelProperty(name = "被推荐人电话")
+ private String recommendedPhone;
+
+ @ApiModelProperty(name = "备注")
+ private String remark;
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java
new file mode 100644
index 0000000..c9470b1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java
@@ -0,0 +1,30 @@
+package com.ruoyi.shop.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author jqs34
+ * @ClassName MerShopSuggestVo
+ * @description: TODO
+ * @date 2023年05月09日
+ * @version: 1.0
+ */
+@Data
+public class MerShopSuggestVo {
+
+
+ @ApiModelProperty(name = "建议内容")
+ private String suggestContent;
+
+
+ @ApiModelProperty(name = "回复内容")
+ private String replayContent;
+
+
+ @ApiModelProperty(name = "创建时间")
+ private Date createTime;
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommandCooperationMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommandCooperationMapper.java
deleted file mode 100644
index 9cb3aa8..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommandCooperationMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.shop.mapper.shop;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.shop.domain.pojo.shop.RecommandCooperation;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author jqs
- * @since 2023-05-09
- */
-public interface RecommandCooperationMapper extends BaseMapper<RecommandCooperation> {
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommendCooperationMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommendCooperationMapper.java
new file mode 100644
index 0000000..38bfc16
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommendCooperationMapper.java
@@ -0,0 +1,29 @@
+package com.ruoyi.shop.mapper.shop;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.shop.domain.dto.MerShopRecommendPageDto;
+import com.ruoyi.shop.domain.pojo.shop.RecommendCooperation;
+import com.ruoyi.shop.domain.vo.MerShopRecommendPageVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-09
+ */
+public interface RecommendCooperationMapper extends BaseMapper<RecommendCooperation> {
+
+ /**
+ *
+ * @param page
+ * @param merShopRecommendPageDto
+ * @return
+ */
+ List<MerShopRecommendPageVo> pageMerShopRecommend(Page page, @Param("param") MerShopRecommendPageDto merShopRecommendPageDto);
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopSuggestMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopSuggestMapper.java
index 12a9f3e..71b676b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopSuggestMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopSuggestMapper.java
@@ -1,7 +1,13 @@
package com.ruoyi.shop.mapper.shop;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.shop.domain.pojo.shop.ShopSuggest;
+import com.ruoyi.shop.domain.vo.MerShopSuggestVo;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -12,5 +18,11 @@
* @since 2023-05-09
*/
public interface ShopSuggestMapper extends BaseMapper<ShopSuggest> {
-
+ /**
+ *
+ * @param page
+ * @param merPageDto
+ * @return
+ */
+ List<MerShopSuggestVo> pageMerShopSuggest(Page page, @Param("param") MerPageDto merPageDto);
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommandCooperationServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommandCooperationServiceImpl.java
deleted file mode 100644
index 273d979..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommandCooperationServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.shop.service.impl.shop;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.shop.domain.pojo.shop.RecommandCooperation;
-import com.ruoyi.shop.mapper.shop.RecommandCooperationMapper;
-import com.ruoyi.shop.service.shop.RecommandCooperationService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author jqs
- * @since 2023-05-09
- */
-@Service
-public class RecommandCooperationServiceImpl extends ServiceImpl<RecommandCooperationMapper, RecommandCooperation> implements RecommandCooperationService {
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommendCooperationServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommendCooperationServiceImpl.java
new file mode 100644
index 0000000..68bbfa8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommendCooperationServiceImpl.java
@@ -0,0 +1,59 @@
+package com.ruoyi.shop.service.impl.shop;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.shop.domain.dto.MerRecommendCooperationDto;
+import com.ruoyi.shop.domain.dto.MerShopRecommendPageDto;
+import com.ruoyi.shop.domain.pojo.shop.RecommendCooperation;
+import com.ruoyi.shop.domain.vo.MerShopRecommendPageVo;
+import com.ruoyi.shop.mapper.shop.RecommendCooperationMapper;
+import com.ruoyi.shop.service.shop.RecommendCooperationService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-09
+ */
+@Service
+public class RecommendCooperationServiceImpl extends ServiceImpl<RecommendCooperationMapper, RecommendCooperation> implements RecommendCooperationService {
+
+ @Resource
+ private RecommendCooperationMapper recommendCooperationMapper;
+
+ /**
+ *
+ * @param page
+ * @param merShopRecommendPageDto
+ * @return
+ */
+ @Override
+ public List<MerShopRecommendPageVo> pageMerShopRecommend(Page page, MerShopRecommendPageDto merShopRecommendPageDto){
+ return recommendCooperationMapper.pageMerShopRecommend(page,merShopRecommendPageDto);
+ }
+
+ /**
+ *
+ * @param merRecommendCooperationDto
+ */
+ @Override
+ public void recommendCooperation(MerRecommendCooperationDto merRecommendCooperationDto){
+ RecommendCooperation recommendCooperation = new RecommendCooperation();
+ BeanUtils.copyProperties(merRecommendCooperationDto,recommendCooperation);
+ recommendCooperation.setDelFlag(0);
+ recommendCooperation.setRecommendUserId(merRecommendCooperationDto.getUserId());
+ recommendCooperation.setShopId(merRecommendCooperationDto.getShopId());
+ recommendCooperation.setCorpStatus(1);
+ recommendCooperation.setCreateTime(new Date());
+ this.save(recommendCooperation);
+ }
+}
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 5c024b6..2e21710 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
@@ -9,9 +9,15 @@
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
import com.ruoyi.shop.mapper.shop.ShopStaffMapper;
import com.ruoyi.shop.service.shop.ShopStaffService;
+import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
+import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -23,6 +29,7 @@
*/
@Service
public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff> implements ShopStaffService {
+
/**
*
@@ -47,6 +54,7 @@
MerStaffInfoVo merStaffInfoVo = new MerStaffInfoVo();
ShopStaff shopStaff = this.getByUserId(userId);
BeanUtils.copyProperties(shopStaff,merStaffInfoVo);
+
return merStaffInfoVo;
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java
index 29fa8da..22368b5 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java
@@ -1,11 +1,18 @@
package com.ruoyi.shop.service.impl.shop;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.shop.domain.dto.MerShopSuggestDto;
import com.ruoyi.shop.domain.pojo.shop.ShopSuggest;
+import com.ruoyi.shop.domain.vo.MerShopSuggestVo;
import com.ruoyi.shop.mapper.shop.ShopSuggestMapper;
import com.ruoyi.shop.service.shop.ShopSuggestService;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -18,4 +25,31 @@
@Service
public class ShopSuggestServiceImpl extends ServiceImpl<ShopSuggestMapper, ShopSuggest> implements ShopSuggestService {
+ @Resource
+ private ShopSuggestMapper shopSuggestMapper;
+
+ /**
+ *
+ * @param page
+ * @param merPageDto
+ * @return
+ */
+ @Override
+ public List<MerShopSuggestVo> pageMerShopSuggest(Page page, MerPageDto merPageDto){
+ return shopSuggestMapper.pageMerShopSuggest(page, merPageDto);
+ }
+
+ /**
+ *
+ * @param merShopSuggestDto
+ */
+ @Override
+ public void suggest(MerShopSuggestDto merShopSuggestDto){
+ ShopSuggest shopSuggest = new ShopSuggest();
+ shopSuggest.setDelFlag(0);
+ shopSuggest.setCreateUserId(merShopSuggestDto.getUserId());
+ shopSuggest.setShopId(merShopSuggestDto.getShopId());
+ shopSuggest.setSuggestContent(merShopSuggestDto.getSuggestContent());
+ this.save(shopSuggest);
+ }
}
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 3261eb4..18f1c45 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
@@ -43,7 +43,8 @@
*/
@Override
public List<MerAgencyTaskPageVo> pageMerAgencyTask(Page page, MerAgencyTaskPageDto merAgencyTaskPageDto){
- merAgencyTaskPageDto.setNowDay(DateUtils.parseDateToStr("YYYY-MM-DD",new Date()));
+ String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",new Date());
+ merAgencyTaskPageDto.setNowDay(nowDay);
List<MerAgencyTaskPageVo> merAgencyTaskPageVoList = agencyTaskMapper.pageMerAgencyTask(page, merAgencyTaskPageDto);
return merAgencyTaskPageVoList;
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommandCooperationService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommandCooperationService.java
deleted file mode 100644
index 8c4a68d..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommandCooperationService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.shop.service.shop;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.shop.domain.pojo.shop.RecommandCooperation;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author jqs
- * @since 2023-05-09
- */
-public interface RecommandCooperationService extends IService<RecommandCooperation> {
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommendCooperationService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommendCooperationService.java
new file mode 100644
index 0000000..5afd4da
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommendCooperationService.java
@@ -0,0 +1,35 @@
+package com.ruoyi.shop.service.shop;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.shop.domain.dto.MerRecommendCooperationDto;
+import com.ruoyi.shop.domain.dto.MerShopRecommendPageDto;
+import com.ruoyi.shop.domain.pojo.shop.RecommendCooperation;
+import com.ruoyi.shop.domain.vo.MerShopRecommendPageVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-09
+ */
+public interface RecommendCooperationService extends IService<RecommendCooperation> {
+
+ /**
+ *
+ * @param page
+ * @param merShopRecommendPageDto
+ * @return
+ */
+ List<MerShopRecommendPageVo> pageMerShopRecommend(Page page, MerShopRecommendPageDto merShopRecommendPageDto);
+
+ /**
+ *
+ * @param merRecommendCooperationDto
+ */
+ void recommendCooperation(MerRecommendCooperationDto merRecommendCooperationDto);
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java
index f28a4d2..017d29d 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java
@@ -1,7 +1,13 @@
package com.ruoyi.shop.service.shop;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.shop.domain.dto.MerShopSuggestDto;
import com.ruoyi.shop.domain.pojo.shop.ShopSuggest;
+import com.ruoyi.shop.domain.vo.MerShopSuggestVo;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +19,17 @@
*/
public interface ShopSuggestService extends IService<ShopSuggest> {
+ /**
+ *
+ * @param page
+ * @param merPageDto
+ * @return
+ */
+ List<MerShopSuggestVo> pageMerShopSuggest(Page page, MerPageDto merPageDto);
+
+ /**
+ *
+ * @param merShopSuggestDto
+ */
+ void suggest(MerShopSuggestDto merShopSuggestDto);
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommandCooperationMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommandCooperationMapper.xml
deleted file mode 100644
index 9f1cda6..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommandCooperationMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.shop.mapper.shop.RecommandCooperationMapper">
-
-
-
-</mapper>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommendCooperationMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommendCooperationMapper.xml
new file mode 100644
index 0000000..eff376d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommendCooperationMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.shop.mapper.shop.RecommendCooperationMapper">
+
+ <select id="pageMerShopRecommend" resultType="com.ruoyi.shop.domain.vo.MerShopRecommendPageVo">
+ SELECT
+ id id,
+ corp_status corpStatus,
+ recommended_name recommendedName,
+ recommended_phone recommendedPhone,
+ remark remark
+ FROM t_recommend_cooperation
+ WHERE del_flag = 0 AND shop_id = #{param.shopId}
+ <if test="param.keyword != null and param.keyword != ''">
+ AND (recommended_name LIKE CONCAT('%',#{param.keyword},'%') OR recommended_phone LIKE CONCAT('%',#{param.keyword},'%'))
+ </if>
+ </select>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopSuggestMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopSuggestMapper.xml
index 4585a4e..5dafd47 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopSuggestMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopSuggestMapper.xml
@@ -2,6 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.shop.mapper.shop.ShopSuggestMapper">
-
-
+ <select id="pageMerShopSuggest" resultType="com.ruoyi.shop.domain.vo.MerShopSuggestVo">
+ SELECT
+ suggest_content suggestContent,
+ replay_content replayContent,
+ create_time createTime
+ FROM
+ t_shop_suggest
+ WHERE del_flag = 0 AND shop_id = #{param.shopId}
+ </select>
</mapper>
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 cf33177..bcc970a 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
@@ -13,23 +13,23 @@
<result property="taskStatus" column="task_status" />
</resultMap>
- <select id="pageMerAgencyTask" resultType="com.ruoyi.shop.domain.vo.MerAgencyPageVo">
+ <select id="pageMerAgencyTask" resultType="com.ruoyi.shop.domain.vo.MerAgencyTaskPageVo">
SELECT
task_id taskId,
task_date taskDate,
task_content taskContent
FROM t_agency_task tat
- WHERE delFlag = 0 AND shop_id = #{param.shopId} AND agency_id = #{param.agencyId}
- <if test="param.taskStatus!=null and param.taskStatus!=null == 0">
+ 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}
</if>
- <if test="param.taskStatus!=null and param.taskStatus!=null == 1">
+ <if test="param.taskStatus!=null and param.taskStatus == 1">
AND task_status = 0 AND task_date = #{param.nowDay}
</if>
- <if test="param.taskStatus!=null and param.taskStatus!=null == 2">
+ <if test="param.taskStatus!=null and param.taskStatus == 2">
AND task_status = 2
</if>
- <if test="param.taskStatus!=null and param.taskStatus!=null == 3">
+ <if test="param.taskStatus!=null and param.taskStatus == 3">
AND task_status = 0 AND task_date > #{param.nowDay}
</if>
ORDER BY task_date DESC
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml
index 359da4c..1d26f06 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml
@@ -14,7 +14,7 @@
</resultMap>
- <select id="pageMerMemberTaskRecord" resultType="com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo">
+ <select id="pageMerAgencyTaskRecord" resultType="com.ruoyi.shop.domain.vo.MerAgencyTaskRecordPageVo">
SELECT
tmtr.id followId,
tmtr.task_id taskId,
@@ -25,7 +25,7 @@
tmtr.callPhone callPhone
FROM t_agency_task tmt
INNER JOIN t_agency_task_record tmtr ON tmtr.task_id = tmt.task_id
- WHERE delFlag = 0 AND shop_id = #{param.shopId} AND agency_id = #{param.agencyId}
+ WHERE del_flag = 0 AND shop_id = #{param.shopId} AND agency_id = #{param.agencyId}
ORDER BY tmt.task_date DESC
</select>
</mapper>
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 c1486a5..630908a 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
@@ -83,9 +83,10 @@
SELECT
task_id taskId,
task_date taskDate,
- task_content taskContent
+ task_content taskContent,
+ CASE WHEN task_date = #{param.today} THEN 1 ELSE 0 END todayFlag
FROM t_member_task
- WHERE delFlag = 0 AND shop_id = #{param.shopId} AND user_id = #{param.memberUserId}
- ORDER BY task_date DESC
+ WHERE del_flag = 0 AND shop_id = #{param.shopId} AND user_id = #{param.memberUserId}
+ ORDER BY todayFlag,task_date DESC
</select>
</mapper>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml
index 65556e9..3702918 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml
@@ -88,7 +88,7 @@
tmtr.callPhone callPhone
FROM t_member_task tmt
INNER JOIN t_member_task_record tmtr ON tmtr.task_id = tmt.task_id
- WHERE delFlag = 0 AND shop_id = #{param.shopId} AND user_id = #{param.memberUserId}
+ WHERE del_flag = 0 AND shop_id = #{param.shopId} AND user_id = #{param.memberUserId}
ORDER BY tmt.task_date DESC
</select>
</mapper>
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 2e81103..467da7c 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
<!-- pagehelper 包含该依赖存在版本冲突，因此不建议和 mp 一起混用 -->
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/MyBatisPlusConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/MyBatisPlusConfig.java
index aba8c64..2d53a84 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/MyBatisPlusConfig.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/MyBatisPlusConfig.java
@@ -1,8 +1,7 @@
package com.ruoyi.system.config;
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -21,10 +20,9 @@
* MyBatisPlus拦截器（用于分页）
*/
@Bean
- public MybatisPlusInterceptor paginationInterceptor() {
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- //添加MySQL的分页拦截器
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
+ @ConditionalOnMissingBean
+ public PaginationInterceptor paginationInterceptor() {
+ PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+ return paginationInterceptor;
}
}
\ No newline at end of file
--
Gitblit v1.7.1