1

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

@@ -0,0 +1,18 @@
+package com.ruoyi.jarvis.domain.dto;
+
+import lombok.Data;
+
+/**
+ * 快捷录单页：型号下拉项及该型号最近一次落库单的付款 / 后返
+ */
+@Data
+public class QuickRecordModelOption {
+
+    private String modelNumber;
+
+    /** 最近一次订单的下单付款金额 */
+    private Double lastPaymentAmount;
+
+    /** 最近一次订单的后返金额 */
+    private Double lastRebateAmount;
+}

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

@@ -1,6 +1,7 @@
 package com.ruoyi.jarvis.mapper;
 
 import com.ruoyi.jarvis.domain.JDOrder;
+import com.ruoyi.jarvis.domain.dto.QuickRecordModelOption;
 import java.util.List;
 
 /**
@@ -61,6 +62,11 @@ public interface JDOrderMapper {
      * @return 订单列表
      */
     List<JDOrder> selectJDOrderListByDistributionMarkFOrPDD();
+
+    /**
+     * 每个型号取其主键最大的一条订单的付款 / 后返（用于快捷录单下拉回填）
+     */
+    List<QuickRecordModelOption> selectQuickRecordModelOptions();
 }
 
 

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

@@ -1,6 +1,7 @@
 package com.ruoyi.jarvis.service;
 
 import com.ruoyi.jarvis.domain.JDOrder;
+import com.ruoyi.jarvis.domain.dto.QuickRecordModelOption;
 import java.util.List;
 
 /**
@@ -48,6 +49,9 @@ public interface IJDOrderService {
     
     /** 查询分销标记为F或PDD且有物流链接的订单列表 */
     java.util.List<JDOrder> selectJDOrderListByDistributionMarkFOrPDD();
+
+    /** 快捷录单：型号及最近一次单的付款 / 后返 */
+    List<QuickRecordModelOption> selectQuickRecordModelOptions();
 }
 
 

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

@@ -1,6 +1,7 @@
 package com.ruoyi.jarvis.service.impl;
 
 import com.ruoyi.jarvis.domain.JDOrder;
+import com.ruoyi.jarvis.domain.dto.QuickRecordModelOption;
 import com.ruoyi.jarvis.mapper.JDOrderMapper;
 import com.ruoyi.jarvis.service.IJDOrderProfitService;
 import com.ruoyi.jarvis.service.IJDOrderService;
@@ -81,6 +82,11 @@ public class JDOrderServiceImpl implements IJDOrderService {
     public List<JDOrder> selectJDOrderListByDistributionMarkFOrPDD() {
         return jdOrderMapper.selectJDOrderListByDistributionMarkFOrPDD();
     }
+
+    @Override
+    public List<QuickRecordModelOption> selectQuickRecordModelOptions() {
+        return jdOrderMapper.selectQuickRecordModelOptions();
+    }
 }