caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IM功能

Browse Source
This commit is contained in:
chc 2023-01-03 09:30:43 +08:00
parent 73aa36fc69
commit a38bc6b534
10 changed files with 95 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
framework/src/main/java/cn/lili/modules/im/entity/dto/ImQueryParams.java Normal file
View File

@ -0,0 +1,36 @@
package cn.lili.modules.im.entity.dto;
import cn.hutool.core.text.CharSequenceUtil;
import cn.lili.common.vo.PageVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author chc
* @since 2022/6/2114:46
*/
@Data
@ApiModel
public class ImQueryParams extends PageVO {
@ApiModelProperty("用户Id")
private String memberId;
@ApiModelProperty("店铺Id")
private String storeId;
public <T> QueryWrapper<T> queryWrapper() {
QueryWrapper<T> queryWrapper = new QueryWrapper<>();
if (CharSequenceUtil.isNotEmpty(memberId)) {
queryWrapper.eq("member_id", memberId);
}
if (CharSequenceUtil.isNotEmpty(storeId)) {
queryWrapper.eq("store_id", storeId);
}
queryWrapper.eq("delete_flag",false);
queryWrapper.orderByDesc("create_time");
return queryWrapper;
}
}

1
framework/src/main/java/cn/lili/modules/im/entity/enums/MessageTypeEnum.java
View File

@ -18,5 +18,6 @@ public enum MessageTypeEnum {
PICTURE,
VOICE,
GOODS,
ORDER,
VIDEO
}

2
framework/src/main/java/cn/lili/modules/member/entity/dto/FootPrintQueryParams.java
View File

@ -30,7 +30,7 @@ public class FootPrintQueryParams extends PageVO {
queryWrapper.eq("store_id", storeId);
}
queryWrapper.eq("delete_flag",false);
queryWrapper.orderByDesc("update_time");
queryWrapper.orderByDesc("create_time");
return queryWrapper;
}
}

16
framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java
View File

@ -44,19 +44,17 @@ public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint
queryWrapper.eq(FootPrint::getGoodsId, footPrint.getGoodsId());
//如果已存在某商品记录，则更新其修改时间
//如果不存在则添加记录
//为了保证足迹的排序,将原本足迹删除后重新添加
List<FootPrint> oldPrints = list(queryWrapper);
if (oldPrints != null && !oldPrints.isEmpty()) {
FootPrint oldPrint = oldPrints.get(0);
oldPrint.setSkuId(footPrint.getSkuId());
this.updateById(oldPrint);
return oldPrint;
} else {
footPrint.setCreateTime(new Date());
this.save(footPrint);
//删除超过100条后的记录
this.baseMapper.deleteLastFootPrint(footPrint.getMemberId());
return footPrint;
this.removeById(oldPrint.getId());
}
footPrint.setCreateTime(new Date());
this.save(footPrint);
//删除超过100条后的记录
this.baseMapper.deleteLastFootPrint(footPrint.getMemberId());
return footPrint;
}
@Override

17
im-api/src/main/java/cn/lili/controller/goods/GoodsImController.java
View File

@ -3,28 +3,19 @@ package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
import cn.lili.modules.goods.entity.vos.GoodsVO;
import cn.lili.modules.goods.service.GoodsService;
import cn.lili.modules.goods.service.GoodsSkuService;
import cn.lili.modules.search.entity.dos.EsGoodsIndex;
import cn.lili.modules.search.entity.dos.EsGoodsRelatedInfo;
import cn.lili.modules.search.entity.dto.EsGoodsSearchDTO;
import cn.lili.modules.search.service.EsGoodsSearchService;
import cn.lili.modules.search.service.HotWordsService;
import cn.lili.modules.statistics.aop.PageViewPoint;
import cn.lili.modules.statistics.aop.enums.PageViewEnum;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.elasticsearch.core.SearchPage;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@ -35,13 +26,13 @@ import java.util.List;
import java.util.Map;
/**
* 买家端,商品接口
* IM端,商品接口
*
* @author Chopper
* @since 2020/11/16 10:06 下午
* @author chc
* @since 2022-12-28 18:30:33
*/
@Slf4j
@Api(tags = "买家端,商品接口")
@Api(tags = "IM端,商品接口")
@RestController
@RequestMapping("/im/goods/goods")
public class GoodsImController {

42
im-api/src/main/java/cn/lili/controller/orders/ImOrderComtroller.java Normal file
View File

@ -0,0 +1,42 @@
package cn.lili.controller.orders;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.im.entity.dto.ImQueryParams;
import cn.lili.modules.member.entity.dto.FootPrintQueryParams;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.search.entity.dos.EsGoodsIndex;
import cn.lili.mybatis.util.PageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* IM端,订单接口
*
* @author chc
* @since 2022/6/2114:46
*/
@Slf4j
@Api(tags = "IM端,订单接口")
@RestController
@RequestMapping("/im/orders/orders")
public class ImOrderComtroller {
@Autowired
private OrderService orderService;
@GetMapping("")
@ApiOperation(value = "获取会员订单列表")
public ResultMessage<IPage<OrderSimpleVO>> getMemberHistory(OrderSearchParams params) {
return ResultUtil.data(orderService.queryByParams(params));
}
}

2
im-api/src/main/java/cn/lili/controller/im/SeatLogin.java → im-api/src/main/java/cn/lili/controller/seat/SeatLogin.java
View File

@ -1,4 +1,4 @@
package cn.lili.controller.im;
package cn.lili.controller.seat;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;

2
im-api/src/main/java/cn/lili/controller/im/SeatSettingStoreController.java → im-api/src/main/java/cn/lili/controller/seat/SeatSettingStoreController.java
View File

@ -1,4 +1,4 @@
package cn.lili.controller.im;
package cn.lili.controller.seat;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;

2
im-api/src/main/java/cn/lili/controller/im/SeatStoreController.java → im-api/src/main/java/cn/lili/controller/seat/SeatStoreController.java
View File

@ -1,4 +1,4 @@
package cn.lili.controller.im;
package cn.lili.controller.seat;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;

2
im-api/src/main/java/cn/lili/controller/im/SeatStoreManagerController.java → im-api/src/main/java/cn/lili/controller/seat/SeatStoreManagerController.java
View File

@ -1,4 +1,4 @@
package cn.lili.controller.im;
package cn.lili.controller.seat;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;