Преглед изворни кода

详情和列表接口添加返回字段

wangzhijun пре 6 дана
родитељ
комит
77925c8188

+ 3 - 0
nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/OrderItemVo.java

@@ -31,4 +31,7 @@ public class OrderItemVo {
     @ApiModelProperty("付款类型(1:积分 2:金额 3:积分+金额)")
     private Integer paymentType;
 
+    @ApiModelProperty("原价")
+    private BigDecimal originPrice;
+
 }

+ 3 - 0
nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/ProductOrderPageItemVo.java

@@ -39,6 +39,9 @@ public class ProductOrderPageItemVo {
     @ApiModelProperty("使用积分数量")
     private Integer pointsUsed;
 
+    @ApiModelProperty("付款类型(1:积分 2:金额 3:积分+金额)")
+    private Integer paymentType;
+
     @ApiModelProperty("快递单号")
     private String logisticsNo;
 

+ 5 - 3
nightFragrance-massage/src/main/resources/mapper/massage/ProductOrderInfoMapper.xml

@@ -109,13 +109,15 @@
             ROUND( item.price / 100, 2 ) AS payAmount,
             oi.open_id,
             u.c_nick_name AS nickName,
-            u.c_phone AS phone
+            u.c_phone AS phone,
+            p.payment_type AS paymentType
         FROM
             product_order_info oi
         LEFT JOIN product_order_item item ON oi.id = item.order_id
         LEFT JOIN t_wx_user u ON oi.open_id = u.c_openid
-        WHERE oi.is_deleted = 0
-
+        LEFT JOIN product p ON p.id = item.product_id
+        WHERE
+            oi.is_deleted = 0
         <!-- 查询条件 -->
         <if test="dto.orderNo != null and dto.orderNo != ''">
             AND oi.order_no LIKE CONCAT('%', #{dto.orderNo}, '%')

+ 3 - 2
nightFragrance-massage/src/main/resources/mapper/massage/ProductOrderItemMapper.xml

@@ -10,11 +10,12 @@
             poi.product_name,
             ps.price_money AS payAmount,
             ps.price_point AS pointsUsed,
+            ps.origin_price,
             p.payment_type AS paymentType
         FROM
             product_order_item poi
-                LEFT JOIN product p ON poi.product_id = p.id
-                LEFT JOIN product_sku ps ON poi.sku_id = ps.id
+        LEFT JOIN product p ON poi.product_id = p.id
+        LEFT JOIN product_sku ps ON poi.sku_id = ps.id
         WHERE
             poi.order_id = #{orderId}
     </select>