Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
O
oms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
oms
Commits
dcb9f242
提交
dcb9f242
authored
12月 15, 2023
作者:
刘明祎-运维用途
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加查询未确认订单总数
上级
f76058a1
流水线
#7612
已通过 于阶段
in 3 分 8 秒
变更
4
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
31 行增加
和
5 行删除
+31
-5
UavOrderController.java
...n/java/com/mmc/oms/controller/uav/UavOrderController.java
+8
-4
AuthSignatureFilter.java
src/main/java/com/mmc/oms/filter/AuthSignatureFilter.java
+1
-1
UavOrderService.java
src/main/java/com/mmc/oms/service/uav/UavOrderService.java
+9
-0
UavOrderServiceImpl.java
...ava/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java
+13
-0
没有找到文件。
src/main/java/com/mmc/oms/controller/uav/UavOrderController.java
浏览文件 @
dcb9f242
...
@@ -8,10 +8,7 @@ import com.mmc.oms.model.dto.uav.*;
...
@@ -8,10 +8,7 @@ import com.mmc.oms.model.dto.uav.*;
import
com.mmc.oms.model.qo.uav.UavOrderQO
;
import
com.mmc.oms.model.qo.uav.UavOrderQO
;
import
com.mmc.oms.model.vo.uav.*
;
import
com.mmc.oms.model.vo.uav.*
;
import
com.mmc.oms.service.uav.UavOrderService
;
import
com.mmc.oms.service.uav.UavOrderService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.*
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiResponse
;
import
io.swagger.annotations.ApiResponses
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -66,6 +63,13 @@ public class UavOrderController extends BaseController {
...
@@ -66,6 +63,13 @@ public class UavOrderController extends BaseController {
return
uavOrderService
.
list
(
uavOrderQO
,
this
.
getCurrentAccount
(
request
));
return
uavOrderService
.
list
(
uavOrderQO
,
this
.
getCurrentAccount
(
request
));
}
}
@ApiOperation
(
value
=
"获取未确认订单有多少"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@GetMapping
(
"getCountNewOrder"
)
public
ResultBody
getCountNewOrder
()
{
return
uavOrderService
.
getCountNewOrder
();
}
@ApiOperation
(
value
=
"个人订单列表"
)
@ApiOperation
(
value
=
"个人订单列表"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
UavOrderDTO
.
class
)})
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
UavOrderDTO
.
class
)})
@PostMapping
(
"listByUid"
)
@PostMapping
(
"listByUid"
)
...
...
src/main/java/com/mmc/oms/filter/AuthSignatureFilter.java
浏览文件 @
dcb9f242
...
@@ -41,7 +41,7 @@ public class AuthSignatureFilter implements AuthFilter {
...
@@ -41,7 +41,7 @@ public class AuthSignatureFilter implements AuthFilter {
*/
*/
private
static
final
String
[]
IGNORE_URLS
=
{
"/oms/swagger-resources"
,
"/oms/v2/api-docs"
,
"/oms/doc.html"
,
private
static
final
String
[]
IGNORE_URLS
=
{
"/oms/swagger-resources"
,
"/oms/v2/api-docs"
,
"/oms/doc.html"
,
"/oms/mallorder/listStatus"
,
"/oms/actuator/health/readiness"
,
"/oms/uav-order/finishSign"
,
"/oms/uav-order/statusList"
,
"/oms/mallorder/listStatus"
,
"/oms/actuator/health/readiness"
,
"/oms/uav-order/finishSign"
,
"/oms/uav-order/statusList"
,
"/oms/uav-order/listGoodsRemark"
"/oms/uav-order/listGoodsRemark"
,
"/oms/uav-order/getCountNewOrder"
};
};
/*无需加密狗无需登录白名单*/
/*无需加密狗无需登录白名单*/
...
...
src/main/java/com/mmc/oms/service/uav/UavOrderService.java
浏览文件 @
dcb9f242
...
@@ -24,6 +24,12 @@ public interface UavOrderService {
...
@@ -24,6 +24,12 @@ public interface UavOrderService {
ResultBody
list
(
UavOrderQO
uavOrderQO
,
BaseAccountDTO
currentAccount
);
ResultBody
list
(
UavOrderQO
uavOrderQO
,
BaseAccountDTO
currentAccount
);
/**
* 查询未确定的商城订单个数
* @return {@link ResultBody}
*/
ResultBody
getCountNewOrder
();
ResultBody
listByUid
(
UavOrderQO
uavOrderQO
,
BaseAccountDTO
currentAccount
);
ResultBody
listByUid
(
UavOrderQO
uavOrderQO
,
BaseAccountDTO
currentAccount
);
ResultBody
pay
(
Integer
id
,
BaseAccountDTO
currentAccount
,
HttpServletRequest
request
);
ResultBody
pay
(
Integer
id
,
BaseAccountDTO
currentAccount
,
HttpServletRequest
request
);
...
@@ -58,4 +64,7 @@ public interface UavOrderService {
...
@@ -58,4 +64,7 @@ public interface UavOrderService {
ResultBody
deductWallet
(
BigDecimal
allShareAmount
,
BigDecimal
allSalaryAmount
,
BaseAccountDTO
currentAccount
);
ResultBody
deductWallet
(
BigDecimal
allShareAmount
,
BigDecimal
allSalaryAmount
,
BaseAccountDTO
currentAccount
);
List
<
UavOrderRemarkDTO
>
listGoodsRemark
(
Integer
remarkType
,
Integer
goodsId
);
List
<
UavOrderRemarkDTO
>
listGoodsRemark
(
Integer
remarkType
,
Integer
goodsId
);
}
}
src/main/java/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java
浏览文件 @
dcb9f242
...
@@ -888,4 +888,17 @@ public class UavOrderServiceImpl implements UavOrderService {
...
@@ -888,4 +888,17 @@ public class UavOrderServiceImpl implements UavOrderService {
return
CollectionUtils
.
isNotEmpty
(
remarkDOS
)
?
remarkDOS
.
stream
()
return
CollectionUtils
.
isNotEmpty
(
remarkDOS
)
?
remarkDOS
.
stream
()
.
map
(
UavOrderRemarkDO:
:
buildUavOrderRemarkDTO
).
collect
(
Collectors
.
toList
())
:
null
;
.
map
(
UavOrderRemarkDO:
:
buildUavOrderRemarkDTO
).
collect
(
Collectors
.
toList
())
:
null
;
}
}
/**
* 查询未确定的商城订单个数
*
* @return {@link ResultBody}
*/
@Override
public
ResultBody
getCountNewOrder
()
{
UavOrderQO
uavOrderQO
=
new
UavOrderQO
();
uavOrderQO
.
setStatusCode
(
UavOrderStatus
.
CONFIRM
.
getCode
());
int
count
=
uavOrderDao
.
countList
(
uavOrderQO
);
return
ResultBody
.
success
(
count
);
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论