From c542c56572ea8936301a6bdc736e23b846c8c006 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 18:01:58 +0800
Subject: [PATCH] 修改保级功能bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 8036557..e3bc81d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -230,7 +230,6 @@
if (!check){
throw new ServiceException("订单不存在");
}
- Integer orderType = order.getOrderType();
// 售后设置
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
@@ -247,6 +246,7 @@
order.setOrderStatus(OrderStatus.COMPLETED.getCode());
order.setIsCommission(0);
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
+ order.setEndTime(LocalDateTime.now());
orderMapper.updateById(order);
}
@@ -335,7 +335,7 @@
@Override
public R cancelOrder(Long orderId) {
Order order = this.getById(orderId);
- if(Arrays.asList(4, 5, 6, 7, 8).contains(order.getOrderStatus())){
+ if(Arrays.asList(5, 6, 7).contains(order.getOrderStatus())){
return R.fail("无效的操作");
}
order.setOrderStatus(5);
@@ -419,7 +419,7 @@
PointSetting pointSetting = pointSettingClient.getPointSetting(vipDemotion ? appUser.getVipId() - 1 : appUser.getVipId()).getData();
int earnPoint1 = getPoint;
if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = getPoint / (100 - pointSetting.getBuyPoint());
+ earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
}
appUser.setLavePoint(lavePoint - getPoint);
appUser.setShopPoint(appUser.getShopPoint() - earnPoint1);
--
Gitblit v1.7.1