From c90a8ac772937f8f084356ea1f04c5dba1d9e5d5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 11:15:33 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 117cf9b..2b9567b 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
@@ -35,12 +35,15 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
+import org.apache.poi.ss.usermodel.*;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
+import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
@@ -531,8 +534,7 @@
appUserClient.editAppUserById(appUser);
//降级检测
- boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
- if(vipDemotion){
+ if(1 < appUser.getVipId() && appUser.getVipId() < 4){
appUserClient.vipDemotion(appUser.getId());
}
//回退优惠券状态
@@ -668,8 +670,7 @@
appUserClient.editAppUserById(appUser);
//降级检测
- boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
- if(vipDemotion){
+ if(1 < appUser.getVipId() && appUser.getVipId() < 4){
appUserClient.vipDemotion(appUser.getId());
}
@@ -730,18 +731,7 @@
return R.ok();
}
- /**
- * 会员降级检测
- */
- public boolean vipDemotion(Integer shopPoint, Integer vipId){
- if(vipId == 1 || vipId > 3){
- return false;
- }
- VipSetting vipSetting = vipSettingClient.getVipSetting(vipId).getData();
- Integer vipLevelUpShopRole = vipSetting.getVipLevelUpShopRole();
- Integer vipLevelUpShop = vipSetting.getVipLevelUpShop();
- return 1 == vipLevelUpShopRole && shopPoint < vipLevelUpShop;
- }
+
/**
@@ -816,6 +806,7 @@
}
List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, orderId).eq(OrderGood::getDelFlag, 0));
int sum = orderGoods.stream().mapToInt(OrderGood::getNum).sum();
+ System.out.println("111111111111222");
orderInfo.setGoodsNum(sum);
List<Object> goodsJson = new ArrayList<>();
for (OrderGood orderGood : orderGoods) {
@@ -913,4 +904,19 @@
}
}
}
+
+ @Override
+ public void importExpress(MultipartFile file) {
+ try (InputStream inputStream = file.getInputStream()) {
+ Workbook workbook = WorkbookFactory.create(inputStream);
+ Sheet sheet = workbook.getSheetAt(0); // 获取第一个Sheet
+
+ for (Row row : sheet) {
+// cell.getStringCellValue()
+ System.out.println();
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
--
Gitblit v1.7.1