Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
有来技术
youlai-mall
提交
a9090751
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,体验更适合开发者的 AI 搜索 >>
提交
a9090751
编写于
12月 02, 2022
作者:
H
haoxr
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 实验室相关问题修复
上级
e23d79ec
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
32 addition
and
37 deletion
+32
-37
mall-oms/oms-api/src/main/java/com/youlai/mall/oms/enums/OrderStatusEnum.java
.../main/java/com/youlai/mall/oms/enums/OrderStatusEnum.java
+14
-19
mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java
...va/com/youlai/mall/oms/service/impl/OrderServiceImpl.java
+16
-16
mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/MemberFeignClient.java
.../main/java/com/youlai/mall/ums/api/MemberFeignClient.java
+1
-1
mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/app/MemberController.java
.../com/youlai/mall/ums/controller/app/MemberController.java
+1
-1
未找到文件。
mall-oms/oms-api/src/main/java/com/youlai/mall/oms/enums/OrderStatusEnum.java
浏览文件 @
a9090751
...
...
@@ -12,34 +12,29 @@ import lombok.Getter;
public
enum
OrderStatusEnum
implements
IBaseEnum
<
Integer
>
{
/**
*
1. 订单创建阶段
*
待付款
*/
PENDING_PAYMENT
(
1
,
"待支付"
),
USER_CANCEL
(
2
,
"用户取消"
),
SYSTEM_CANCEL
(
3
,
"系统自动取消"
),
WAIT_PAY
(
1
,
"待付款"
),
/**
*
2. 订单付款阶段
*
待发货
*/
PAYED
(
10
,
"已支付"
),
APPLY_REFUND
(
11
,
"申请退款"
),
REFUNDED
(
12
,
"已退款"
),
WAIT_SHIPPING
(
2
,
"待发货"
),
/**
*
订单发货阶段
*
已发货
*/
DELIVERED
(
20
,
"已发货"
),
SHIPPED
(
3
,
"已发货"
),
/**
*
订单收货阶段
*
已完成
*/
USER_RECEIVE
(
30
,
"用户收货"
),
AUTO_RECEIVE
(
31
,
"系统自动收货"
),
FINISHED
(
4
,
"已完成"
),
/**
* 已关闭(退款完成)
*/
CLOSED
(
5
,
"已关闭"
),
/**
*
订单完结
*
已取消
*/
C
OMPLETED
(
99
,
"已完成
"
);
C
ANCELED
(
6
,
"已取消
"
);
OrderStatusEnum
(
int
value
,
String
label
)
{
...
...
mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java
浏览文件 @
a9090751
...
...
@@ -183,7 +183,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
// 创建订单
order
=
new
OmsOrder
().
setOrderSn
(
orderToken
)
// 把orderToken赋值给订单编号
.
setStatus
(
OrderStatusEnum
.
PENDING_PAYMENT
.
getValue
())
.
setStatus
(
OrderStatusEnum
.
WAIT_PAY
.
getValue
())
.
setSourceType
(
OrderSourceTypeEnum
.
APP
.
getCode
())
.
setMemberId
(
SecurityUtils
.
getMemberId
())
.
setRemark
(
orderSubmitForm
.
getRemark
())
...
...
@@ -230,7 +230,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
public
<
T
>
T
pay
(
Long
orderId
,
String
appId
,
PayTypeEnum
payTypeEnum
)
{
OmsOrder
order
=
this
.
getById
(
orderId
);
Assert
.
isTrue
(
order
!=
null
,
"订单不存在"
);
Assert
.
isTrue
(
OrderStatusEnum
.
PENDING_PAYMENT
.
getValue
().
equals
(
order
.
getStatus
()),
"订单不可支付,请检查订单状态"
);
Assert
.
isTrue
(
OrderStatusEnum
.
WAIT_PAY
.
getValue
().
equals
(
order
.
getStatus
()),
"订单不可支付,请检查订单状态"
);
RLock
lock
=
redissonClient
.
getLock
(
ORDER_SN_PREFIX
+
order
.
getOrderSn
());
try
{
...
...
@@ -272,7 +272,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
Assert
.
isTrue
(
Result
.
isSuccess
(
deductBalanceResult
),
"扣减账户余额失败"
);
// 更新订单状态
order
.
setStatus
(
OrderStatusEnum
.
PAYED
.
getValue
());
order
.
setStatus
(
OrderStatusEnum
.
WAIT_SHIPPING
.
getValue
());
order
.
setPayType
(
PayTypeEnum
.
BALANCE
.
getValue
());
order
.
setPayTime
(
new
Date
());
this
.
updateById
(
order
);
...
...
@@ -324,7 +324,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
public
boolean
closeOrder
(
String
orderToken
)
{
log
.
info
(
"订单超时取消,orderToken:{}"
,
orderToken
);
OmsOrder
order
=
this
.
getOne
(
new
LambdaQueryWrapper
<
OmsOrder
>().
eq
(
OmsOrder:
:
getOrderSn
,
orderToken
));
if
(
order
==
null
||
!
OrderStatusEnum
.
PENDING_PAYMENT
.
getValue
().
equals
(
order
.
getStatus
()))
{
if
(
order
==
null
||
!
OrderStatusEnum
.
WAIT_PAY
.
getValue
().
equals
(
order
.
getStatus
()))
{
return
false
;
}
// 如果已经有outTradeNo了就先进行关单
...
...
@@ -337,7 +337,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
throw
new
ApiException
(
"微信关单异常"
);
}
}
order
.
setStatus
(
OrderStatusEnum
.
SYSTEM_CANCEL
.
getValue
());
order
.
setStatus
(
OrderStatusEnum
.
CANCELED
.
getValue
());
return
this
.
updateById
(
order
);
}
...
...
@@ -349,7 +349,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
throw
new
ApiException
(
"订单不存在"
);
}
if
(!
OrderStatusEnum
.
PENDING_PAYMENT
.
getValue
().
equals
(
order
.
getStatus
()))
{
if
(!
OrderStatusEnum
.
WAIT_PAY
.
getValue
().
equals
(
order
.
getStatus
()))
{
throw
new
ApiException
(
"取消失败,订单状态不支持取消"
);
// 通过自定义异常,将异常信息抛出由异常处理器捕获显示给前端页面
}
// 如果已经有outTradeNo了就先进行关单
...
...
@@ -362,7 +362,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
throw
new
ApiException
(
"微信关单异常"
);
}
}
order
.
setStatus
(
OrderStatusEnum
.
USER_CANCEL
.
getValue
());
order
.
setStatus
(
OrderStatusEnum
.
CANCELED
.
getValue
());
boolean
result
=
this
.
updateById
(
order
);
if
(
result
)
{
// 释放被锁定的库存
...
...
@@ -378,8 +378,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
public
boolean
deleteOrder
(
Long
id
)
{
log
.
info
(
"=======================订单删除,订单ID:{}======================="
,
id
);
OmsOrder
order
=
this
.
getById
(
id
);
if
(
order
!=
null
&&
!
OrderStatusEnum
.
SYSTEM_CANCEL
.
getValue
().
equals
(
order
.
getStatus
())
&&
!
OrderStatusEnum
.
USER_CANCEL
.
getValue
().
equals
(
order
.
getStatus
()))
{
if
(
order
!=
null
&&
!
OrderStatusEnum
.
CANCELED
.
getValue
().
equals
(
order
.
getStatus
()))
{
throw
new
ApiException
(
"订单删除失败,订单不存在或订单状态不支持删除"
);
}
return
this
.
removeById
(
id
);
...
...
@@ -398,7 +397,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
);
// 支付成功处理
if
(
WxPayConstants
.
WxpayTradeStatus
.
SUCCESS
.
equals
(
result
.
getTradeState
()))
{
orderDO
.
setStatus
(
OrderStatusEnum
.
PAYED
.
getValue
());
orderDO
.
setStatus
(
OrderStatusEnum
.
WAIT_SHIPPING
.
getValue
());
orderDO
.
setTransactionId
(
result
.
getTransactionId
());
orderDO
.
setPayTime
(
new
Date
());
this
.
updateById
(
orderDO
);
...
...
@@ -420,7 +419,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
OmsOrder
orderDO
=
this
.
getOne
(
wrapper
);
// 退款成功处理
if
(
WxPayConstants
.
RefundStatus
.
SUCCESS
.
equals
(
result
.
getRefundStatus
()))
{
orderDO
.
setStatus
(
OrderStatusEnum
.
REFUND
ED
.
getValue
());
orderDO
.
setStatus
(
OrderStatusEnum
.
CLOS
ED
.
getValue
());
orderDO
.
setRefundId
(
result
.
getRefundId
());
this
.
updateById
(
orderDO
);
}
...
...
@@ -521,19 +520,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
Long
amount
=
orderDTO
.
getAmount
();
memberFeignClient
.
deductBalance
(
memberId
,
amount
);
// 开启异常
if
(
openEx
)
{
int
i
=
1
/
0
;
}
// 生成订单
String
orderSn
=
businessSnGenerator
.
generateSerialNo
();
new
OmsOrder
().
setOrderSn
(
orderSn
)
.
setStatus
(
OrderStatusEnum
.
COMPLET
ED
.
getValue
())
.
setStatus
(
OrderStatusEnum
.
FINISH
ED
.
getValue
())
.
setSourceType
(
OrderSourceTypeEnum
.
APP
.
getCode
())
.
setMemberId
(
memberId
)
.
setPayAmount
(
amount
)
.
setTotalQuantity
(
1
)
.
setTotalAmount
(
amount
);
// 开启异常,制造运行时异常
if
(
openEx
)
{
int
i
=
1
/
0
;
}
return
orderSn
;
}
...
...
mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/MemberFeignClient.java
浏览文件 @
a9090751
...
...
@@ -82,7 +82,7 @@ public interface MemberFeignClient {
* @param memberId
* @return
*/
@PutMapping
(
"/api/v1/members/{memberId}/balance/_reset"
)
@PutMapping
(
"/ap
p-ap
i/v1/members/{memberId}/balance/_reset"
)
Result
resetBalance
(
@PathVariable
Long
memberId
);
/**
...
...
mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/app/MemberController.java
浏览文件 @
a9090751
...
...
@@ -116,7 +116,7 @@ public class MemberController {
}
@ApiOperation
(
value
=
"「实验室」重置会员余额"
,
hidden
=
true
)
@PutMapping
(
"/{memberId}/balance
s
/_reset"
)
@PutMapping
(
"/{memberId}/balance/_reset"
)
public
Result
resetBalance
(
@PathVariable
Long
memberId
)
{
boolean
result
=
memberService
.
update
(
new
LambdaUpdateWrapper
<
UmsMember
>()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录