From 40d3bb9fe638a0bd79e829e7fd5114871101390b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 20 十一月 2025 10:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/GoodsCustomizeTemplateServiceImpl.java | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/GoodsCustomizeTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/GoodsCustomizeTemplateServiceImpl.java
index 9e38933..0887c7c 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/GoodsCustomizeTemplateServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/GoodsCustomizeTemplateServiceImpl.java
@@ -1,7 +1,8 @@
package cn.lili.modules.lmk.service.impl;
-import cn.lili.modules.lmk.domain.entity.TemplateConstomizeTitle;
-import cn.lili.modules.lmk.domain.entity.TemplateImgs;
+import cn.lili.common.enums.ResultUtil;
+import cn.lili.modules.lmk.domain.entity.*;
+import cn.lili.modules.lmk.domain.form.CustomizeTemplateForm;
import cn.lili.modules.lmk.enums.general.EnableStatusEnums;
import cn.lili.modules.lmk.service.TemplateConstomizeTitleService;
import cn.lili.modules.lmk.service.TemplateImgsService;
@@ -10,12 +11,15 @@
import cn.lili.modules.goods.service.GoodsSkuService;
import cn.lili.modules.lmk.domain.entity.TemplateImgs;
import cn.lili.modules.lmk.domain.vo.CustomizeTemplateVO;
+import cn.lili.modules.lmk.service.UserCheckTemplateService;
+import cn.lili.modules.order.cart.entity.vo.BindingTemplateParam;
import cn.lili.utils.COSUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import cn.lili.modules.lmk.domain.entity.GoodsCustomizeTemplate;
import cn.lili.modules.lmk.mapper.GoodsCustomizeTemplateMapper;
import cn.lili.modules.lmk.service.GoodsCustomizeTemplateService;
import cn.lili.base.Result;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.lili.modules.lmk.domain.form.GoodsCustomizeTemplateForm;
@@ -29,6 +33,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -47,6 +52,7 @@
private final TemplateImgsService templateImgsService;
private final TemplateConstomizeTitleService templateConstomizeTitleService;
private final GoodsSkuService goodsSkuService;
+ private final UserCheckTemplateService userCheckTemplateService;
private final COSUtil cosUtil;
/**
@@ -240,21 +246,68 @@
}
@Override
+ public Result getCustomizeTemplateById(String id) {
+ CustomizeTemplateVO customizeTemplate = baseMapper.getCustomizeTemplate(id);
+// if (customizeTemplate != null) {
+// List<TemplateImgs> templateImgs = customizeTemplate.getTemplateImgs();
+// if (!templateImgs.isEmpty()) {
+// for (TemplateImgs templateImg : templateImgs) {
+// String imgUrl = templateImg.getImgUrl();
+// if (StringUtils.isNotBlank(imgUrl)&&!imgUrl.contains("http")) {
+// templateImg.setImgUrl(cosUtil.getPreviewUrl(imgUrl));
+// }
+// }
+// }
+// }
+ return Result.ok().data(customizeTemplate);
+ }
+
+ @Override
public Result getCustomizeTemplate(String id) {
GoodsSku goodsSku = goodsSkuService.getById(id);
String templateId = goodsSku.getCustomizeTemplateId();
CustomizeTemplateVO customizeTemplate = baseMapper.getCustomizeTemplate(templateId);
- if (customizeTemplate != null) {
- List<TemplateImgs> templateImgs = customizeTemplate.getTemplateImgs();
- if (!templateImgs.isEmpty()) {
- for (TemplateImgs templateImg : templateImgs) {
- String imgUrl = templateImg.getImgUrl();
- if (StringUtils.isNotBlank(imgUrl)&&!imgUrl.contains("http")) {
- templateImg.setImgUrl(cosUtil.getPreviewUrl(imgUrl));
- }
- }
- }
- }
+// if (customizeTemplate != null) {
+// List<TemplateImgs> templateImgs = customizeTemplate.getTemplateImgs();
+// if (!templateImgs.isEmpty()) {
+// for (TemplateImgs templateImg : templateImgs) {
+// String imgUrl = templateImg.getImgUrl();
+// if (StringUtils.isNotBlank(imgUrl)&&!imgUrl.contains("http")) {
+// templateImg.setImgUrl(cosUtil.getPreviewUrl(imgUrl));
+// }
+// }
+// }
+// }
return Result.ok().data(customizeTemplate);
}
+
+ @Override
+ @Transactional
+ public Result editTemplate(BindingTemplateParam bindingTemplateParam) {
+ LambdaQueryWrapper<UserCheckTemplate> del = Wrappers.<UserCheckTemplate>lambdaQuery();
+ del.eq(UserCheckTemplate::getOrderSn,bindingTemplateParam.getSn())
+ .eq(UserCheckTemplate::getTemplateId,bindingTemplateParam.getTemplateId());
+ userCheckTemplateService.remove(del);
+ //瀹氬埗鍟嗗搧鐗规畩澶勭悊
+ if (StringUtils.isNotBlank(bindingTemplateParam.getTemplateId())){
+ List<CustomizeTemplateForm> templateForm = bindingTemplateParam.getTemplateForm();
+ List<UserCheckTemplate> customizeTemplateForms = new ArrayList<>();
+ for (CustomizeTemplateForm customizeTemplateForm : templateForm) {
+ UserCheckTemplate userCheckTemplate = new UserCheckTemplate();
+ userCheckTemplate.setContentType(customizeTemplateForm.getContentType());
+ userCheckTemplate.setChooseImg(bindingTemplateParam.getChooseImage());
+ userCheckTemplate.setChooseImgId(bindingTemplateParam.getChooseImageId());
+ userCheckTemplate.setTemplateName(bindingTemplateParam.getTemplateName());
+ userCheckTemplate.setTemplateId(bindingTemplateParam.getTemplateId());
+ userCheckTemplate.setOrderSn(bindingTemplateParam.getSn());
+ userCheckTemplate.setSubId(customizeTemplateForm.getId());
+ userCheckTemplate.setSubName(customizeTemplateForm.getTemplateTitle());
+ userCheckTemplate.setContent(customizeTemplateForm.getValue());
+ customizeTemplateForms.add(userCheckTemplate);
+ }
+ userCheckTemplateService.saveBatch(customizeTemplateForms);
+
+ }
+ return Result.ok();
+ }
}
--
Gitblit v1.8.0