From 7c044949d5d47e7b64222b27858c8f66d2a8a282 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 17:54:34 +0800
Subject: [PATCH] 1
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java | 4 ++++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/dto/GoodsAreaDto.java | 4 ++++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++------
3 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
index 880312c..3e67c87 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
@@ -11,6 +11,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.util.List;
/**
* <p>
@@ -124,5 +125,8 @@
@TableField("bound_shop_superiors_points")
private Integer boundShopSuperiorsPoints;
+ @TableField(exist = false)
+ private List<GoodsArea> goodsAreaList;
+
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/dto/GoodsAreaDto.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/dto/GoodsAreaDto.java
new file mode 100644
index 0000000..e020603
--- /dev/null
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/dto/GoodsAreaDto.java
@@ -0,0 +1,4 @@
+package com.ruoyi.other.dto;
+
+public class GoodsAreaDto {
+}
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 6e1ea7f..664a297 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
@@ -27,10 +27,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -186,8 +183,20 @@
// 特殊地区售价设置
List<GoodsArea> goodsAreaList = goods.getGoodsAreaList();
if (!CollectionUtils.isEmpty(goodsAreaList)){
- goodsAreaService.saveBatch(goodsAreaList);
+ for (GoodsArea goodsArea : goodsAreaList) {
+ List<GoodsArea> goodsAreaList1 = goodsArea.getGoodsAreaList();
+ for (GoodsArea area : goodsAreaList1) {
+ area.setProvince(goodsArea.getProvince());
+ area.setCity(goodsArea.getCity());
+ area.setDistricts(goodsArea.getDistricts());
+ area.setProvinceCode(goodsArea.getProvinceCode());
+ area.setCityCode(goodsArea.getCityCode());
+ area.setDistrictsCode(goodsArea.getDistrictsCode());
+ }
+ goodsAreaService.saveBatch(goodsAreaList1);
+ }
}
+
}
@Override
@@ -207,7 +216,20 @@
// 特殊地区售价设置
List<GoodsArea> goodsAreaList = goods.getGoodsAreaList();
- goodsAreaService.updateBatchById(goodsAreaList);
+ if (!CollectionUtils.isEmpty(goodsAreaList)){
+ for (GoodsArea goodsArea : goodsAreaList) {
+ List<GoodsArea> goodsAreaList1 = goodsArea.getGoodsAreaList();
+ for (GoodsArea area : goodsAreaList1) {
+ area.setProvince(goodsArea.getProvince());
+ area.setCity(goodsArea.getCity());
+ area.setDistricts(goodsArea.getDistricts());
+ area.setProvinceCode(goodsArea.getProvinceCode());
+ area.setCityCode(goodsArea.getCityCode());
+ area.setDistrictsCode(goodsArea.getDistrictsCode());
+ }
+ goodsAreaService.updateBatchById(goodsAreaList1);
+ }
+ }
}
@Override
@@ -231,6 +253,18 @@
// 特殊地区售价设置
List<GoodsArea> goodsAreaList = goodsAreaService.list(new LambdaQueryWrapper<GoodsArea>()
.eq(GoodsArea::getGoodsId, goodsId));
+
+ Map<String, List<GoodsArea>> listMap = goodsAreaList.stream()
+ .collect(Collectors.groupingBy(goodsArea ->
+ goodsArea.getProvinceCode() + goodsArea.getCityCode() + goodsArea.getDistrictsCode()));
+
+ List<GoodsArea> goodsAreaList1 = new ArrayList<>();
+ listMap.forEach((s, goodsAreas) -> {
+ GoodsArea goodsArea = goodsAreas.get(0);
+ goodsArea.setGoodsAreaList(goodsAreas);
+ goodsAreaList1.add(goodsArea);
+ });
+
goods.setGoodsAreaList(goodsAreaList);
return goods;
}
--
Gitblit v1.7.1