1

ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/PromoterOrderInfoVO.java

@@ -0,0 +1,134 @@
+package com.ruoyi.jarvis.domain.dto;
+
+/**
+ * 跟团查询页订单信息
+ */
+public class PromoterOrderInfoVO {
+
+    private String shopName;
+    private String shopLogo;
+    private String orderSource;
+    private String traceTypeStr;
+    private String parentId;
+    private String orderId;
+    private String validCodeMsg;
+    private String skuImageUrl;
+    private String skuName;
+    private String itemId;
+    private Integer skuNum;
+    private String cosPrice;
+    private String orderTime;
+    private String finishTime;
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getShopLogo() {
+        return shopLogo;
+    }
+
+    public void setShopLogo(String shopLogo) {
+        this.shopLogo = shopLogo;
+    }
+
+    public String getOrderSource() {
+        return orderSource;
+    }
+
+    public void setOrderSource(String orderSource) {
+        this.orderSource = orderSource;
+    }
+
+    public String getTraceTypeStr() {
+        return traceTypeStr;
+    }
+
+    public void setTraceTypeStr(String traceTypeStr) {
+        this.traceTypeStr = traceTypeStr;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getValidCodeMsg() {
+        return validCodeMsg;
+    }
+
+    public void setValidCodeMsg(String validCodeMsg) {
+        this.validCodeMsg = validCodeMsg;
+    }
+
+    public String getSkuImageUrl() {
+        return skuImageUrl;
+    }
+
+    public void setSkuImageUrl(String skuImageUrl) {
+        this.skuImageUrl = skuImageUrl;
+    }
+
+    public String getSkuName() {
+        return skuName;
+    }
+
+    public void setSkuName(String skuName) {
+        this.skuName = skuName;
+    }
+
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+
+    public Integer getSkuNum() {
+        return skuNum;
+    }
+
+    public void setSkuNum(Integer skuNum) {
+        this.skuNum = skuNum;
+    }
+
+    public String getCosPrice() {
+        return cosPrice;
+    }
+
+    public void setCosPrice(String cosPrice) {
+        this.cosPrice = cosPrice;
+    }
+
+    public String getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(String orderTime) {
+        this.orderTime = orderTime;
+    }
+
+    public String getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(String finishTime) {
+        this.finishTime = finishTime;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.java

@@ -87,4 +87,9 @@ public interface OrderRowsMapper
      * @return 订单列表
      */
     public List<OrderRows> selectOrderRowsByGiftCouponKey(@Param("giftCouponKey") String giftCouponKey);
+
+    /**
+     * 根据订单号查询（匹配子单号或父单号）
+     */
+    public List<OrderRows> selectOrderRowsByOrderNo(@Param("orderNo") String orderNo);
 }

ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IOrderRowsService.java

@@ -72,4 +72,9 @@ public interface IOrderRowsService
     public int deleteOrderRowsById(String id);
 
     public OrderRows selectOrderRowsByOrderId(String orderId);
+
+    /**
+     * 根据订单号查询（匹配子单号或父单号）
+     */
+    public List<OrderRows> selectOrderRowsByOrderNo(String orderNo);
 }

ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderRowsServiceImpl.java

@@ -112,4 +112,9 @@ public class OrderRowsServiceImpl implements IOrderRowsService
     public OrderRows selectOrderRowsByOrderId(String orderId) {
         return orderRowsMapper.selectOrderRowsByOrderId(orderId);
     }
+
+    @Override
+    public List<OrderRows> selectOrderRowsByOrderNo(String orderNo) {
+        return orderRowsMapper.selectOrderRowsByOrderNo(orderNo);
+    }
 }

ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml

@@ -398,6 +398,12 @@
         where order_id = #{orderId}
     </select>
 
+    <select id="selectOrderRowsByOrderNo" parameterType="String" resultMap="OrderRowsResult">
+        <include refid="selectOrderRowsVo"/>
+        where order_id = #{orderNo} or parent_id = #{orderNo}
+        order by order_time desc
+    </select>
+
     <select id="selectOrderRowsByGiftCouponKey" parameterType="String" resultMap="OrderRowsResult">
         <include refid="selectOrderRowsVo"/>
         where gift_coupon_key = #{giftCouponKey}