ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserDetailDto.java
New file @@ -0,0 +1,19 @@ package com.ruoyi.account.api.dto; import com.ruoyi.account.api.model.TAppUser; import com.ruoyi.account.api.model.TAppUserCar; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data public class UserDetailDto extends TAppUser { @ApiModelProperty("累计充电数") private Long orderCount; @ApiModelProperty("单位名称") private String unitName; @ApiModelProperty("车辆列表") List<TAppUserCar> carList; } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java
@@ -1,5 +1,6 @@ package com.ruoyi.order.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.api.feignClient.ChargingOrderClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,7 +21,12 @@ public ChargingOrderClient create(Throwable throwable) { log.error("充电订单调用失败:{}", throwable.getMessage()); return new ChargingOrderClient() { @Override public R<Long> useOrderCount(Long userId) { return R.fail("订单计数:" + throwable.getMessage()); } }; } } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -1,5 +1,6 @@ package com.ruoyi.order.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.api.feignClient.ChargingOrderClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,6 +23,10 @@ log.error("商品订单调用失败:{}", cause.getMessage()); return new ChargingOrderClient() { @Override public R<Long> useOrderCount(Long userId) { return null; } }; } } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -1,8 +1,11 @@ package com.ruoyi.order.api.feignClient; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; /** * 充电订单服务 @@ -10,6 +13,8 @@ */ @FeignClient(contextId = "ChargingOrderClient", value = ServiceNameConstants.CONTRACT_SERVICE, fallbackFactory = ChargingOrderFallbackFactory.class) public interface ChargingOrderClient { @PostMapping(value = "/t-charging-order/useOrderCount") R<Long> useOrderCount(@RequestParam Long userId); } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -32,6 +32,8 @@ @PostMapping(value = "/t-company/unit/delete") R unitDelete(@RequestParam Integer id); @PostMapping(value = "/t-company/unit/detail") R<TCompany> unitDetail(@RequestParam Integer id); //标签分页 @PostMapping(value = "/t-user-tag/page") ruoyi-service/ruoyi-account/pom.xml
@@ -118,6 +118,12 @@ <version>2.6</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-api-order</artifactId> <version>3.6.2</version> <scope>compile</scope> </dependency> </dependencies>
@@ -4,15 +4,21 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.api.dto.UnitListQueryDto; import com.ruoyi.account.api.dto.UserDetailDto; import com.ruoyi.account.api.dto.UserListQueryDto; import com.ruoyi.account.api.model.TAppUser; import com.ruoyi.account.api.model.TAppUserCar; import com.ruoyi.account.api.model.TAppUserTag; import com.ruoyi.account.api.model.TAppUserVipDetail; import com.ruoyi.account.service.TAppUserCarService; import com.ruoyi.account.service.TAppUserService; import com.ruoyi.account.service.TAppUserTagService; import com.ruoyi.account.service.TAppUserVipDetailService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.bean.BeanUtils; import com.ruoyi.common.core.web.domain.BasePojo; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.order.api.feignClient.ChargingOrderClient; import com.ruoyi.other.api.domain.TCompany; import com.ruoyi.other.api.domain.TUserTag; import com.ruoyi.other.api.feignClient.OtherClient; @@ -51,6 +57,12 @@ @Resource private TAppUserVipDetailService tAppUserVipDetailService; @Resource private ChargingOrderClient chargingOrderClient; @Resource private TAppUserCarService appUserCarService; @ApiOperation(value = "单位管理列表", tags = {"用户管理-单位管理"}) @PostMapping(value = "/unit/page") public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) { @@ -167,16 +179,30 @@ return R.ok(); } // @ApiOperation(value = "用户详情", tags = {"用户管理-用户列表"}) // @PostMapping(value = "/user/detail/{id}") // public R userDetail(@PathVariable Long id) { // TAppUser user = appUserService.getById(id); // if (user.getVipId()!=null) { // R<Map<Integer, String>> vipMap = otherClient.getVipMap(Arrays.asList(user.getVipId())); // user.setVipName(vipMap.getData().get(user.getVipId())); // } // //获取累计充电数量 // // } @ApiOperation(value = "用户详情", tags = {"用户管理-用户列表"}) @PostMapping(value = "/user/detail/{id}") public R<UserDetailDto> userDetail(@PathVariable Long id) { TAppUser user = appUserService.getById(id); UserDetailDto userDetailDto = new UserDetailDto(); BeanUtils.copyProperties(user,userDetailDto); if (user.getVipId()!=null) { R<Map<Integer, String>> vipMap = otherClient.getVipMap(Arrays.asList(user.getVipId())); user.setVipName(vipMap.getData().get(user.getVipId())); } //获取累计充电数量 R<Long> useOrderCount = chargingOrderClient.useOrderCount(user.getId()); userDetailDto.setOrderCount(useOrderCount.getData()); R<TCompany> tCompanyR = otherClient.unitDetail(user.getCompanyId()); if (tCompanyR.getData()!=null){ userDetailDto.setUnitName(tCompanyR.getData().getName()); } List<TAppUserCar> carList = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, id).orderByDesc(BasePojo::getCreateTime).list(); userDetailDto.setCarList(carList); List<Integer> tagIds = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, id).orderByDesc(TAppUserTag::getCreateTime).list().stream().map(TAppUserTag::getUserTagId).collect(Collectors.toList()); R<Map<Integer, String>> tagMap = otherClient.getTagMap(tagIds); userDetailDto.setTagName(tagMap.getData().values().toString()); return R.ok(userDetailDto); } }
File was renamed from ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppCouponMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.api.mapper.TAppCouponMapper"> <mapper namespace="com.ruoyi.account.mapper.TAppCouponMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppCoupon"> ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppUserAddressMapper.xml
File was renamed from ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserAddressMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.api.mapper.TAppUserAddressMapper"> <mapper namespace="com.ruoyi.account.mapper.TAppUserAddressMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUserAddress"> ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppUserCarMapper.xml
File was renamed from ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserCarMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.api.mapper.TAppUserCarMapper"> <mapper namespace="com.ruoyi.account.mapper.TAppUserCarMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUserCar"> ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppUserIntegralChangeMapper.xml
File was renamed from ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserIntegralChangeMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.api.mapper.TAppUserIntegralChangeMapper"> <mapper namespace="com.ruoyi.account.mapper.TAppUserIntegralChangeMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUserIntegralChange"> ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppUserMapper.xml
File was renamed from ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.api.mapper.TAppUserMapper"> <mapper namespace="com.ruoyi.account.mapper.TAppUserMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUser"> ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppUserSignMapper.xml
File was renamed from ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserSignMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.api.mapper.TAppUserSignMapper"> <mapper namespace="com.ruoyi.account.mapper.TAppUserSignMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUserSign"> ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppUserTagMapper.xml
File was renamed from ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserTagMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.api.mapper.TAppUserTagMapper"> <mapper namespace="com.ruoyi.account.mapper.TAppUserTagMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUserTag"> ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TInviteUserMapper.xml
File was renamed from ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TInviteUserMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.api.mapper.TInviteUserMapper"> <mapper namespace="com.ruoyi.account.mapper.TInviteUserMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TInviteUser"> ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TInvoiceInformationMapper.xml
File was renamed from ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TInvoiceInformationMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.api.mapper.TInvoiceInformationMapper"> <mapper namespace="com.ruoyi.account.mapper.TInvoiceInformationMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TInvoiceInformation"> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1,9 +1,16 @@ package com.ruoyi.order.controller; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.service.TChargingOrderService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * <p> @@ -18,5 +25,15 @@ @RequestMapping("/t-charging-order") public class TChargingOrderController { @Resource private TChargingOrderService chargingOrderService; @PostMapping(value = "/useOrderCount") public R<Long> useOrderCount(@RequestParam Long userId) { Long count = chargingOrderService.lambdaQuery().eq(TChargingOrder::getAppUserId, userId).count(); return R.ok(count); } }
@@ -53,5 +53,11 @@ return R.ok(); } @PostMapping(value = "/unit/delete") public R<TCompany> delete(@RequestParam Integer id) { return R.ok( companyService.getById(id)); } }
