太空舱退款和扣款根据门店
This commit is contained in:
@ -109,7 +109,9 @@ public class OrderSpaceCapsuleServiceImpl implements OrderSpaceCapsuleService {
|
|||||||
throw exception(ORDER_SPACE_CAPSULE_ERREO);
|
throw exception(ORDER_SPACE_CAPSULE_ERREO);
|
||||||
}
|
}
|
||||||
// 判断是否需要更新状态
|
// 判断是否需要更新状态
|
||||||
Integer currentStatus = orderSpaceCapsuleMapper.selectById(updateObj.getId()).getStatus();
|
OrderSpaceCapsuleDO orderSpaceCapsuleDO = orderSpaceCapsuleMapper.selectById(updateObj.getId());
|
||||||
|
updateObj.setCarteenId(orderSpaceCapsuleDO.getCarteenId());
|
||||||
|
Integer currentStatus = orderSpaceCapsuleDO.getStatus();
|
||||||
if (currentStatus.equals(updateObj.getStatus())) {
|
if (currentStatus.equals(updateObj.getStatus())) {
|
||||||
return; // 状态一致,无需更新
|
return; // 状态一致,无需更新
|
||||||
}
|
}
|
||||||
@ -154,7 +156,7 @@ public class OrderSpaceCapsuleServiceImpl implements OrderSpaceCapsuleService {
|
|||||||
BigDecimal refundAmount = calculateRefundAmount(updateObj, currentStatus);
|
BigDecimal refundAmount = calculateRefundAmount(updateObj, currentStatus);
|
||||||
updateObj.setRefundMoney(refundAmount);
|
updateObj.setRefundMoney(refundAmount);
|
||||||
// 进行余额退款
|
// 进行余额退款
|
||||||
deductionService.reduction(updateObj.getUserId(), refundAmount, BigDecimal.ZERO, refundAmount, BigDecimal.ZERO, null);
|
deductionService.reduction(updateObj.getUserId(), refundAmount, BigDecimal.ZERO, refundAmount, BigDecimal.ZERO,updateObj.getCarteenId());
|
||||||
// 设置变动后的余额
|
// 设置变动后的余额
|
||||||
updateObj.setEndMoney(startMoney.add(refundAmount));
|
updateObj.setEndMoney(startMoney.add(refundAmount));
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user