caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复虚拟订单核销校验问题

Browse Source
This commit is contained in:
Chopper 2022-03-14 10:44:06 +08:00
parent 1625f7ca76
commit b7d418b5b7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
View File

@ -181,7 +181,7 @@ public class Order extends BaseEntity {
@ApiModelProperty(value = "订单促销类型")
private String orderPromotionType;
@ApiModelProperty(value = "价格详情")
@ApiModelProperty(value = "价格价格详情")
private String priceDetail;
@ApiModelProperty(value = "订单是否支持原路退回")

6
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
View File

@ -944,15 +944,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
throw new ServiceException(ResultCode.ORDER_NOT_EXIST);
}
//判断是否为虚拟订单
else if (!order.getOrderType().equals(OrderTypeEnum.VIRTUAL.name())) {
if (!order.getOrderType().equals(OrderTypeEnum.VIRTUAL.name())) {
throw new ServiceException(ResultCode.ORDER_TAKE_ERROR);
}
//判断虚拟订单状态
else if (!order.getOrderStatus().equals(OrderStatusEnum.TAKE.name())) {
if (!order.getOrderStatus().equals(OrderStatusEnum.TAKE.name())) {
throw new ServiceException(ResultCode.ORDER_TAKE_ERROR);
}
//判断验证码是否正确
else if (!verificationCode.equals(order.getVerificationCode())) {
if (!verificationCode.equals(order.getVerificationCode())) {
throw new ServiceException(ResultCode.ORDER_TAKE_ERROR);
}
}