Commit bc54e2fb35ee9817974c8983ecf5dcca2ecec604
1 parent
b92ed601
mall + order：订单详情
Showing
4 changed files
with
5 additions
and
16 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
| @@ -56,9 +56,8 @@ public class TradeOrderController { | @@ -56,9 +56,8 @@ public class TradeOrderController { | ||
| 56 | return success(PageResult.empty()); | 56 | return success(PageResult.empty()); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | - //查询用户信息 mod by 矿泉水 20230614 begin | ||
| 60 | - Map<Long, MemberUserRespDTO> userRespVOMap = memberUserApi.getUserMap(convertSet(pageResult.getList(),TradeOrderDO::getUserId));; | ||
| 61 | - // end | 59 | + // 查询用户信息 |
| 60 | + Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(convertSet(pageResult.getList(), TradeOrderDO::getUserId));; | ||
| 62 | // 查询订单项 | 61 | // 查询订单项 |
| 63 | List<TradeOrderItemDO> orderItems = tradeOrderService.getOrderItemListByOrderId( | 62 | List<TradeOrderItemDO> orderItems = tradeOrderService.getOrderItemListByOrderId( |
| 64 | convertSet(pageResult.getList(), TradeOrderDO::getId)); | 63 | convertSet(pageResult.getList(), TradeOrderDO::getId)); |
| @@ -66,7 +65,7 @@ public class TradeOrderController { | @@ -66,7 +65,7 @@ public class TradeOrderController { | ||
| 66 | List<ProductPropertyValueDetailRespDTO> propertyValueDetails = productPropertyValueApi | 65 | List<ProductPropertyValueDetailRespDTO> propertyValueDetails = productPropertyValueApi |
| 67 | .getPropertyValueDetailList(TradeOrderConvert.INSTANCE.convertPropertyValueIds(orderItems)); | 66 | .getPropertyValueDetailList(TradeOrderConvert.INSTANCE.convertPropertyValueIds(orderItems)); |
| 68 | // 最终组合 | 67 | // 最终组合 |
| 69 | - return success(TradeOrderConvert.INSTANCE.convertPage(pageResult, orderItems, propertyValueDetails, userRespVOMap)); | 68 | + return success(TradeOrderConvert.INSTANCE.convertPage(pageResult, orderItems, propertyValueDetails, userMap)); |
| 70 | } | 69 | } |
| 71 | 70 | ||
| 72 | @GetMapping("/get-detail") | 71 | @GetMapping("/get-detail") |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderPageItemRespVO.java
| @@ -19,6 +19,7 @@ public class TradeOrderPageItemRespVO extends TradeOrderBaseVO { | @@ -19,6 +19,7 @@ public class TradeOrderPageItemRespVO extends TradeOrderBaseVO { | ||
| 19 | */ | 19 | */ |
| 20 | private List<Item> items; | 20 | private List<Item> items; |
| 21 | 21 | ||
| 22 | + // TODO @xiaobai：使用 MemberUserRespVO 返回哈；DTO 不直接给前端 | ||
| 22 | /** | 23 | /** |
| 23 | * 用户信息 | 24 | * 用户信息 |
| 24 | */ | 25 | */ |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
| @@ -119,15 +119,6 @@ public interface TradeOrderConvert { | @@ -119,15 +119,6 @@ public interface TradeOrderConvert { | ||
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | // TODO 芋艿：可简化 | 121 | // TODO 芋艿：可简化 |
| 122 | - | ||
| 123 | - /** | ||
| 124 | - * | ||
| 125 | - * @param pageResult | ||
| 126 | - * @param orderItems | ||
| 127 | - * @param propertyValueDetails | ||
| 128 | - * @param memberUserRespDTOMap 新增参数会员DTO | ||
| 129 | - * @return | ||
| 130 | - */ | ||
| 131 | default PageResult<TradeOrderPageItemRespVO> convertPage(PageResult<TradeOrderDO> pageResult, List<TradeOrderItemDO> orderItems, | 122 | default PageResult<TradeOrderPageItemRespVO> convertPage(PageResult<TradeOrderDO> pageResult, List<TradeOrderItemDO> orderItems, |
| 132 | List<ProductPropertyValueDetailRespDTO> propertyValueDetails, | 123 | List<ProductPropertyValueDetailRespDTO> propertyValueDetails, |
| 133 | Map<Long,MemberUserRespDTO> memberUserRespDTOMap) { | 124 | Map<Long,MemberUserRespDTO> memberUserRespDTOMap) { |
| @@ -158,10 +149,8 @@ public interface TradeOrderConvert { | @@ -158,10 +149,8 @@ public interface TradeOrderConvert { | ||
| 158 | } | 149 | } |
| 159 | // 处理收货地址 | 150 | // 处理收货地址 |
| 160 | orderVO.setReceiverAreaName(AreaUtils.format(order.getReceiverAreaId())); | 151 | orderVO.setReceiverAreaName(AreaUtils.format(order.getReceiverAreaId())); |
| 161 | - | ||
| 162 | // 增加用户昵称 | 152 | // 增加用户昵称 |
| 163 | orderVO.setUser(memberUserRespDTOMap.get(orderVO.getUserId())); | 153 | orderVO.setUser(memberUserRespDTOMap.get(orderVO.getUserId())); |
| 164 | - | ||
| 165 | return orderVO; | 154 | return orderVO; |
| 166 | }); | 155 | }); |
| 167 | return new PageResult<>(orderVOs, pageResult.getTotal()); | 156 | return new PageResult<>(orderVOs, pageResult.getTotal()); |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
| @@ -33,7 +33,7 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> { | @@ -33,7 +33,7 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> { | ||
| 33 | .eqIfPresent(TradeOrderDO::getType, reqVO.getType()) | 33 | .eqIfPresent(TradeOrderDO::getType, reqVO.getType()) |
| 34 | .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus()) | 34 | .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus()) |
| 35 | .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode()) | 35 | .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode()) |
| 36 | - .eqIfPresent(TradeOrderDO::getTerminal,reqVO.getTerminal()) //add by 矿泉水 20230615 | 36 | + .eqIfPresent(TradeOrderDO::getTerminal,reqVO.getTerminal()) |
| 37 | .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())); | 37 | .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())); |
| 38 | } | 38 | } |
| 39 | 39 |