Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
0468fd2c
Commit
0468fd2c
authored
Sep 12, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
检查提单状态是否已制作提单
parent
d67164f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
OrderController.java
.../module/order/controller/admin/order/OrderController.java
+1
-1
MakeBillOfLadingController.java
...shipment/controller/admin/MakeBillOfLadingController.java
+14
-0
No files found.
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/order/OrderController.java
View file @
0468fd2c
...
@@ -81,6 +81,7 @@ import java.util.concurrent.TimeUnit;
...
@@ -81,6 +81,7 @@ import java.util.concurrent.TimeUnit;
import
java.util.function.Function
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
exception
.
enums
.
GlobalErrorCodeConstants
.
UNAUTHORIZED
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
exception
.
util
.
ServiceExceptionUtil
.
exception
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
exception
.
util
.
ServiceExceptionUtil
.
exception
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
pojo
.
CommonResult
.
error
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
pojo
.
CommonResult
.
error
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
pojo
.
CommonResult
.
success
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
pojo
.
CommonResult
.
success
;
...
@@ -105,7 +106,6 @@ public class OrderController {
...
@@ -105,7 +106,6 @@ public class OrderController {
private
RoleApi
roleApi
;
private
RoleApi
roleApi
;
@Autowired
@Autowired
private
OrderItemService
orderItemService
;
private
OrderItemService
orderItemService
;
@Autowired
@Autowired
private
ProductService
productService
;
private
ProductService
productService
;
@Autowired
@Autowired
...
...
yudao-module-shipment/yudao-module-shipment-rest/src/main/java/cn/iocoder/yudao/module/shipment/controller/admin/MakeBillOfLadingController.java
View file @
0468fd2c
...
@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiImplicitParam;
...
@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiImplicitParam;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -44,6 +45,7 @@ import java.text.MessageFormat;
...
@@ -44,6 +45,7 @@ import java.text.MessageFormat;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
pojo
.
CommonResult
.
error
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
pojo
.
CommonResult
.
error
;
...
@@ -135,6 +137,18 @@ public class MakeBillOfLadingController {
...
@@ -135,6 +137,18 @@ public class MakeBillOfLadingController {
return
success
(
true
);
return
success
(
true
);
}
}
@PostMapping
(
"/check/billOfLading/{orderId}"
)
@ApiOperation
(
"检查提单状态是否已制作提单"
)
@ApiImplicitParam
(
name
=
"orderId"
,
value
=
"该值为orderId"
,
required
=
true
,
example
=
"1024"
,
dataType
=
"Long"
)
public
CommonResult
<
Boolean
>
checkBillOfLadingStatus
(
@PathVariable
Long
orderId
)
{
MakeBillOfLadingDO
billOfLadingDO
=
makeBillOfLadingService
.
getOne
(
new
LambdaQueryWrapperX
<
MakeBillOfLadingDO
>()
.
eq
(
MakeBillOfLadingDO:
:
getOrderId
,
orderId
)
.
orderByDesc
(
MakeBillOfLadingDO:
:
getId
)
.
last
(
"limit 1"
));
return
success
(
Objects
.
nonNull
(
billOfLadingDO
)
&&
StringUtils
.
isNotBlank
(
billOfLadingDO
.
getImgUrl
()));
}
@GetMapping
(
"/get"
)
@GetMapping
(
"/get"
)
@ApiOperation
(
"获得制作提货单"
)
@ApiOperation
(
"获得制作提货单"
)
@ApiImplicitParam
(
name
=
"id"
,
value
=
"编号"
,
required
=
true
,
example
=
"1024"
,
dataTypeClass
=
Long
.
class
)
@ApiImplicitParam
(
name
=
"id"
,
value
=
"编号"
,
required
=
true
,
example
=
"1024"
,
dataTypeClass
=
Long
.
class
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment