src/main/java/com/mzl/flower/dto/response/payment/OrderItemListDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/mapper/payment/OrderItemMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/service/payment/OrderService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/payment/OrderItemMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/mzl/flower/dto/response/payment/OrderItemListDTO.java
@@ -1,6 +1,5 @@ package com.mzl.flower.dto.response.payment; import com.baomidou.mybatisplus.annotation.TableField; import com.mzl.flower.base.AbstractTransDTO; import com.mzl.flower.base.annotation.DictTrans; import io.swagger.annotations.ApiModelProperty; @@ -11,6 +10,8 @@ @Data public class OrderItemListDTO extends AbstractTransDTO { private String id; private String orderId; private Long stationId;//集货站id private String stationName; @@ -58,4 +59,13 @@ @ApiModelProperty(value = "真实成交价格/每扎") private BigDecimal realPrice; @ApiModelProperty(value = "补货数量") private Integer replaceNum; @ApiModelProperty(value = "降级数量") private Integer reduceNum; @ApiModelProperty(value = "缺货数量") private Integer lackNum; } src/main/java/com/mzl/flower/mapper/payment/OrderItemMapper.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mzl.flower.dto.response.payment.AbnormalOrderItemDTO; import com.mzl.flower.dto.response.payment.OrderItemListDTO; import com.mzl.flower.dto.response.payment.OrderItemPlatformListDTO; import com.mzl.flower.entity.payment.OrderItem; import org.apache.ibatis.annotations.Param; @@ -14,4 +15,6 @@ List<AbnormalOrderItemDTO> getAbnormalItems(@Param("orderId") String orderId); List<OrderItemPlatformListDTO> getPlatformOrderItems(@Param("orderId") String orderId); List<OrderItemListDTO> getOrderItems(@Param("orderIds") List<String> orderIds); } src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -802,10 +802,9 @@ orderIds.add(o.getId()); } List<OrderItem> itemList = orderItemMapper.selectList( new QueryWrapper<OrderItem>().in("order_id", orderIds)); List<OrderItemListDTO> itemList = orderItemMapper.getOrderItems(orderIds); Map<String, List<OrderItemListDTO>> map = new HashMap<>(); for (OrderItem oi : itemList) { for (OrderItemListDTO oi : itemList) { String orderId = oi.getOrderId(); List<OrderItemListDTO> ll = map.computeIfAbsent(orderId, k -> new ArrayList<>()); OrderItemListDTO d = new OrderItemListDTO(); src/main/resources/mapper/payment/OrderItemMapper.xml
@@ -58,4 +58,17 @@ WHERE oi.deleted = 0 and oi.order_id = #{orderId} </select> <select id="getOrderItems" resultType="com.mzl.flower.dto.response.payment.OrderItemListDTO"> SELECT oi.* , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace' and oic.audit_status = 'AGREED') replaceNum , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce' and oic.audit_status = 'AGREED') reduceNum , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack' and oic.audit_status = 'AGREED') lackNum FROM t_order_item oi WHERE oi.deleted = 0 and oi.order_id in <foreach collection="orderIds" item="orderId" open="(" separator="," close=")"> #{orderId} </foreach> </select> </mapper>