From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index 72fea21..a9dae28 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -92,6 +92,8 @@
+
+
@Override
public PageInfo<GoodsVO> goodsList(Goods search) {
Integer vipId = 0;
@@ -122,18 +124,18 @@
//手动排序
if(StringUtils.isNotEmpty(search.getOrderByColumn())){
- if("selling_price".equals(search.getOrderByColumn())){
+ if("tgs.selling_price".equals(search.getOrderByColumn())){
list.sort(new Comparator<GoodsVO>() {
@Override
public int compare(GoodsVO o1, GoodsVO o2) {
if(null != o1.getSellingPrice() && null != o2.getSellingPrice()){
- return o1.getSellingPrice().compareTo(o2.getSellingPrice()) * (StringUtils.isNotEmpty(search.getIsAsc()) ? -1 : 1);
+ return o1.getSellingPrice().compareTo(o2.getSellingPrice()) * ("desc".equals(search.getIsAsc()) ? -1 : 1);
}
if(null == o1.getSellingPrice() && null != o2.getSellingPrice()){
- return BigDecimal.ZERO.compareTo(o2.getSellingPrice()) * (StringUtils.isNotEmpty(search.getIsAsc()) ? -1 : 1);
+ return BigDecimal.ZERO.compareTo(o2.getSellingPrice()) * ("desc".equals(search.getIsAsc()) ? -1 : 1);
}
if(null != o1.getSellingPrice() && null == o2.getSellingPrice()){
- return o1.getSellingPrice().compareTo(BigDecimal.ZERO) * (StringUtils.isNotEmpty(search.getIsAsc()) ? -1 : 1);
+ return o1.getSellingPrice().compareTo(BigDecimal.ZERO) * ("desc".equals(search.getIsAsc()) ? -1 : 1);
}
return 0;
}
@@ -144,13 +146,13 @@
@Override
public int compare(GoodsVO o1, GoodsVO o2) {
if(null != o1.getIntegral() && null != o2.getIntegral()){
- return o1.getIntegral().compareTo(o2.getIntegral()) * (StringUtils.isNotEmpty(search.getIsAsc()) ? -1 : 1);
+ return o1.getIntegral().compareTo(o2.getIntegral()) * ("desc".equals(search.getIsAsc()) ? -1 : 1);
}
if(null == o1.getIntegral() && null != o2.getIntegral()){
- return Integer.valueOf(0).compareTo(o2.getIntegral()) * (StringUtils.isNotEmpty(search.getIsAsc()) ? -1 : 1);
+ return Integer.valueOf(0).compareTo(o2.getIntegral()) * ("desc".equals(search.getIsAsc()) ? -1 : 1);
}
if(null != o1.getIntegral() && null == o2.getIntegral()){
- return o1.getIntegral().compareTo(Integer.valueOf(0)) * (StringUtils.isNotEmpty(search.getIsAsc()) ? -1 : 1);
+ return o1.getIntegral().compareTo(Integer.valueOf(0)) * ("desc".equals(search.getIsAsc()) ? -1 : 1);
}
return 0;
}
@@ -160,7 +162,7 @@
list.sort(new Comparator<GoodsVO>() {
@Override
public int compare(GoodsVO o1, GoodsVO o2) {
- return o1.getSaleNum().compareTo(o2.getSaleNum()) * (StringUtils.isNotEmpty(search.getIsAsc()) ? -1 : 1);
+ return o1.getSaleNum().compareTo(o2.getSaleNum()) * ("desc".equals(search.getIsAsc()) ? -1 : 1);
}
});
}
@@ -406,6 +408,8 @@
area.setProvinceCode(goodsArea.getProvinceCode());
area.setCityCode(goodsArea.getCityCode());
area.setDistrictsCode(goodsArea.getDistrictsCode());
+ area.setSuperiorType("2");
+ area.setSuperiorPriceType("2");
// if(null != area.getSellingPrice() || null != area.getIntegral()){
// goodsAreaList2.add(area);
// }
@@ -422,6 +426,8 @@
goodsVipList.forEach(item -> {
item.setId(null);
item.setGoodsId(id);
+ item.setSuperiorType("2");
+ item.setSuperiorPriceType("2");
});
goodsVipService.saveBatch(goodsVipList);
}
@@ -671,4 +677,5 @@
}
return price;
}
+
}
--
Gitblit v1.7.1