From 3ddb84f9f118c67e0bab27b4332779b8af0dc266 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 11:36:39 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 eb93bbc..b5793fe 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
@@ -246,6 +246,7 @@
order.setOrderStatus(OrderStatus.COMPLETED.getCode());
order.setIsCommission(0);
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
+ order.setEndTime(LocalDateTime.now());
orderMapper.updateById(order);
}
@@ -418,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