Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
有来技术
youlai-mall
提交
a652073f
Y
youlai-mall
项目概览
有来技术
/
youlai-mall
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
youlai-mall
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a652073f
编写于
3月 21, 2021
作者:
H
haoxr
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix:移除多余日志
上级
bd249300
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
41 addition
and
22 deletion
+41
-22
mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/domain/OmsOrderItem.java
...in/java/com/youlai/mall/oms/pojo/domain/OmsOrderItem.java
+4
-2
mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/OrderController.java
...a/com/youlai/mall/oms/controller/app/OrderController.java
+5
-4
mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java
...src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java
+1
-1
mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java
...va/com/youlai/mall/oms/service/impl/OrderServiceImpl.java
+14
-13
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/domain/PmsSku.java
...src/main/java/com/youlai/mall/pms/pojo/domain/PmsSku.java
+1
-1
mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/vo/MemberVO.java
...i/src/main/java/com/youlai/mall/ums/pojo/vo/MemberVO.java
+2
-0
youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml
youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml
+1
-0
youlai-common/common-redis/pom.xml
youlai-common/common-redis/pom.xml
+1
-1
youlai-common/common-web/src/main/resources/logback-spring.xml
...i-common/common-web/src/main/resources/logback-spring.xml
+12
-0
未找到文件。
mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/domain/OmsOrderItem.java
浏览文件 @
a652073f
...
...
@@ -39,6 +39,10 @@ public class OmsOrderItem extends BaseEntity {
* 商品sku编号
*/
private
String
skuCode
;
private
String
skuName
;
/**
* 商品sku名字
*/
...
...
@@ -92,6 +96,4 @@ public class OmsOrderItem extends BaseEntity {
*/
private
Integer
deleted
;
}
mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/OrderController.java
浏览文件 @
a652073f
...
...
@@ -15,6 +15,7 @@ import io.swagger.annotations.*;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.bind.annotation.*
;
import
javax.validation.Valid
;
...
...
@@ -36,13 +37,13 @@ public class OrderController {
@ApiOperation
(
"订单列表"
)
@GetMapping
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"page"
,
defaultValue
=
"1"
,
value
=
"页码"
,
paramType
=
"query"
,
dataType
=
"Long"
),
@ApiImplicitParam
(
name
=
"limit"
,
defaultValue
=
"10"
,
value
=
"每页数量"
,
paramType
=
"query"
,
dataType
=
"Long"
),
@ApiImplicitParam
(
name
=
"page"
,
defaultValue
=
"1"
,
value
=
"页码"
,
paramType
=
"query"
,
dataType
=
"Long"
),
@ApiImplicitParam
(
name
=
"limit"
,
defaultValue
=
"10"
,
value
=
"每页数量"
,
paramType
=
"query"
,
dataType
=
"Long"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"订单状态"
,
paramType
=
"query"
,
dataType
=
"Integer"
)
})
public
Result
list
(
Long
page
,
Long
limit
,
@RequestParam
(
defaultValue
=
"1"
)
Long
page
,
@RequestParam
(
defaultValue
=
"10"
)
Long
limit
,
Integer
status
)
{
IPage
<
OmsOrder
>
result
=
orderService
.
list
(
new
Page
<>(
page
,
limit
),
new
OmsOrder
().
setStatus
(
status
));
...
...
mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java
浏览文件 @
a652073f
...
...
@@ -18,7 +18,7 @@ public interface OrderMapper extends BaseMapper<OmsOrder> {
@Select
(
"<script>"
+
" select id,order_sn,total_amount,pay_amount,status from oms_order"
+
" select id,order_sn,total_amount,pay_amount,status
,total_amount,total_quantity,gmt_create
from oms_order"
+
" where 1=1 "
+
" <if test ='order.status !=null ' >"
+
" AND status= #{order.status} "
+
...
...
mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java
浏览文件 @
a652073f
...
...
@@ -39,10 +39,7 @@ import org.springframework.data.redis.core.script.DefaultRedisScript;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
import
java.util.concurrent.CompletableFuture
;
import
java.util.concurrent.ThreadPoolExecutor
;
import
java.util.stream.Collectors
;
...
...
@@ -67,7 +64,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
*/
@Override
public
OrderConfirmVO
confirm
(
OrderConfirmDTO
orderConfirmDTO
)
{
log
.
info
(
"=======================订单确认=======================\n订单确认信息:{}"
,
orderConfirmDTO
);
log
.
info
(
"=======================订单确认=======================\n订单确认信息:{}"
,
orderConfirmDTO
);
OrderConfirmVO
orderConfirmVO
=
new
OrderConfirmVO
();
Long
memberId
=
RequestUtils
.
getUserId
();
// 获取购买商品信息
...
...
@@ -125,7 +122,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
@Override
@GlobalTransactional
public
OrderSubmitVO
submit
(
OrderSubmitDTO
submitDTO
)
{
log
.
info
(
"=======================订单提交=======================\n订单提交信息:{}"
,
submitDTO
);
log
.
info
(
"=======================订单提交=======================\n订单提交信息:{}"
,
submitDTO
);
// 订单重复提交校验
String
orderToken
=
submitDTO
.
getOrderToken
();
DefaultRedisScript
<
Long
>
redisScript
=
new
DefaultRedisScript
<>(
RELEASE_LOCK_LUA_SCRIPT
,
Long
.
class
);
...
...
@@ -174,13 +171,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
.
setSourceType
(
OrderTypeEnum
.
APP
.
getCode
())
.
setMemberId
(
RequestUtils
.
getUserId
())
.
setRemark
(
submitDTO
.
getRemark
())
.
setPayAmount
(
submitDTO
.
getPayAmount
());
.
setPayAmount
(
submitDTO
.
getPayAmount
())
.
setTotalQuantity
(
orderItems
.
stream
().
map
(
item
->
item
.
getCount
()).
reduce
(
0
,
(
x
,
y
)
->
x
+
y
))
.
setTotalAmount
(
orderItems
.
stream
().
map
(
item
->
item
.
getPrice
()
*
item
.
getCount
()).
reduce
(
0
l
,
(
x
,
y
)
->
x
+
y
))
.
setGmtCreate
(
new
Date
());
;
this
.
save
(
order
);
// 创建订单商品
List
<
OmsOrderItem
>
orderItemList
=
orderItems
.
stream
().
map
(
item
->
OmsOrderItem
.
builder
()
.
orderId
(
order
.
getId
())
.
skuId
(
item
.
getSkuId
())
.
skuName
(
item
.
getTitle
())
.
skuPrice
(
item
.
getPrice
())
.
skuPic
(
item
.
getPic
())
.
skuQuantity
(
item
.
getCount
())
...
...
@@ -215,18 +217,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
log
.
info
(
"=======================订单取消,订单ID:{}======================="
,
id
);
OmsOrder
order
=
this
.
getById
(
id
);
if
(
order
!=
null
&&!
OrderStatusEnum
.
PENDING_PAYMENT
.
getCode
().
equals
(
order
.
getStatus
())
)
{
if
(
order
!=
null
&&
!
OrderStatusEnum
.
PENDING_PAYMENT
.
getCode
().
equals
(
order
.
getStatus
())
)
{
throw
new
BizException
(
"取消失败,订单状态不支持取消"
);
// 通过自定义异常,将异常信息抛出由异常处理器捕获显示给前端页面
}
order
.
setStatus
(
OrderStatusEnum
.
USER_CANCEL
.
getCode
());
boolean
result
=
this
.
updateById
(
order
);
if
(
result
)
{
if
(
result
)
{
// 释放被锁定的库存
Result
unlockResult
=
skuFeignService
.
unlockStock
(
order
.
getOrderSn
());
if
(!
Result
.
isSuccess
(
unlockResult
))
{
if
(!
Result
.
isSuccess
(
unlockResult
))
{
throw
new
BizException
(
unlockResult
.
getMsg
());
}
result
=
true
;
result
=
true
;
}
return
result
;
}
...
...
@@ -247,7 +249,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
}
@Override
public
IPage
<
OmsOrder
>
list
(
Page
<
OmsOrder
>
page
,
OmsOrder
order
)
{
List
<
OmsOrder
>
list
=
this
.
baseMapper
.
list
(
page
,
order
);
...
...
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/domain/PmsSku.java
浏览文件 @
a652073f
...
...
@@ -11,7 +11,7 @@ public class PmsSku extends BaseEntity {
@TableId
(
type
=
IdType
.
AUTO
)
private
Long
id
;
private
Long
spuId
;
private
String
titl
e
;
private
String
nam
e
;
private
String
code
;
private
String
pic
;
private
Long
originPrice
;
...
...
mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/vo/MemberVO.java
浏览文件 @
a652073f
...
...
@@ -10,5 +10,7 @@ public class MemberVO {
private
String
avatar
;
private
Long
balance
;
}
youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml
浏览文件 @
a652073f
...
...
@@ -11,3 +11,4 @@ spring:
config
:
server-addr
:
${spring.cloud.nacos.discovery.server-addr}
file-extension
:
yaml
youlai-common/common-redis/pom.xml
浏览文件 @
a652073f
youlai-common/common-web/src/main/resources/logback-spring.xml
浏览文件 @
a652073f
...
...
@@ -59,6 +59,18 @@
<appender-ref
ref=
"LOGIN_LOGSTASH"
/>
</logger>
<logger
name=
"com.alibaba.nacos"
level=
"ERROR"
additivity=
"true"
>
<appender-ref
ref=
"CONSOLE"
/>
</logger>
<logger
name=
"org.springframework.data.redis"
level=
"ERROR"
additivity=
"true"
>
<appender-ref
ref=
"CONSOLE"
/>
</logger>
<logger
name=
"io.lettuce"
level=
"ERROR"
additivity=
"true"
>
<appender-ref
ref=
"CONSOLE"
/>
</logger>
<!-- 根logger -->
<root>
<level>
INFO
</level>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录