|
@@ -20,7 +20,6 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
-import java.util.Arrays;
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
@@ -45,7 +44,7 @@ public class WatermarkImgServiceImpl extends BaseServiceImpl<WatermarkImgMapper,
|
|
|
for (PriceUploadDto dto : list) {
|
|
for (PriceUploadDto dto : list) {
|
|
|
orderId = dto.getOrderId();
|
|
orderId = dto.getOrderId();
|
|
|
if(StringUtils.isNotEmpty(dto.getUrl())){
|
|
if(StringUtils.isNotEmpty(dto.getUrl())){
|
|
|
- if(dto.getIndex() <=3){
|
|
|
|
|
|
|
+ if(dto.getIndex() <=6){
|
|
|
startUrl.add(dto.getUrl());
|
|
startUrl.add(dto.getUrl());
|
|
|
}else{
|
|
}else{
|
|
|
endUrl.add(dto.getUrl());
|
|
endUrl.add(dto.getUrl());
|
|
@@ -57,21 +56,9 @@ public class WatermarkImgServiceImpl extends BaseServiceImpl<WatermarkImgMapper,
|
|
|
String orgVal = "";
|
|
String orgVal = "";
|
|
|
if(StringUtils.isNotEmpty(dto.getStartUrl())){
|
|
if(StringUtils.isNotEmpty(dto.getStartUrl())){
|
|
|
orgVal = dto.getStartUrl()+",";
|
|
orgVal = dto.getStartUrl()+",";
|
|
|
- List<String> urlList = Arrays.asList(dto.getStartUrl().split(","));
|
|
|
|
|
- if(urlList.size()>3){
|
|
|
|
|
- for (int i = 3; i < urlList.size(); i++) {
|
|
|
|
|
- startUrl.add(urlList.get(i));
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
if(StringUtils.isNotEmpty(dto.getEndUrl())){
|
|
if(StringUtils.isNotEmpty(dto.getEndUrl())){
|
|
|
orgVal += dto.getEndUrl();
|
|
orgVal += dto.getEndUrl();
|
|
|
- List<String> urlList = Arrays.asList(dto.getEndUrl().split(","));
|
|
|
|
|
- if(urlList.size()>3){
|
|
|
|
|
- for (int i = 3; i < urlList.size(); i++) {
|
|
|
|
|
- endUrl.add(urlList.get(i));
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
String nowVal = "";
|
|
String nowVal = "";
|