diff --git a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java index 951e56ec..480b8823 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java @@ -65,4 +65,10 @@ public class FootprintController { return ResultUtil.data(footprintService.getFootprintNum()); } + + @GetMapping("/history") + @ApiOperation(value = "获取会员的历史足迹") + public ResultMessage> getMemberHistory(FootPrintQueryParams params) { + return ResultUtil.data(footprintService.footPrintPage(params)); + } } diff --git a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java index 08251f15..1dfcb000 100644 --- a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java @@ -128,5 +128,4 @@ public class OrderBuyerController { return ResultUtil.data(orderService.invoice(orderSn)); } - } diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java index 5a9e86b5..8615bf34 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java @@ -3,6 +3,8 @@ package cn.lili.controller.passport; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; +import cn.lili.common.security.AuthUser; +import cn.lili.common.security.context.UserContext; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.Member; @@ -264,4 +266,18 @@ public class MemberBuyerController { return ResultUtil.data(this.memberService.refreshToken(refreshToken)); } + @GetMapping("/getImUser") + @ApiOperation(value = "获取用户信息") + public ResultMessage getImUser() { + AuthUser authUser = UserContext.getCurrentUser(); + return ResultUtil.data(memberService.getById(authUser.getId())); + } + + @GetMapping("/getImUserDetail/{memberId}") + @ApiImplicitParam(name = "memberId", value = "店铺Id", required = true, dataType = "String", paramType = "path") + @ApiOperation(value = "获取用户信息") + public ResultMessage getImUserDetail(@PathVariable String memberId) { + return ResultUtil.data(memberService.getById(memberId)); + } + } diff --git a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java index 6e6a7ca7..35bdfbd2 100644 --- a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java @@ -1,11 +1,13 @@ package cn.lili.controller.store; import cn.lili.common.enums.ResultUtil; +import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.vos.StoreGoodsLabelVO; import cn.lili.modules.goods.service.StoreGoodsLabelService; +import cn.lili.modules.store.entity.dos.Store; import cn.lili.modules.store.entity.dto.StoreBankDTO; import cn.lili.modules.store.entity.dto.StoreCompanyDTO; import cn.lili.modules.store.entity.dto.StoreOtherInfoDTO; @@ -57,6 +59,20 @@ public class StoreBuyerController { return ResultUtil.data(storeService.findByConditionPage(entity, page)); } + @GetMapping("/store") + @ApiOperation(value = "im-获取店铺信息") + public ResultMessage getStoreUser() { + AuthUser authUser = UserContext.getCurrentUser(); + return ResultUtil.data(storeService.getById(authUser.getStoreId())); + } + + @GetMapping("/store/{storeId}") + @ApiImplicitParam(name = "storeId", value = "店铺Id", required = true, dataType = "String", paramType = "path") + @ApiOperation(value = "im-店铺ID获取店铺信息") + public ResultMessage getStoreUserDetail(@PathVariable String storeId) { + return ResultUtil.data(storeService.getById(storeId)); + } + @ApiOperation(value = "通过id获取店铺信息") @ApiImplicitParam(name = "id", value = "店铺ID", required = true, paramType = "path") @GetMapping(value = "/get/detail/{id}") diff --git a/im-api/src/main/java/cn/lili/controller/goods/GoodsImController.java b/im-api/src/main/java/cn/lili/controller/goods/GoodsImController.java deleted file mode 100644 index 4e5aa3c7..00000000 --- a/im-api/src/main/java/cn/lili/controller/goods/GoodsImController.java +++ /dev/null @@ -1,83 +0,0 @@ -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.ResultMessage; -import cn.lili.modules.goods.service.GoodsService; -import cn.lili.modules.goods.service.GoodsSkuService; -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 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.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.constraints.NotNull; -import java.util.List; -import java.util.Map; - -/** - * IM端,商品接口 - * - * @author chc - * @since 2022-12-28 18:30:33 - */ -@Slf4j -@Api(tags = "IM端,商品接口") -@RestController -@RequestMapping("/im/goods/goods") -public class GoodsImController { - - /** - * 商品 - */ - @Autowired - private GoodsService goodsService; - /** - * 商品SKU - */ - @Autowired - private GoodsSkuService goodsSkuService; - /** - * ES商品搜索 - */ - @Autowired - private EsGoodsSearchService goodsSearchService; - - @Autowired - private HotWordsService hotWordsService; - - @ApiOperation(value = "通过id获取商品信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, paramType = "path"), - @ApiImplicitParam(name = "skuId", value = "skuId", required = true, paramType = "path") - }) - @GetMapping(value = "/sku/{goodsId}/{skuId}") - @PageViewPoint(type = PageViewEnum.SKU, id = "#id") - public ResultMessage> getSku(@NotNull(message = "商品ID不能为空") @PathVariable("goodsId") String goodsId, - @NotNull(message = "SKU ID不能为空") @PathVariable("skuId") String skuId) { - try { - // 读取选中的列表 - Map map = goodsSkuService.getGoodsSkuDetail(goodsId, skuId); - return ResultUtil.data(map); - } catch (ServiceException se) { - log.info(se.getMsg(), se); - throw se; - } catch (Exception e) { - log.error(ResultCode.GOODS_ERROR.message(), e); - return ResultUtil.error(ResultCode.GOODS_ERROR); - } - - } - - -} diff --git a/im-api/src/main/java/cn/lili/controller/im/ImManagerController.java b/im-api/src/main/java/cn/lili/controller/im/ImManagerController.java deleted file mode 100644 index 794032ba..00000000 --- a/im-api/src/main/java/cn/lili/controller/im/ImManagerController.java +++ /dev/null @@ -1,175 +0,0 @@ -package cn.lili.controller.im; - -import cn.lili.common.enums.ResultCode; -import cn.lili.common.enums.ResultUtil; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.security.AuthUser; -import cn.lili.common.security.context.UserContext; -import cn.lili.common.security.enums.UserEnums; -import cn.lili.common.security.token.Token; -import cn.lili.common.utils.StringUtils; -import cn.lili.common.vo.PageVO; -import cn.lili.common.vo.ResultMessage; -import cn.lili.common.vo.SearchVO; -import cn.lili.modules.permission.entity.dos.AdminUser; -import cn.lili.modules.permission.entity.dto.AdminUserDTO; -import cn.lili.modules.permission.entity.vo.AdminUserVO; -import cn.lili.modules.permission.service.AdminUserService; -import cn.lili.modules.permission.service.DepartmentService; -import cn.lili.mybatis.util.PageUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import java.util.List; - -@Slf4j -@RestController -@Api(tags = "管理员") -@RequestMapping("/im/manager/im/passport/user") -@Validated -public class ImManagerController { - @Autowired - private AdminUserService adminUserService; - @Autowired - private DepartmentService departmentService; - - @PostMapping(value = "/login") - @ApiOperation(value = "登录管理员") - public ResultMessage login(@NotNull(message = "用户名不能为空") String username, - @NotNull(message = "密码不能为空") String password) { - return ResultUtil.data(adminUserService.login(username, password)); - } - - @ApiOperation(value = "注销接口") - @PostMapping("/logout") - public ResultMessage logout() { - this.adminUserService.logout(UserEnums.MANAGER); - return ResultUtil.success(); - } - - @ApiOperation(value = "刷新token") - @GetMapping("/refresh/{refreshToken}") - public ResultMessage refreshToken(@NotNull(message = "刷新token不能为空") @PathVariable String refreshToken) { - return ResultUtil.data(this.adminUserService.refreshToken(refreshToken)); - } - - - @GetMapping(value = "/info") - @ApiOperation(value = "获取当前登录用户接口") - public ResultMessage getUserInfo() { - AuthUser tokenUser = UserContext.getCurrentUser(); - if (tokenUser != null) { - AdminUserVO adminUser = new AdminUserVO(adminUserService.findByUsername(tokenUser.getUsername())); - if (StringUtils.isNotEmpty(adminUser.getDepartmentId())) { - adminUser.setDepartmentTitle(departmentService.getById(adminUser.getDepartmentId()).getTitle()); - } - adminUser.setPassword(null); - return ResultUtil.data(adminUser); - } - throw new ServiceException(ResultCode.USER_NOT_LOGIN); - } - - @PutMapping(value = "/edit") - @ApiOperation(value = "修改用户自己资料", notes = "用户名密码不会修改") - public ResultMessage editOwner(AdminUser adminUser) { - - AuthUser tokenUser = UserContext.getCurrentUser(); - if (tokenUser != null) { - //查询当前管理员 - AdminUser oldAdminUser = adminUserService.findByUsername(tokenUser.getUsername()); - oldAdminUser.setAvatar(adminUser.getAvatar()); - oldAdminUser.setNickName(adminUser.getNickName()); - if (!adminUserService.updateById(oldAdminUser)) { - throw new ServiceException(ResultCode.USER_EDIT_ERROR); - } - return ResultUtil.success(ResultCode.USER_EDIT_SUCCESS); - } - throw new ServiceException(ResultCode.USER_NOT_LOGIN); - } - - @PutMapping(value = "/admin/edit") - @ApiOperation(value = "超级管理员修改其他管理员资料") - public ResultMessage edit(@Valid AdminUser adminUser, - @RequestParam(required = false) List roles) { - if (!adminUserService.updateAdminUser(adminUser, roles)) { - throw new ServiceException(ResultCode.USER_EDIT_ERROR); - } - return ResultUtil.success(ResultCode.USER_EDIT_SUCCESS); - } - - /** - * 修改密码 - * - * @param password - * @param newPassword - * @return - */ - @PutMapping(value = "/editPassword") - @ApiOperation(value = "修改密码") - public ResultMessage editPassword(String password, String newPassword) { - adminUserService.editPassword(password, newPassword); - return ResultUtil.success(ResultCode.USER_EDIT_SUCCESS); - } - - @PostMapping(value = "/resetPassword/{ids}") - @ApiOperation(value = "重置密码") - public ResultMessage resetPassword(@PathVariable List ids) { - adminUserService.resetPassword(ids); - return ResultUtil.success(ResultCode.USER_EDIT_SUCCESS); - } - - @GetMapping - @ApiOperation(value = "多条件分页获取用户列表") - public ResultMessage> getByCondition(AdminUserDTO user, - SearchVO searchVo, - PageVO pageVo) { - IPage page = adminUserService.adminUserPage(PageUtil.initPage(pageVo), PageUtil.initWrapper(user, searchVo)); - - return ResultUtil.data(page); - } - - - @PostMapping - @ApiOperation(value = "添加用户") - public ResultMessage register(@Valid AdminUserDTO adminUser, - @RequestParam(required = false) List roles) { - int rolesMaxSize = 10; - try { - if (roles != null && roles.size() >= rolesMaxSize) { - throw new ServiceException(ResultCode.PERMISSION_BEYOND_TEN); - } - adminUserService.saveAdminUser(adminUser, roles); - } catch (Exception e) { - log.error("添加用户错误", e); - } - return ResultUtil.success(); - } - - @PutMapping(value = "/enable/{userId}") - @ApiOperation(value = "禁/启 用 用户") - public ResultMessage disable(@ApiParam("用户唯一id标识") @PathVariable String userId, Boolean status) { - AdminUser user = adminUserService.getById(userId); - if (user == null) { - throw new ServiceException(ResultCode.USER_NOT_EXIST); - } - user.setStatus(status); - adminUserService.updateById(user); - return ResultUtil.success(); - } - - @DeleteMapping(value = "/{ids}") - @ApiOperation(value = "批量通过ids删除") - public ResultMessage delAllByIds(@PathVariable List ids) { - adminUserService.deleteCompletely(ids); - return ResultUtil.success(); - } - -} diff --git a/im-api/src/main/java/cn/lili/controller/im/ImUserController.java b/im-api/src/main/java/cn/lili/controller/im/ImUserController.java deleted file mode 100644 index ff00bc0f..00000000 --- a/im-api/src/main/java/cn/lili/controller/im/ImUserController.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.lili.controller.im; - - -import cn.lili.common.enums.ResultUtil; -import cn.lili.common.security.AuthUser; -import cn.lili.common.security.context.UserContext; -import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.member.entity.dos.Member; -import cn.lili.modules.member.entity.dto.FootPrintQueryParams; -import cn.lili.modules.member.service.FootprintService; -import cn.lili.modules.member.service.MemberService; -import cn.lili.modules.search.entity.dos.EsGoodsIndex; -import cn.lili.modules.store.entity.dos.Store; -import cn.lili.modules.store.service.StoreService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - - -/** - * @author Chopper - */ -@RestController -@Api(tags = "Im消息接口") -@RequestMapping("/im/user") -@Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) -public class ImUserController { - - private final MemberService memberService; - - private final StoreService storeService; - - private final FootprintService footprintService; - - @GetMapping - @ApiOperation(value = "获取用户信息") - public ResultMessage getImUser() { - AuthUser authUser = UserContext.getCurrentUser(); - return ResultUtil.data(memberService.getById(authUser.getId())); - } - - @GetMapping("/store") - @ApiOperation(value = "获取店铺信息") - public ResultMessage getStoreUser() { - AuthUser authUser = UserContext.getCurrentUser(); - return ResultUtil.data(storeService.getById(authUser.getStoreId())); - } - - @GetMapping("/{memberId}") - @ApiImplicitParam(name = "memberId", value = "店铺Id", required = true, dataType = "String", paramType = "path") - @ApiOperation(value = "获取用户信息") - public ResultMessage getImUserDetail(@PathVariable String memberId) { - return ResultUtil.data(memberService.getById(memberId)); - } - - @GetMapping("/store/{storeId}") - @ApiImplicitParam(name = "storeId", value = "店铺Id", required = true, dataType = "String", paramType = "path") - @ApiOperation(value = "获取店铺信息") - public ResultMessage getStoreUserDetail(@PathVariable String storeId) { - return ResultUtil.data(storeService.getById(storeId)); - } - - @GetMapping("/history") - @ApiOperation(value = "获取会员的历史足迹") - public ResultMessage> getMemberHistory(FootPrintQueryParams params) { - return ResultUtil.data(footprintService.footPrintPage(params)); - } - -} diff --git a/im-api/src/main/java/cn/lili/controller/orders/ImOrderComtroller.java b/im-api/src/main/java/cn/lili/controller/orders/ImOrderComtroller.java deleted file mode 100644 index 4b057f6c..00000000 --- a/im-api/src/main/java/cn/lili/controller/orders/ImOrderComtroller.java +++ /dev/null @@ -1,42 +0,0 @@ -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> getMemberHistory(OrderSearchParams params) { - return ResultUtil.data(orderService.queryByParams(params)); - } -} diff --git a/im-api/src/main/java/cn/lili/controller/im/QAStoreController.java b/im-api/src/main/java/cn/lili/controller/store/im/QAStoreController.java similarity index 98% rename from im-api/src/main/java/cn/lili/controller/im/QAStoreController.java rename to im-api/src/main/java/cn/lili/controller/store/im/QAStoreController.java index b7be12dc..d2dc9bd2 100644 --- a/im-api/src/main/java/cn/lili/controller/im/QAStoreController.java +++ b/im-api/src/main/java/cn/lili/controller/store/im/QAStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.im; +package cn.lili.controller.store.im; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; diff --git a/im-api/src/main/java/cn/lili/controller/seat/SeatLogin.java b/im-api/src/main/java/cn/lili/controller/store/seat/SeatLogin.java similarity index 97% rename from im-api/src/main/java/cn/lili/controller/seat/SeatLogin.java rename to im-api/src/main/java/cn/lili/controller/store/seat/SeatLogin.java index d6d59877..1c7dcab6 100644 --- a/im-api/src/main/java/cn/lili/controller/seat/SeatLogin.java +++ b/im-api/src/main/java/cn/lili/controller/store/seat/SeatLogin.java @@ -1,4 +1,4 @@ -package cn.lili.controller.seat; +package cn.lili.controller.store.seat; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/im-api/src/main/java/cn/lili/controller/seat/SeatSettingStoreController.java b/im-api/src/main/java/cn/lili/controller/store/seat/SeatSettingStoreController.java similarity index 97% rename from im-api/src/main/java/cn/lili/controller/seat/SeatSettingStoreController.java rename to im-api/src/main/java/cn/lili/controller/store/seat/SeatSettingStoreController.java index b5d6d69a..68d4ec51 100644 --- a/im-api/src/main/java/cn/lili/controller/seat/SeatSettingStoreController.java +++ b/im-api/src/main/java/cn/lili/controller/store/seat/SeatSettingStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.seat; +package cn.lili.controller.store.seat; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; diff --git a/im-api/src/main/java/cn/lili/controller/seat/SeatStoreController.java b/im-api/src/main/java/cn/lili/controller/store/seat/SeatStoreController.java similarity index 96% rename from im-api/src/main/java/cn/lili/controller/seat/SeatStoreController.java rename to im-api/src/main/java/cn/lili/controller/store/seat/SeatStoreController.java index e6b4552d..07c2ed8e 100644 --- a/im-api/src/main/java/cn/lili/controller/seat/SeatStoreController.java +++ b/im-api/src/main/java/cn/lili/controller/store/seat/SeatStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.seat; +package cn.lili.controller.store.seat; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; diff --git a/im-api/src/main/java/cn/lili/controller/seat/SeatStoreManagerController.java b/im-api/src/main/java/cn/lili/controller/store/seat/SeatStoreManagerController.java similarity index 96% rename from im-api/src/main/java/cn/lili/controller/seat/SeatStoreManagerController.java rename to im-api/src/main/java/cn/lili/controller/store/seat/SeatStoreManagerController.java index 40f46b08..ee33241e 100644 --- a/im-api/src/main/java/cn/lili/controller/seat/SeatStoreManagerController.java +++ b/im-api/src/main/java/cn/lili/controller/store/seat/SeatStoreManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.seat; +package cn.lili.controller.store.seat; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage;