xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
@@ -94,7 +94,7 @@ } @PostMapping("/logan/inner/xpOperationsUser/pageListByIds") public R<List<XpOperationsUserWithRoleVO>> pageListByIds(@RequestBody OptionalUsersPageListQuery q) { public R<PageInfo<XpOperationsUserWithRoleVO>> pageListByIds(@RequestBody OptionalUsersPageListQuery q) { return R.ok(xpOperationsUserService.pageListByIds(q)); }
@@ -51,5 +51,5 @@ */ List<ExportOperationsUserVo> exportOperationsUser(@Param("query")XpOperationsUserQuery query); List<XpOperationsUserWithRoleVO> pageListByIds(OptionalUsersPageListQuery q); List<XpOperationsUserWithRoleVO> pageListByIds(PageInfo<XpOperationsUserWithRoleVO> pageInfo, OptionalUsersPageListQuery q); } xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/IXpOperationsUserService.java
@@ -137,5 +137,5 @@ */ List<XpOperationsUser> getByPhoneNumber(String phoneNumber); List<XpOperationsUserWithRoleVO> pageListByIds(OptionalUsersPageListQuery q); PageInfo<XpOperationsUserWithRoleVO> pageListByIds(OptionalUsersPageListQuery q); } xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
@@ -549,7 +549,11 @@ } @Override public List<XpOperationsUserWithRoleVO> pageListByIds(OptionalUsersPageListQuery q) { return baseMapper.pageListByIds(q); public PageInfo<XpOperationsUserWithRoleVO> pageListByIds(OptionalUsersPageListQuery q) { PageInfo<XpOperationsUserWithRoleVO> pageInfo = new PageInfo<>(q.getPageNum(), q.getPageSize()); List<XpOperationsUserWithRoleVO> list = baseMapper.pageListByIds(pageInfo, q); pageInfo.setRecords(list); return pageInfo; } } xp-robotaxi-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -61,4 +61,5 @@ com.xiaopeng.api.factory.maintenance.XpVehicleModelClientFallbackFactory com.xiaopeng.api.factory.operation.XpTargetedServiceClientFallbackFactory com.xiaopeng.api.factory.vehicleConvoy.VehicleMacClientFallbackFactory com.xiaopeng.api.factory.account.XpOperationsUserClientFallbackFactory com.xiaopeng.api.factory.account.XpOperationsUserClientFallbackFactory com.xiaopeng.api.factory.pushMessage.WebSocketMessageFallbackFactory xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
@@ -2,19 +2,14 @@ import com.xiaopeng.api.dto.operation.XpActivityDto; import com.xiaopeng.api.model.operation.XpActicityCoupon; import com.xiaopeng.api.model.operation.XpActicityStrategy; import com.xiaopeng.api.model.operation.XpActivity; import com.xiaopeng.api.model.operation.XpCoupon; import com.xiaopeng.api.model.operation.*; import com.xiaopeng.api.query.operation.XpActivityPageListQuery; import com.xiaopeng.api.vo.operation.XpActivityVo; import com.xiaopeng.common.core.constant.CacheConstants; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.utils.bean.BeanUtils; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.operation.service.IXpActicityCouponService; import com.xiaopeng.operation.service.IXpActicityService; import com.xiaopeng.operation.service.IXpActicityStrategyService; import com.xiaopeng.operation.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -98,10 +93,23 @@ IXpActicityCouponService couponService; @Resource IXpActicityStrategyService strategyService; @Resource IXpActicityUserService userService; @Resource IXpActivityNoticeService noticeService; @PostMapping("/v1/api/appUserCoupon/pageList") @ApiOperation(value = "活动列表",tags = {"管理后台-活动管理"},response = XpActivity.class) public R<PageInfo<XpActivity>> pageList(@RequestBody XpActivityPageListQuery query) { PageInfo<XpActivity> pageList = service.pageList(query); public R<PageInfo<XpActivityDto>> pageList(@RequestBody XpActivityPageListQuery query) { PageInfo<XpActivityDto> pageList = service.pageList(query); for (XpActivityDto dto : pageList.getRecords()) { List<XpActicityStrategy> strategies = strategyService.lambdaQuery().eq(XpActicityStrategy::getActitcityId, dto.getId()).list(); dto.setStrategy(strategies); dto.setActivityUser(userService.lambdaQuery().eq(XpActicityUser::getActitcityId, dto.getId()).list()); dto.setNotice(noticeService.lambdaQuery().eq(XpActivityNotice::getActivityId, dto.getId()).one()); } return R.ok(pageList); }
@@ -1,8 +1,10 @@ package com.xiaopeng.operation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xiaopeng.api.dto.operation.XpActivityDto; import com.xiaopeng.api.model.operation.XpActivity; import com.xiaopeng.api.query.operation.XpActivityPageListQuery; import com.xiaopeng.api.vo.operation.XpActivityVo; import com.xiaopeng.common.core.web.page.PageInfo; import java.util.List; @@ -17,5 +19,5 @@ */ public interface XpActicityMapper extends BaseMapper<XpActivity> { List<XpActivity> pageList(PageInfo<XpActivity> pageInfo, XpActivityPageListQuery query); List<XpActivityDto> pageList(PageInfo<XpActivityDto> pageInfo, XpActivityPageListQuery query); } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpActicityService.java
@@ -4,6 +4,7 @@ import com.xiaopeng.api.dto.operation.XpActivityDto; import com.xiaopeng.api.model.operation.XpActivity; import com.xiaopeng.api.query.operation.XpActivityPageListQuery; import com.xiaopeng.api.vo.operation.XpActivityVo; import com.xiaopeng.common.core.web.page.PageInfo; import java.util.List; @@ -18,7 +19,7 @@ */ public interface IXpActicityService extends IService<XpActivity> { PageInfo<XpActivity> pageList(XpActivityPageListQuery query); PageInfo<XpActivityDto> pageList(XpActivityPageListQuery query); List<String> findListToIds(String acticityName);
@@ -7,6 +7,7 @@ import com.xiaopeng.api.model.operation.XpActivity; import com.xiaopeng.api.model.operation.XpActivityNotice; import com.xiaopeng.api.query.operation.XpActivityPageListQuery; import com.xiaopeng.api.vo.operation.XpActivityVo; import com.xiaopeng.common.core.utils.bean.BeanUtils; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.operation.mapper.XpActicityMapper; @@ -47,9 +48,9 @@ private IXpActivityNoticeService activityNotice; @Override public PageInfo<XpActivity> pageList(XpActivityPageListQuery query) { PageInfo<XpActivity> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize()); List<XpActivity> list = this.baseMapper.pageList(pageInfo,query); public PageInfo<XpActivityDto> pageList(XpActivityPageListQuery query) { PageInfo<XpActivityDto> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize()); List<XpActivityDto> list = this.baseMapper.pageList(pageInfo,query); pageInfo.setRecords(list); return pageInfo; } xp-robotaxi-operation-boot/src/main/resources/mapper/operation/XpActicityMapper.xml
@@ -3,7 +3,7 @@ <mapper namespace="com.xiaopeng.operation.mapper.XpActicityMapper"> <select id="pageList" resultType="com.xiaopeng.api.model.operation.XpActivity"> <select id="pageList" resultType="com.xiaopeng.api.dto.operation.XpActivityDto"> select a.* from xp_acticity as a where a.is_deleted = 0
