diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java index 7fc1cbe..cb6a817 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java @@ -26,6 +26,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jarvis.domain.JDOrder; import com.ruoyi.jarvis.domain.dto.JDOrderSimpleDTO; +import com.ruoyi.jarvis.domain.dto.QuickRecordModelOption; import com.ruoyi.jarvis.service.IJDOrderProfitService; import com.ruoyi.jarvis.service.IJDOrderService; import com.ruoyi.jarvis.service.IInstructionService; @@ -157,6 +158,15 @@ public class JDOrderListController extends BaseController return dataTable; } + /** + * 快捷录单页:型号下拉数据;每型号取 jd_order 主键最大的一条的付款与后返(通常即最近落库单) + */ + @GetMapping("/quickRecord/modelOptions") + public AjaxResult quickRecordModelOptions() { + List options = jdOrderService.selectQuickRecordModelOptions(); + return AjaxResult.success(options); + } + /** * 导入跟团返现类 Excel:按「单号/订单号」匹配系统订单,将「是否返现」「总共返现」等写入后返备注(可多次导入累加);文件落盘并记上传记录。 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/QuickRecordModelOption.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/QuickRecordModelOption.java new file mode 100644 index 0000000..09823d4 --- /dev/null +++ b/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; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java index 90d3ab0..8c7dff8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java +++ b/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 selectJDOrderListByDistributionMarkFOrPDD(); + + /** + * 每个型号取其主键最大的一条订单的付款 / 后返(用于快捷录单下拉回填) + */ + List selectQuickRecordModelOptions(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java index 030edc1..d8c93c1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java +++ b/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 selectJDOrderListByDistributionMarkFOrPDD(); + + /** 快捷录单:型号及最近一次单的付款 / 后返 */ + List selectQuickRecordModelOptions(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java index 1f9756b..2b9fadc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java +++ b/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 selectJDOrderListByDistributionMarkFOrPDD() { return jdOrderMapper.selectJDOrderListByDistributionMarkFOrPDD(); } + + @Override + public List selectQuickRecordModelOptions() { + return jdOrderMapper.selectQuickRecordModelOptions(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml index ded282a..6d49545 100644 --- a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml @@ -290,6 +290,26 @@ ORDER BY create_time DESC + + + + + + + +