Compare commits

..

No commits in common. "feature1" and "master" have entirely different histories.

12 changed files with 23 additions and 133 deletions

View File

@ -7,7 +7,7 @@ crmeb:
wechat-js-api-beta: true #微信js api是否是beta版本 wechat-js-api-beta: true #微信js api是否是beta版本
asyncConfig: false #是否同步config表数据到redis asyncConfig: false #是否同步config表数据到redis
asyncWeChatProgramTempList: false #是否同步小程序公共模板库 asyncWeChatProgramTempList: false #是否同步小程序公共模板库
imagePath: /workspace/pro/Crmeb/crmeb/crmebimage/ # 服务器图片路径配置 斜杠结尾 imagePath: /当前项目更根目录的素材文件(绝对路径)/crmebimage/ # 服务器图片路径配置 斜杠结尾
database: mysql database: mysql
# 配置端口 # 配置端口
@ -39,13 +39,13 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: zack username: crmeb
password: zack0430 password: 111111
redis: redis:
host: 127.0.0.1 #地址 host: 127.0.0.1 #地址
port: 6379 #端口 port: 6379 #端口
password: hat123 password: 111111
timeout: 30000 # 连接超时时间(毫秒) timeout: 30000 # 连接超时时间(毫秒)
database: 15 #默认数据库 database: 15 #默认数据库
jedis: jedis:

View File

@ -1,19 +1,17 @@
package com.zbkj.common.model.product; package com.zbkj.common.model.product;
import com.baomidou.mybatisplus.annotation.IdType; import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 商品表 * 商品表
* +---------------------------------------------------------------------- * +----------------------------------------------------------------------
@ -168,25 +166,4 @@ public class StoreProduct implements Serializable {
@ApiModelProperty(value = "商品详情") @ApiModelProperty(value = "商品详情")
@TableField(exist = false) @TableField(exist = false)
private String content; private String content;
//新增字段
@ApiModelProperty(value = "开始售卖时间")
private Date beginTime;
@ApiModelProperty(value = "结束售卖时间")
private Date endTime;
@ApiModelProperty(value = "搜索状态:0=售卖中1=上新预告2=团购结束")
private String searchStatus;
@ApiModelProperty(value = "水果规格")
private String size;
@ApiModelProperty(value = "水果尺寸")
private String dimensions;
@ApiModelProperty(value = "是否推荐 0=推荐1=未推荐")
private String isSuggest;
} }

View File

@ -3,6 +3,7 @@ package com.zbkj.common.token;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.zbkj.common.constants.Constants; import com.zbkj.common.constants.Constants;
import com.zbkj.common.exception.CrmebException;
import com.zbkj.common.model.user.User; import com.zbkj.common.model.user.User;
import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.utils.RedisUtil;
import com.zbkj.common.utils.RequestUtil; import com.zbkj.common.utils.RequestUtil;
@ -174,7 +175,6 @@ public class FrontTokenComponent {
"api/front/index/get/version", "api/front/index/get/version",
"api/front/image/domain", "api/front/image/domain",
"api/front/product/leaderboard" "api/front/product/leaderboard"
}; };
return ArrayUtils.contains(routerList, uri); return ArrayUtils.contains(routerList, uri);

View File

@ -1,18 +0,0 @@
package com.zbkj.common.vo;
import lombok.Data;
/**
* @Description: 为你推荐分页查询
* @Author Administrator
* @Date 2025/4/28 11:35
*/
@Data
public class ProductSuggestPage {
//当前页
private Long page;
//页容
private Long limit;
//搜索词商品名
private String storeName;
}

View File

