1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/JDOrderController.java

@@ -8,12 +8,15 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.jarvis.domain.JDOrder;
+import com.ruoyi.jarvis.domain.OrderRows;
 import com.ruoyi.jarvis.service.IJDOrderService;
+import com.ruoyi.jarvis.service.IOrderRowsService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,11 +29,16 @@ import java.util.Map;
 @RequestMapping("/jarvis/jdorder")
 public class JDOrderController extends BaseController {
     private final IJDOrderService jdOrderService;
+    private final IOrderRowsService orderRowsService;
 
-    public JDOrderController(IJDOrderService jdOrderService) {
+    public JDOrderController(IJDOrderService jdOrderService, IOrderRowsService orderRowsService) {
         this.jdOrderService = jdOrderService;
+        this.orderRowsService = orderRowsService;
     }
 
+    private final static String skey = "2192057370ef8140c201079969c956a3";
+    private final static String requestUrl = "http://192.168.8.88:6666/jd/";
+
     /**
      * 列表查询（分页）
      */
@@ -38,11 +46,20 @@ public class JDOrderController extends BaseController {
     public TableDataInfo list(JDOrder query) {
         startPage();
         java.util.List<JDOrder> list = jdOrderService.selectJDOrderList(query);
-        return getDataTable(list);
+        TableDataInfo dataTable = getDataTable(list);
+        List<JDOrder> rows = (List<JDOrder>) dataTable.getRows();
+        for (JDOrder jdOrder : rows) {
+            OrderRows orderRows = orderRowsService.selectOrderRowsByOrderId(jdOrder.getOrderId());
+            if (orderRows != null) {
+                jdOrder.setProPriceAmount(orderRows.getProPriceAmount());
+                jdOrder.setFinishTime(orderRows.getFinishTime());
+            } else {
+                jdOrder.setProPriceAmount(0.0);
+            }
         }
-    private final static String skey = "2192057370ef8140c201079969c956a3";
-    private final static String requestUrl = "http://192.168.8.88:6666/jd/";
 
+        return dataTable;
+    }
 
 
     @PostMapping("/generatePromotionContent")

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>