fix: 后端更新订单时处理discountMoney字段,修复status为null的问题
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -295,7 +295,7 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 只有未完成状态可以编辑
|
// 只有未完成状态可以编辑
|
||||||
if (order.getStatus() != 0) {
|
if (order.getStatus() == null || order.getStatus() != 0) {
|
||||||
throw new RuntimeException("订单状态不允许编辑");
|
throw new RuntimeException("订单状态不允许编辑");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -317,6 +317,7 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
|
|
||||||
// 更新折扣和备注
|
// 更新折扣和备注
|
||||||
order.setDiscountRate(request.getDiscountRate() != null ? request.getDiscountRate() : new BigDecimal("100"));
|
order.setDiscountRate(request.getDiscountRate() != null ? request.getDiscountRate() : new BigDecimal("100"));
|
||||||
|
order.setDiscountMoney(request.getDiscountMoney() != null ? request.getDiscountMoney() : BigDecimal.ZERO);
|
||||||
order.setRemark(request.getRemark());
|
order.setRemark(request.getRemark());
|
||||||
order.setPaymentMethod(request.getPaymentMethod());
|
order.setPaymentMethod(request.getPaymentMethod());
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user