@ -68,7 +68,6 @@ public class WebConfig implements WebMvcConfigurer {
excludePathPatterns("/api/front/article/**"). excludePathPatterns("/api/front/article/**").
excludePathPatterns("/api/front/city/**"). excludePathPatterns("/api/front/city/**").
excludePathPatterns("/api/front/product/hot"). excludePathPatterns("/api/front/product/hot").
excludePathPatterns("/api/front/pagelist/suggest").
excludePathPatterns("/api/front/product/good"). excludePathPatterns("/api/front/product/good").
excludePathPatterns("/api/front/products/**"). excludePathPatterns("/api/front/products/**").
excludePathPatterns("/api/front/reply/**"). excludePathPatterns("/api/front/reply/**").

View File

@ -1,7 +1,6 @@
package com.zbkj.front.controller; package com.zbkj.front.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zbkj.common.model.product.StoreProduct; import com.zbkj.common.model.product.StoreProduct;
import com.zbkj.common.page.CommonPage; import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.PageParamRequest;
@ -9,7 +8,6 @@ import com.zbkj.common.request.ProductListRequest;
import com.zbkj.common.request.ProductRequest; import com.zbkj.common.request.ProductRequest;
import com.zbkj.common.response.*; import com.zbkj.common.response.*;
import com.zbkj.common.vo.CategoryTreeVo; import com.zbkj.common.vo.CategoryTreeVo;
import com.zbkj.common.vo.ProductSuggestPage;
import com.zbkj.front.service.ProductService; import com.zbkj.front.service.ProductService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
@ -42,18 +40,6 @@ public class ProductController {
@Autowired @Autowired
private ProductService productService; private ProductService productService;
/**
* 为你推荐
* 参数暂定分页对象
*/
@ApiOperation(value = "为你推荐")
@RequestMapping(value = "/pagelist/suggest", method = RequestMethod.GET)
public CommonResult<Object> getProductSuggestionList(ProductSuggestPage param) {
IPage<StoreProduct> list = productService.getProductSuggestionList(param);
return CommonResult.success(list,"查询成功!");
}
/** /**
* 热门商品推荐 * 热门商品推荐
*/ */

View File

@ -1,16 +1,13 @@
package com.zbkj.front.service; package com.zbkj.front.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.zbkj.common.model.product.StoreProduct; import com.zbkj.common.model.product.StoreProduct;
import com.zbkj.common.page.CommonPage; import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.ProductListRequest; import com.zbkj.common.request.ProductListRequest;
import com.zbkj.common.request.ProductRequest; import com.zbkj.common.request.ProductRequest;
import com.github.pagehelper.PageInfo;
import com.zbkj.common.response.*; import com.zbkj.common.response.*;
import com.zbkj.common.vo.CategoryTreeVo; import com.zbkj.common.vo.CategoryTreeVo;
import com.zbkj.common.vo.ProductSuggestPage;
import java.util.List; import java.util.List;
@ -26,14 +23,7 @@ import java.util.List;
* | Author: CRMEB Team <admin@crmeb.com> * | Author: CRMEB Team <admin@crmeb.com>
* +---------------------------------------------------------------------- * +----------------------------------------------------------------------
*/ */
public interface ProductService extends IService<StoreProduct> { public interface ProductService {
/**
* 为你推荐
* @return List
*/
//为你推荐
IPage<StoreProduct> getProductSuggestionList(ProductSuggestPage param);
/** /**
* 商品分类 * 商品分类
@ -113,6 +103,4 @@ public interface ProductService extends IService<StoreProduct> {
* @return List * @return List
*/ */
List<StoreProduct> getLeaderboard(); List<StoreProduct> getLeaderboard();
} }

View File

@ -9,6 +9,7 @@ import com.zbkj.common.request.LoginMobileRequest;
import com.zbkj.common.request.LoginRequest; import com.zbkj.common.request.LoginRequest;
import com.zbkj.common.response.LoginResponse; import com.zbkj.common.response.LoginResponse;
import com.zbkj.common.token.FrontTokenComponent; import com.zbkj.common.token.FrontTokenComponent;
import com.zbkj.common.utils.CrmebUtil;
import com.zbkj.common.utils.DateUtil; import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.utils.RedisUtil;
import com.zbkj.front.service.LoginService; import com.zbkj.front.service.LoginService;
@ -67,8 +68,7 @@ public class LoginServiceImpl implements LoginService {
} }
// 校验密码 // 校验密码
//String password = CrmebUtil.encryptPassword(loginRequest.getPassword(), loginRequest.getPhone()); String password = CrmebUtil.encryptPassword(loginRequest.getPassword(), loginRequest.getPhone());
String password = loginRequest.getPassword();
if (!user.getPwd().equals(password)) { if (!user.getPwd().equals(password)) {
throw new CrmebException("密码错误"); throw new CrmebException("密码错误");
} }

View File

@ -3,12 +3,11 @@ package com.zbkj.front.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.zbkj.common.constants.CategoryConstants; import com.zbkj.common.constants.CategoryConstants;
import com.zbkj.common.constants.Constants; import com.zbkj.common.constants.Constants;
import com.zbkj.common.constants.RedisConstatns;
import com.zbkj.common.constants.SysConfigConstants; import com.zbkj.common.constants.SysConfigConstants;
import com.zbkj.common.model.product.StoreProduct; import com.zbkj.common.model.product.StoreProduct;
import com.zbkj.common.model.product.StoreProductAttr; import com.zbkj.common.model.product.StoreProductAttr;
@ -25,9 +24,7 @@ import com.zbkj.common.utils.CrmebUtil;
import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.utils.RedisUtil;
import com.zbkj.common.vo.CategoryTreeVo; import com.zbkj.common.vo.CategoryTreeVo;
import com.zbkj.common.vo.MyRecord; import com.zbkj.common.vo.MyRecord;
import com.zbkj.common.vo.ProductSuggestPage;
import com.zbkj.front.service.ProductService; import com.zbkj.front.service.ProductService;
import com.zbkj.service.dao.StoreProductDao;
import com.zbkj.service.delete.ProductUtils; import com.zbkj.service.delete.ProductUtils;
import com.zbkj.service.service.*; import com.zbkj.service.service.*;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -53,7 +50,7 @@ import java.util.List;
* +---------------------------------------------------------------------- * +----------------------------------------------------------------------
*/ */
@Service @Service
public class ProductServiceImpl extends ServiceImpl<StoreProductDao,StoreProduct> implements ProductService { public class ProductServiceImpl implements ProductService {
@Autowired @Autowired
private StoreProductService storeProductService; private StoreProductService storeProductService;
@ -94,22 +91,6 @@ public class ProductServiceImpl extends ServiceImpl<StoreProductDao,StoreProduct
@Autowired @Autowired
private UserVisitRecordService userVisitRecordService; private UserVisitRecordService userVisitRecordService;
/**
* 为你推荐
* @return List
*/
@Override
public IPage<StoreProduct> getProductSuggestionList(ProductSuggestPage param) {
//分页查询
IPage<StoreProduct> page = new Page<>(param.getPage(), param.getLimit());
//构造查询条件
/*QueryWrapper<StoreProduct> query = new QueryWrapper<>();
if(StringUtils.isNotEmpty(param.getStoreName())){
query.lambda().like(StoreProduct::getStoreName,param.getStoreName());
}*/
return this.baseMapper.getProductSuggestionList(page,param);
}
/** /**
* 获取分类 * 获取分类
* @return List<CategoryTreeVo> * @return List<CategoryTreeVo>
@ -557,8 +538,5 @@ public class ProductServiceImpl extends ServiceImpl<StoreProductDao,StoreProduct
return storeProductService.getLeaderboard(); return storeProductService.getLeaderboard();
} }
} }

View File

@ -4,7 +4,7 @@ crmeb:
# 配置端口 # 配置端口
server: server:
port: 8084 port: 8081
servlet: servlet:
context-path: / # 访问path context-path: / # 访问path
tomcat: tomcat:
@ -34,12 +34,12 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: zack username: crmeb
password: zack0430 password: 111111
redis: redis:
host: 127.0.0.1 #地址 host: 127.0.0.1 #地址
port: 6379 #端口 port: 6379 #端口
password: hat123 password: 111111
timeout: 30000 # 连接超时时间(毫秒) timeout: 30000 # 连接超时时间(毫秒)
database: 3 #默认数据库 database: 3 #默认数据库
jedis: jedis:

View File

@ -1,10 +1,7 @@
package com.zbkj.service.dao; package com.zbkj.service.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zbkj.common.model.product.StoreProduct; import com.zbkj.common.model.product.StoreProduct;
import com.zbkj.common.vo.ProductSuggestPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/** /**
* 商品表 Mapper 接口 * 商品表 Mapper 接口
@ -18,13 +15,6 @@ import org.apache.ibatis.annotations.Param;
* | Author: CRMEB Team <admin@crmeb.com> * | Author: CRMEB Team <admin@crmeb.com>
* +---------------------------------------------------------------------- * +----------------------------------------------------------------------
*/ */
public interface StoreProductDao extends BaseMapper<StoreProduct> { public interface StoreProductDao extends BaseMapper<StoreProduct> {
/*
* 为你推荐
* @return List
*/
//为你推荐
IPage<StoreProduct> getProductSuggestionList(IPage<StoreProduct> page, @Param("param") ProductSuggestPage param);
} }

View File

@ -2,14 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zbkj.service.dao.StoreProductDao"> <mapper namespace="com.zbkj.service.dao.StoreProductDao">
<select id="getProductSuggestionList" resultType="com.zbkj.common.model.product.StoreProduct">
SELECT p.*
FROM crmeb.eb_store_product as p
<where>
<if test="param.storeName != null and param.storeName != ''">
p.store_name LIKE CONCAT('%',#{param.storeName},'%')
</if>
</where>
</select>
</mapper> </mapper>