From 0982a97b0c65e11034b9d6b00cc0e4aba39254be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 26 一月 2026 11:07:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
index f4f382f..5e1f2c8 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
@@ -211,9 +211,11 @@
@Override
public void updateStatusById(Labels labels) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- labels.setEditDate(new Date());
- labels.setEditor(user.getId());
- labelsMapper.updateById(labels);
+ labelsMapper.update(null,new UpdateWrapper<Labels>().lambda()
+ .set(Labels::getEditDate,new Date())
+ .set(Labels::getEditor,user.getId())
+ .set(Labels::getStatus,labels.getStatus())
+ .eq(Labels::getId,labels.getId()));
}
@@ -356,6 +358,7 @@
}
if(StringUtils.isNotBlank(model.getImgurl())){
model.setImgFullurl(path + model.getImgurl());
+ model.setImgurlfull(path + model.getImgurl());
}
if(Constants.equalsInteger(model.getType(),Constants.LabelsType.BIG_AREA.getKey())
|| Constants.equalsInteger(model.getType(),Constants.LabelsType.YUN_FEE.getKey())){
@@ -467,16 +470,22 @@
@Override
- public List<LabelsResponse> getGoodsLabelsByType(Integer type) {
+ public List<LabelsResponse> getGoodsLabelsByType(Integer type,Integer parentId) {
LambdaQueryWrapper<Labels> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Labels::getStatus,Constants.ZERO);
+ wrapper.eq(Labels::getStatus,Constants.ONE);
wrapper.eq(Labels::getIsdeleted,Constants.ZERO);
+ wrapper.eq(Objects.nonNull(parentId),Labels::getParentId,parentId);
wrapper.eq(Labels::getType,type);
wrapper.orderByAsc(Labels::getSortnum,Labels::getCreateDate);
List<Labels> labels = labelsMapper.selectList(wrapper);
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS,Constants.LABELS_IMG).getCode();
List<LabelsResponse> collect = labels.stream().map(s -> {
LabelsResponse labelsResponse = new LabelsResponse();
BeanUtils.copyProperties(s, labelsResponse);
+ if(StringUtils.isNotBlank(s.getImgurl())){
+ labelsResponse.setImgUrl(path + s.getImgurl());
+ }
return labelsResponse;
}).collect(Collectors.toList());
return collect;
--
Gitblit v1.9.3