From 52fc68c944c8b5d1978114ea0f62f447b83f94d3 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 22 Aug 2023 22:21:15 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java | 3 +++
src/main/java/cc/mrbird/febs/mall/controller/ApiMemberFootprintController.java | 2 +-
src/main/java/cc/mrbird/febs/mall/mapper/MallMemberFootprintMapper.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/IMallMemberFootprintService.java | 2 +-
src/main/resources/mapper/modules/MallMemberFootprintMapper.xml | 2 +-
src/main/resources/application-dev.yml | 6 +++---
src/main/resources/application-test.yml | 6 +++---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberFootprintServiceImpl.java | 4 ++--
8 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMemberFootprintController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMemberFootprintController.java
index 19b57e2..3f68174 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMemberFootprintController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMemberFootprintController.java
@@ -40,7 +40,7 @@
@ApiOperation(value = "浏览记录列表")
@PostMapping(value = "/findMemberFootprintList")
public FebsResponse findMemberFootprintList(@RequestBody MemberFootprintListDto memberFootprintListDto) {
- return new FebsResponse().success().data(mallMemberFootprintService.findMemberCollectionList(memberFootprintListDto));
+ return new FebsResponse().success().data(mallMemberFootprintService.findMemberFootprintList(memberFootprintListDto));
}
@ApiOperation(value = "删除浏览记录")
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberFootprintMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberFootprintMapper.java
index 7a73e26..6d8a5f9 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberFootprintMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberFootprintMapper.java
@@ -8,5 +8,5 @@
public interface MallMemberFootprintMapper extends BaseMapper<MallMemberFootprint> {
- IPage<MallMemberFootprint> selectMemberCollectionListInPage(@Param("record") MallMemberFootprint mallMemberFootprint, Page<MallMemberFootprint> page);
+ IPage<MallMemberFootprint> selectMemberFootprintListInPage(@Param("record") MallMemberFootprint mallMemberFootprint, Page<MallMemberFootprint> page);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IMallMemberFootprintService.java b/src/main/java/cc/mrbird/febs/mall/service/IMallMemberFootprintService.java
index dba66b5..b745143 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IMallMemberFootprintService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IMallMemberFootprintService.java
@@ -14,7 +14,7 @@
void add(Long goodsId, Long memberId);
- List<FootprintListVo> findMemberCollectionList(MemberFootprintListDto memberFootprintListDto);
+ List<FootprintListVo> findMemberFootprintList(MemberFootprintListDto memberFootprintListDto);
void del(String ids);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberFootprintServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberFootprintServiceImpl.java
index 7c07569..49aa6cc 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberFootprintServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberFootprintServiceImpl.java
@@ -48,13 +48,13 @@
}
@Override
- public List<FootprintListVo> findMemberCollectionList(MemberFootprintListDto memberFootprintListDto) {
+ public List<FootprintListVo> findMemberFootprintList(MemberFootprintListDto memberFootprintListDto) {
MallMember member = LoginUserUtil.getLoginUser();
MallMemberFootprint footprint = new MallMemberFootprint();
footprint.setMemberId(member.getId());
Page<MallMemberFootprint> page = new Page<>(memberFootprintListDto.getPageNow(), memberFootprintListDto.getPageSize());
- IPage<MallMemberFootprint> result = this.baseMapper.selectMemberCollectionListInPage(footprint, page);
+ IPage<MallMemberFootprint> result = this.baseMapper.selectMemberFootprintListInPage(footprint, page);
if (CollUtil.isEmpty(result.getRecords())) {
return new ArrayList<>();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
index 6abd87c..dd49968 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
@@ -99,4 +99,7 @@
@ApiModelProperty(value = "3级代理价格")
private BigDecimal levelThreePrice;
+
+ @ApiModelProperty(value = "是否收藏")
+ private Integer hasCollect;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ea07544..272cda5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,10 +15,10 @@
datasource:
# 数据源-1，名称为 base
base:
- username: ct_test
- password: 123456
+ username: db_blnka
+ password: blnka!@#123
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://120.27.238.55:3406/db_blnka?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://121.37.162.173:3306/db_blnka?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index b4133a2..d5473f2 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -24,11 +24,11 @@
# Redis数据库索引（默认为 0）
database: 10
# Redis服务器地址
- host: 127.0.0.1
+ host: 120.27.238.55
# Redis服务器连接端口
- port: 6379
+ port: 6479
# Redis 密码
- password: d32ncxe@i3#!dV
+ password: d3y6dsdl;f.327
lettuce:
pool:
# 连接池中的最小空闲连接
diff --git a/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml b/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml
index 9d83225..5f25ed7 100644
--- a/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.mall.mapper.MallMemberFootprintMapper">
- <select id="selectMemberCollectionListInPage" resultType="cc.mrbird.febs.mall.entity.MallMemberFootprint">
+ <select id="selectMemberFootprintListInPage" resultType="cc.mrbird.febs.mall.entity.MallMemberFootprint">
select
footprint.*
,goods.goods_name goodsName
--
Gitblit v1.9.1