Cui Zhi Feng
2024-09-01 bd3c29a8710d46dc1c2465e64521044d0f1cd356
订单详情 兑换商品列表
已修改4个文件
已添加1个文件
47 ■■■■■ 文件已修改
src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/response/payment/OrderPointGoodsListDTO.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/service/payment/OrderService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/payment/OrderMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
@@ -9,6 +9,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@Data
public class OrderDTO extends AbstractTransDTO {
@@ -135,4 +136,7 @@
    @ApiModelProperty(value = "支付单号")
    private String paymentTrId;
    @ApiModelProperty(value = "积分商品列表")
    private List<OrderPointGoodsListDTO> pointGoodsList;
}
src/main/java/com/mzl/flower/dto/response/payment/OrderPointGoodsListDTO.java
对比新文件
@@ -0,0 +1,26 @@
package com.mzl.flower.dto.response.payment;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class OrderPointGoodsListDTO {
    @ApiModelProperty(value = "积分商品ID")
    private Long goodsId;
    @ApiModelProperty(value = "商品名称")
    private String name;
    @ApiModelProperty(value = "商品描述")
    private String description;
    @ApiModelProperty(value = "商品封面图")
    private String cover;
    @ApiModelProperty(value = "商品图片")
    private String pictures;
    @ApiModelProperty(value = "兑换数量")
    private Integer num;
}
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
@@ -3,10 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.dto.request.payment.OrderQueryDTO;
import com.mzl.flower.dto.response.payment.OrderCheckListDTO;
import com.mzl.flower.dto.response.payment.OrderListDTO;
import com.mzl.flower.dto.response.payment.OrderStatusCountDTO;
import com.mzl.flower.dto.response.payment.SupplierNumDTO;
import com.mzl.flower.dto.response.payment.*;
import com.mzl.flower.entity.payment.Order;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -37,4 +34,6 @@
            , @Param("endTime")LocalDateTime endTime);
    Order getUserLastOrder(@Param("userId") String userId);
    List<OrderPointGoodsListDTO> getPointGoodsList(@Param("orderId") String orderId);
}
src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -863,6 +863,9 @@
        boolean couldCheckRefund = StringUtils.isEmpty(transferId) && count == 0 && cc == 0;
        dto.setCouldCheckRefund(couldCheckRefund);
        List<OrderPointGoodsListDTO> pointGoodsList = orderMapper.getPointGoodsList(id);
        dto.setPointGoodsList(pointGoodsList);
        return dto;
    }
src/main/resources/mapper/payment/OrderMapper.xml
@@ -249,4 +249,11 @@
        order by o.receive_time desc
        limit 1
    </select>
    <select id="getPointGoodsList" resultType="com.mzl.flower.dto.response.payment.OrderPointGoodsListDTO">
        select gr.*
        from t_point_goods_record gr
        join t_order_point_goods opg on opg.goods_record_id = gr.id
        where opg.order_id = #{orderId}
    </select>
</mapper>