1

ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java

@@ -2,6 +2,7 @@ package com.ruoyi.jarvis.domain;
 
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
+import org.springframework.data.annotation.Transient;
 
 import java.util.Date;
 
@@ -49,6 +50,12 @@ public class JDOrder extends BaseEntity {
 
     /** 备注（状态） */
     private String status;
+
+    @Transient
+    private Double proPriceAmount;
+    @Transient
+    private Date finishTime;
+
 }
 
 

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

@@ -71,4 +71,12 @@ public interface OrderRowsMapper
      * @return 结果
      */
     public int deleteOrderRowsByIds(String[] ids);
+
+    /**
+     * 根据订单ID查询京粉订单
+     *
+     * @param orderId 订单ID
+     * @return 京粉订单
+     */
+    public OrderRows selectOrderRowsByOrderId(String orderId);
 }

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

@@ -70,4 +70,6 @@ public interface IOrderRowsService
      * @return 结果
      */
     public int deleteOrderRowsById(String id);
+
+    public OrderRows selectOrderRowsByOrderId(String orderId);
 }

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

@@ -107,4 +107,9 @@ public class OrderRowsServiceImpl implements IOrderRowsService
     {
         return orderRowsMapper.deleteOrderRowsById(id);
     }
+
+    @Override
+    public OrderRows selectOrderRowsByOrderId(String orderId) {
+        return orderRowsMapper.selectOrderRowsByOrderId(orderId);
+    }
 }

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

@@ -376,4 +376,9 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectOrderRowsByOrderId" parameterType="String" resultMap="OrderRowsResult">
+        <include refid="selectOrderRowsVo"/>
+        where order_id = #{orderId}
+    </select>
 </mapper>