From fd97cde3d994a3aa6898ba862cd20d0c081012c3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 18:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java
index 46babd0..0f5afb0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java
@@ -1,6 +1,8 @@
package com.ruoyi.order.controller.forepart;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.MemberInvoice;
@@ -8,6 +10,7 @@
import com.ruoyi.order.service.ILogisticsService;
import com.ruoyi.order.service.impl.LogisticsServiceImpl;
import com.ruoyi.system.api.domain.Logistics;
+import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.dto.LogisticsDTO;
import com.ruoyi.system.api.domain.vo.Express100VO;
import io.swagger.annotations.Api;
@@ -18,6 +21,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -35,9 +39,8 @@
private ILogisticsService iLogisticsService;
@PostMapping("/getLogistics")
@ApiOperation(value = "用户端-获取快递公司")
- public R<Logistics> getLogistics() {
- iLogisticsService.list();
- return R.ok();
+ public R<List<Logistics>> getLogistics() {
+ return R.ok(iLogisticsService.list());
}
@PostMapping("/getLogisticsList")
@@ -46,4 +49,11 @@
return R.ok(iLogisticsService.getLogisticsList(logisticsDTO));
}
+ @PostMapping("/getLogisticsOne")
+ @ApiOperation(value = "用户端-获取快递公司名稱")
+ public R<Logistics> getLogisticsOne(@RequestBody LogisticsDTO logisticsDTO) {
+ LambdaQueryWrapper<Logistics> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(Logistics::getLogisticsNum,logisticsDTO.getCompany());
+ return R.ok( iLogisticsService.getOne(wrapper));
+ }
}
--
Gitblit v1.7.1