From 8fd3db7778b3991810d33ac4dffd2f9031b106fc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 16:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/domain/query/GoodsCustomizeTemplateQuery.java | 4
seller-api/src/main/java/cn/lili/controller/template/GoodsCustomizeTemplateController.java | 55 +++++++++
framework/src/main/java/cn/lili/modules/lmk/domain/form/GoodsCustomizeTemplateForm.java | 7 +
framework/src/main/java/cn/lili/modules/lmk/enums/general/TemplateContentTypeEnum.java | 22 +++
framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java | 9 +
framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java | 20 +++
framework/src/main/java/cn/lili/modules/lmk/domain/entity/GoodsCustomizeTemplate.java | 5
framework/src/main/java/cn/lili/modules/lmk/domain/entity/TemplateImgs.java | 7 +
framework/src/main/java/cn/lili/modules/lmk/service/GoodsCustomizeTemplateService.java | 5
framework/src/main/java/cn/lili/modules/lmk/domain/entity/TemplateConstomizeTitle.java | 11 +
framework/src/main/java/cn/lili/modules/lmk/domain/vo/GoodsCustomizeTemplateVO.java | 6 +
framework/src/main/java/cn/lili/modules/lmk/service/impl/GoodsCustomizeTemplateServiceImpl.java | 116 +++++++++++++++++++
framework/src/main/resources/mapper/lmk/VideoMapper.xml | 1
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java | 7 +
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java | 44 ++++++
framework/src/main/resources/mapper/lmk/GoodsCustomizeTemplateMapper.xml | 12 +-
16 files changed, 314 insertions(+), 17 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
index c934cdc..72a1f33 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
@@ -252,6 +252,13 @@
sku.remove("couponId");
sku.remove("couponName");
}
+ Object templateId = sku.get("customizeTemplateId");
+ if (templateId == null || StringUtil.isEmpty(templateId.toString())) {
+ sku.remove("customizeTemplateId");
+ sku.remove("customizeTemplateName");
+ }
+
+
sku.values().forEach(i -> {
if (CharSequenceUtil.isBlank(i.toString())) {
throw new ServiceException(ResultCode.MUST_HAVE_GOODS_SKU_VALUE);
diff --git a/framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java b/framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java
index 8e121d0..2ad57a2 100644
--- a/framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java
+++ b/framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java
@@ -7,6 +7,7 @@
import cn.lili.common.utils.StringUtils;
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dos.GoodsSku;
+import cn.lili.modules.order.order.entity.enums.CustomizeFlagEnum;
import org.springframework.stereotype.Component;
import java.util.*;
@@ -65,7 +66,7 @@
Map<String, Object> specMap = new LinkedHashMap<>();
// 鍘熷瑙勬牸椤�
- String[] ignoreOriginKeys = {"id", "sn", "cost", "price", "quantity", "weight", "alertQuantity","couponId","couponName"};
+ String[] ignoreOriginKeys = {"id", "sn", "cost", "price", "quantity", "weight", "alertQuantity","couponId","couponName","customizeTemplateId","customizeTemplateName"};
//鑾峰彇瑙勬牸淇℃伅
for (Map.Entry<String, Object> spec : skuInfo.entrySet()) {
//淇濆瓨鏂板瑙勬牸淇℃伅
@@ -87,7 +88,22 @@
if(StringUtils.isNotBlank(Convert.toStr(skuInfo.get("couponId")))){
goodsSku.setCouponId(Convert.toStr(skuInfo.get("couponId"),""));
}
-
+ boolean have = true;
+ if(StringUtils.isNotBlank(Convert.toStr(skuInfo.get("customizeTemplateId")))){
+ goodsSku.setCustomizeTemplateId(Convert.toStr(skuInfo.get("customizeTemplateId"),""));
+ }else{
+ have = false;
+ }
+ if(StringUtils.isNotBlank(Convert.toStr(skuInfo.get("customizeTemplateName")))){
+ goodsSku.setCustomizeTemplateName(Convert.toStr(skuInfo.get("customizeTemplateName"),""));
+ }else {
+ have = false;
+ }
+ if (have){
+ goodsSku.setCustomizeFlag(CustomizeFlagEnum.CUSTOMIZE.name());
+ }else{
+ goodsSku.setCustomizeFlag(CustomizeFlagEnum.NOT_CUSTOMIZE.name());
+ }
goodsSku.setCouponName(Convert.toStr(skuInfo.get("couponName"),""));
goodsSku.setId(Convert.toStr(skuInfo.get("id"), ""));
goodsSku.setSn(Convert.toStr(skuInfo.get("sn")));
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/GoodsCustomizeTemplate.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/GoodsCustomizeTemplate.java
index 74bf2bd..06f5de1 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/GoodsCustomizeTemplate.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/GoodsCustomizeTemplate.java
@@ -22,7 +22,10 @@
private String templateName;
@TableField("status")
- /** 鍚敤鐘舵�� */
+ /**
+ * 鍚敤鐘舵��
+ * @see cn.lili.modules.lmk.enums.general.EnableStatusEnums
+ */
private String status;
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/TemplateConstomizeTitle.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/TemplateConstomizeTitle.java
index c2f70b0..37c1e9e 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/TemplateConstomizeTitle.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/TemplateConstomizeTitle.java
@@ -3,7 +3,9 @@
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* 妯℃澘鏍囬
@@ -12,6 +14,8 @@
* @since 2025-10-09
*/
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@TableName("lmk_template_constomize_title")
public class TemplateConstomizeTitle extends BaseEntity {
@@ -27,7 +31,14 @@
@TableField("content_type")
/** 鏍囬绫诲瀷 */
+ /**
+ * @see cn.lili.modules.lmk.enums.general.TemplateContentTypeEnum
+ */
private String contentType;
+ public TemplateConstomizeTitle(String templateTitle,String contentType) {
+ this.templateTitle = templateTitle;
+ this.contentType = contentType;
+ }
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/TemplateImgs.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/TemplateImgs.java
index dbbc967..2a4076a 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/TemplateImgs.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/TemplateImgs.java
@@ -3,7 +3,9 @@
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* 妯℃澘鍥剧墖
@@ -12,6 +14,8 @@
* @since 2025-10-09
*/
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@TableName("lmk_template_imgs")
public class TemplateImgs extends BaseEntity {
@@ -25,5 +29,8 @@
/** 鍥剧墖鍦板潃 */
private String imgUrl;
+ public TemplateImgs(String imgUrl) {
+ this.imgUrl = imgUrl; // 鍙祴鍊糹mgUrl锛屽叾浠栧瓧娈碉紙濡倀emplateId锛夊彲鍚庣画閫氳繃涓氬姟閫昏緫琛ュ厖
+ }
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/GoodsCustomizeTemplateForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/GoodsCustomizeTemplateForm.java
index 043deca..b6f55b3 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/GoodsCustomizeTemplateForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/GoodsCustomizeTemplateForm.java
@@ -4,6 +4,8 @@
import cn.lili.group.Add;
import cn.lili.base.AbsForm;
import cn.lili.modules.lmk.domain.entity.GoodsCustomizeTemplate;
+import cn.lili.modules.lmk.domain.entity.TemplateConstomizeTitle;
+import cn.lili.modules.lmk.domain.entity.TemplateImgs;
import org.springframework.beans.BeanUtils;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -12,6 +14,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 瀹氬埗鍟嗗搧妯℃澘琛ㄥ崟
@@ -31,6 +34,10 @@
@ApiModelProperty("鍚敤鐘舵��")
private String status;
+ private List<TemplateConstomizeTitle> titles;
+
+ private List<TemplateImgs> listImages;
+
public static GoodsCustomizeTemplate getEntityByForm(@NonNull GoodsCustomizeTemplateForm form, GoodsCustomizeTemplate entity) {
if(entity == null) {
entity = new GoodsCustomizeTemplate();
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/GoodsCustomizeTemplateQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/GoodsCustomizeTemplateQuery.java
index 9e30eda..dd5c816 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/GoodsCustomizeTemplateQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/GoodsCustomizeTemplateQuery.java
@@ -18,5 +18,9 @@
@Data
@ApiModel(value = "GoodsCustomizeTemplate鏌ヨ鍙傛暟", description = "瀹氬埗鍟嗗搧妯℃澘鏌ヨ鍙傛暟")
public class GoodsCustomizeTemplateQuery extends AbsQuery {
+ private String templateName;
+
+ private String status;
+
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/GoodsCustomizeTemplateVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/GoodsCustomizeTemplateVO.java
index f3f54f1..63e2b29 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/GoodsCustomizeTemplateVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/GoodsCustomizeTemplateVO.java
@@ -3,6 +3,9 @@
import cn.lili.base.AbsVo;
import cn.lili.modules.lmk.domain.entity.GoodsCustomizeTemplate;
import java.util.List;
+
+import cn.lili.modules.lmk.domain.entity.TemplateConstomizeTitle;
+import cn.lili.modules.lmk.domain.entity.TemplateImgs;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
@@ -28,6 +31,9 @@
@ApiModelProperty("鍚敤鐘舵��")
private String status;
+ private List<TemplateImgs> listImages;
+ private List<TemplateConstomizeTitle> titles;
+
public static GoodsCustomizeTemplateVO getVoByEntity(@NonNull GoodsCustomizeTemplate entity, GoodsCustomizeTemplateVO vo) {
if(vo == null) {
vo = new GoodsCustomizeTemplateVO();
diff --git a/framework/src/main/java/cn/lili/modules/lmk/enums/general/TemplateContentTypeEnum.java b/framework/src/main/java/cn/lili/modules/lmk/enums/general/TemplateContentTypeEnum.java
new file mode 100644
index 0000000..f1c53fc
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/enums/general/TemplateContentTypeEnum.java
@@ -0,0 +1,22 @@
+package cn.lili.modules.lmk.enums.general;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * lmk-shop-java
+ *
+ * @author : zxl
+ * @date : 2025-10-10 15:37
+ **/
+@Getter
+@AllArgsConstructor
+public enum TemplateContentTypeEnum {
+ /**
+ * 绫诲瀷
+ */
+ TEXT("鏂囨湰"),
+ IMAGE("鍥剧墖");
+ private final String description;
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/GoodsCustomizeTemplateService.java b/framework/src/main/java/cn/lili/modules/lmk/service/GoodsCustomizeTemplateService.java
index 4e17f8e..acd40ca 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/GoodsCustomizeTemplateService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/GoodsCustomizeTemplateService.java
@@ -1,6 +1,7 @@
package cn.lili.modules.lmk.service;
import cn.lili.modules.lmk.domain.entity.GoodsCustomizeTemplate;
+import cn.lili.modules.lmk.domain.vo.GoodsCustomizeTemplateVO;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.lili.base.Result;
import cn.lili.modules.lmk.domain.form.GoodsCustomizeTemplateForm;
@@ -57,6 +58,8 @@
*/
Result detail(String id);
+ GoodsCustomizeTemplateVO detailById(String id);
+
/**
* 鍒楄〃
* @return
@@ -64,4 +67,6 @@
Result all();
Result getCustomizeTemplate(String id);
+
+ Result changeStatus(String id);
}
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 46ad265..9e38933 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,5 +1,10 @@
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.modules.lmk.enums.general.EnableStatusEnums;
+import cn.lili.modules.lmk.service.TemplateConstomizeTitleService;
+import cn.lili.modules.lmk.service.TemplateImgsService;
import cn.lili.common.utils.StringUtils;
import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.goods.service.GoodsSkuService;
@@ -11,6 +16,7 @@
import cn.lili.modules.lmk.mapper.GoodsCustomizeTemplateMapper;
import cn.lili.modules.lmk.service.GoodsCustomizeTemplateService;
import cn.lili.base.Result;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.lili.modules.lmk.domain.form.GoodsCustomizeTemplateForm;
import cn.lili.modules.lmk.domain.vo.GoodsCustomizeTemplateVO;
@@ -20,6 +26,7 @@
import lombok.RequiredArgsConstructor;
import cn.lili.utils.PageUtil;
import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.List;
@@ -37,6 +44,8 @@
private final GoodsCustomizeTemplateMapper goodsCustomizeTemplateMapper;
+ private final TemplateImgsService templateImgsService;
+ private final TemplateConstomizeTitleService templateConstomizeTitleService;
private final GoodsSkuService goodsSkuService;
private final COSUtil cosUtil;
@@ -46,9 +55,24 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result add(GoodsCustomizeTemplateForm form) {
GoodsCustomizeTemplate entity = GoodsCustomizeTemplateForm.getEntityByForm(form, null);
+ entity.setStatus(EnableStatusEnums.ENABLE.name());
baseMapper.insert(entity);
+
+ String templateId = entity.getId();
+
+ List<TemplateImgs> listImages = form.getListImages();
+ for (TemplateImgs templateImgs : listImages) {
+ templateImgs.setTemplateId(templateId);
+ }
+ List<TemplateConstomizeTitle> titles = form.getTitles();
+ for (TemplateConstomizeTitle title : titles) {
+ title.setTemplateId(templateId);
+ }
+ templateImgsService.saveBatch(listImages);
+ templateConstomizeTitleService.saveBatch(titles);
return Result.ok("娣诲姞鎴愬姛");
}
@@ -58,12 +82,47 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result update(GoodsCustomizeTemplateForm form) {
GoodsCustomizeTemplate entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+
+ //鍏堝垹闄や箣鍓嶇殑妯℃澘淇℃伅鐒跺悗娣诲姞鏂颁俊鎭�
+ List<TemplateImgs> templateImgsList = new LambdaQueryChainWrapper<>(templateImgsService.getBaseMapper())
+ .eq(TemplateImgs::getTemplateId, entity.getId())
+ .eq(TemplateImgs::getDeleteFlag, Boolean.FALSE)
+ .list();
+
+ List<String> imgIds = templateImgsList.stream()
+ .map(TemplateImgs::getId)
+ .collect(Collectors.toList());
+
+ List<TemplateConstomizeTitle> templateConstomizeTitleList = new LambdaQueryChainWrapper<>(templateConstomizeTitleService.getBaseMapper())
+ .eq(TemplateConstomizeTitle::getTemplateId, entity.getId())
+ .eq(TemplateConstomizeTitle::getDeleteFlag, Boolean.FALSE)
+ .list();
+
+ List<String> titleIds = templateConstomizeTitleList.stream()
+ .map(TemplateConstomizeTitle::getId)
+ .collect(Collectors.toList());
+
+
+ templateImgsService.removeBatchByIds(imgIds);
+ templateConstomizeTitleService.removeBatchByIds(titleIds);
+ List<TemplateImgs> listImages = form.getListImages();
+ for (TemplateImgs templateImgs : listImages) {
+ templateImgs.setTemplateId(entity.getId());
+ }
+ List<TemplateConstomizeTitle> titles = form.getTitles();
+ for (TemplateConstomizeTitle title : titles) {
+ title.setTemplateId(entity.getId());
+ }
+ templateImgsService.saveBatch(listImages);
+ templateConstomizeTitleService.saveBatch(titles);
+
+
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -85,8 +144,32 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result removeById(String id) {
+ List<TemplateImgs> templateImgsList = new LambdaQueryChainWrapper<>(templateImgsService.getBaseMapper())
+ .eq(TemplateImgs::getTemplateId, id)
+ .eq(TemplateImgs::getDeleteFlag, Boolean.FALSE)
+ .list();
+
+ List<String> imgIds = templateImgsList.stream()
+ .map(TemplateImgs::getId)
+ .collect(Collectors.toList());
+
+ List<TemplateConstomizeTitle> templateConstomizeTitleList = new LambdaQueryChainWrapper<>(templateConstomizeTitleService.getBaseMapper())
+ .eq(TemplateConstomizeTitle::getTemplateId, id)
+ .eq(TemplateConstomizeTitle::getDeleteFlag, Boolean.FALSE)
+ .list();
+
+ List<String> titleIds = templateConstomizeTitleList.stream()
+ .map(TemplateConstomizeTitle::getId)
+ .collect(Collectors.toList());
+
+
+ templateImgsService.removeBatchByIds(imgIds);
+ templateConstomizeTitleService.removeBatchByIds(titleIds);
+
baseMapper.deleteById(id);
+
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -109,9 +192,26 @@
*/
@Override
public Result detail(String id) {
+ return Result.ok().data(this.detailById(id));
+ }
+ @Override
+ public GoodsCustomizeTemplateVO detailById(String id){
GoodsCustomizeTemplateVO vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
- return Result.ok().data(vo);
+ //鏌ヨ鐩稿叧妯℃澘淇℃伅
+
+ List<TemplateImgs> templateImgsList = new LambdaQueryChainWrapper<>(templateImgsService.getBaseMapper())
+ .eq(TemplateImgs::getTemplateId, id)
+ .eq(TemplateImgs::getDeleteFlag, Boolean.FALSE)
+ .list();
+
+ List<TemplateConstomizeTitle> templateConstomizeTitleList = new LambdaQueryChainWrapper<>(templateConstomizeTitleService.getBaseMapper())
+ .eq(TemplateConstomizeTitle::getTemplateId, id)
+ .eq(TemplateConstomizeTitle::getDeleteFlag, Boolean.FALSE)
+ .list();
+ vo.setListImages(templateImgsList);
+ vo.setTitles(templateConstomizeTitleList);
+ return vo;
}
/**
@@ -128,6 +228,18 @@
}
@Override
+ public Result changeStatus(String id) {
+ GoodsCustomizeTemplate goodsCustomizeTemplate = baseMapper.selectById(id);
+ if (EnableStatusEnums.ENABLE.name().equals(goodsCustomizeTemplate.getStatus())){
+ goodsCustomizeTemplate.setStatus(EnableStatusEnums.DISABLE.name());
+ }else{
+ goodsCustomizeTemplate.setStatus(EnableStatusEnums.ENABLE.name());
+ }
+ baseMapper.updateById(goodsCustomizeTemplate);
+ return Result.ok();
+ }
+
+ @Override
public Result getCustomizeTemplate(String id) {
GoodsSku goodsSku = goodsSkuService.getById(id);
String templateId = goodsSku.getCustomizeTemplateId();
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
index fb2387a..b8ca3fd 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
@@ -5,6 +5,7 @@
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.common.utils.BeanUtil;
import cn.lili.common.utils.SnowFlake;
+import cn.lili.modules.lmk.domain.vo.GoodsCustomizeTemplateVO;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
import cn.lili.modules.order.cart.entity.vo.CartVO;
@@ -15,12 +16,14 @@
import cn.lili.modules.order.order.entity.enums.RefundStatusEnum;
import cn.lili.modules.promotion.entity.vos.PromotionSkuVO;
import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Transient;
import java.math.BigDecimal;
import java.util.stream.Collectors;
@@ -138,7 +141,11 @@
@ApiModelProperty(value = "鎶芥垚姣斾緥")
private BigDecimal commission;
-
+
+ @ApiModelProperty(value = "鍟嗗搧瀹氬埗妯℃澘VO")
+ @TableField(exist = false)
+ private GoodsCustomizeTemplateVO goodsCustomizeTemplateVO;
+
public Integer getDeliverNumber() {
if(deliverNumber == null){
return 0;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java
index 60cb3c9..ff75521 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java
@@ -2,24 +2,31 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.text.CharSequenceUtil;
+import cn.lili.base.Result;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
+import cn.lili.common.utils.StringUtils;
+import cn.lili.modules.goods.entity.dos.GoodsSku;
+import cn.lili.modules.goods.service.GoodsSkuService;
+import cn.lili.modules.lmk.domain.vo.GoodsCustomizeTemplateVO;
+import cn.lili.modules.lmk.service.GoodsCustomizeTemplateService;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.entity.dto.OrderItemOperationDTO;
-import cn.lili.modules.order.order.entity.enums.CommentStatusEnum;
-import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum;
-import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum;
-import cn.lili.modules.order.order.entity.enums.RefundStatusEnum;
+import cn.lili.modules.order.order.entity.enums.*;
import cn.lili.modules.order.order.mapper.OrderItemMapper;
import cn.lili.modules.order.order.service.OrderItemService;
+import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 瀛愯鍗曚笟鍔″眰瀹炵幇
@@ -28,7 +35,11 @@
* @since 2020/11/17 7:38 涓嬪崍
*/
@Service
+@RequiredArgsConstructor
public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem> implements OrderItemService {
+ private final GoodsCustomizeTemplateService goodsCustomizeTemplateService;
+ private final GoodsSkuService skuService;
+ private final COSUtil cosUtil;
@Override
public void updateCommentStatus(String orderItemSn, CommentStatusEnum commentStatusEnum) {
@@ -87,7 +98,30 @@
public List<OrderItem> getByOrderSn(String orderSn) {
LambdaQueryWrapper<OrderItem> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(OrderItem::getOrderSn, orderSn);
- return this.list(lambdaQueryWrapper);
+ //鏌ヨ姣忎釜 skuId瀵瑰簲鐨勫晢鍝� 鏄惁鏄畾鍒跺晢鍝� 锛屾槸鍒欐煡璇㈠嚭妯℃澘淇℃伅
+ List<OrderItem> list = this.list(lambdaQueryWrapper);
+
+ for (OrderItem orderItem : list) {
+ GoodsSku goodsSku = new LambdaQueryChainWrapper<>(skuService.getBaseMapper())
+ .eq(GoodsSku::getId, orderItem.getSkuId())
+ .eq(GoodsSku::getDeleteFlag, Boolean.FALSE)
+ .one();
+ if (goodsSku != null && CustomizeFlagEnum.CUSTOMIZE.name().equals(goodsSku.getCustomizeFlag())) {
+ if (goodsSku.getCustomizeTemplateId() != null){
+ GoodsCustomizeTemplateVO goodsCustomizeTemplateVO = goodsCustomizeTemplateService.detailById(goodsSku.getCustomizeTemplateId());
+ goodsCustomizeTemplateVO.getListImages().forEach(item ->{
+ if (StringUtils.isNotBlank(item.getImgUrl()) && !item.getImgUrl().contains("http")){
+ item.setImgUrl(cosUtil.getPreviewUrl(item.getImgUrl()));
+ }
+ });
+
+ orderItem.setGoodsCustomizeTemplateVO(goodsCustomizeTemplateVO);
+
+ }
+ }
+
+ }
+ return list;
}
@Override
diff --git a/framework/src/main/resources/mapper/lmk/GoodsCustomizeTemplateMapper.xml b/framework/src/main/resources/mapper/lmk/GoodsCustomizeTemplateMapper.xml
index 47018a2..470805f 100644
--- a/framework/src/main/resources/mapper/lmk/GoodsCustomizeTemplateMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/GoodsCustomizeTemplateMapper.xml
@@ -9,12 +9,6 @@
<result column="status" property="status" />
</resultMap>
-
-
-
-
-
-
<select id="getById" resultMap="BaseResultMap">
SELECT
LGCT.template_name,
@@ -36,6 +30,12 @@
lmk_goods_customize_template LGCT
WHERE
LGCT.delete_flag = 0
+ <if test="query.templateName != null and query.templateName !=''">
+ AND LGCT.template_name LIKE CONCAT('%',#{query.templateName},'%')
+ </if>
+ <if test="query.status != null and query.status !=''">
+ AND LGCT.status = #{query.status}
+ </if>
</select>
<resultMap id="getCustomizeTemplateMap" type="cn.lili.modules.lmk.domain.vo.CustomizeTemplateVO">
<id property="id" column="id"/>
diff --git a/framework/src/main/resources/mapper/lmk/VideoMapper.xml b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
index b6dc81b..dc56251 100644
--- a/framework/src/main/resources/mapper/lmk/VideoMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
@@ -336,6 +336,7 @@
AND LV.video_type = #{query.videoType}
AND LM.id IS NOT NULL
ORDER BY
+ recommend DESC,
create_time DESC
</select>
<select id="recommendVideoByVideoId" resultMap="WxResultMap">
diff --git a/seller-api/src/main/java/cn/lili/controller/template/GoodsCustomizeTemplateController.java b/seller-api/src/main/java/cn/lili/controller/template/GoodsCustomizeTemplateController.java
new file mode 100644
index 0000000..0d3eccb
--- /dev/null
+++ b/seller-api/src/main/java/cn/lili/controller/template/GoodsCustomizeTemplateController.java
@@ -0,0 +1,55 @@
+package cn.lili.controller.template;
+
+
+import cn.lili.base.Result;
+import cn.lili.modules.lmk.domain.entity.GoodsCustomizeTemplate;
+import cn.lili.modules.lmk.domain.form.GoodsCustomizeTemplateForm;
+import cn.lili.modules.lmk.domain.query.GoodsCustomizeTemplateQuery;
+import cn.lili.modules.lmk.service.GoodsCustomizeTemplateService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.parameters.P;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * lmk-shop-java
+ * 瀹氬埗鍟嗗搧妯℃澘
+ * @author : zxl
+ * @date : 2025-10-10 11:46
+ **/
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/store/lmk/goodsCustomizeTemplate")
+public class GoodsCustomizeTemplateController {
+
+ private final GoodsCustomizeTemplateService goodsCustomizeTemplateService;
+
+ @GetMapping()
+ public Result getPage(GoodsCustomizeTemplateQuery query){
+ return goodsCustomizeTemplateService.page(query);
+ }
+ @GetMapping("/{id}")
+ public Result getById(@PathVariable String id){
+ return goodsCustomizeTemplateService.detail(id);
+ }
+
+ @PostMapping()
+ public Result add(@RequestBody GoodsCustomizeTemplateForm form){
+ return goodsCustomizeTemplateService.add(form);
+ }
+
+ @PutMapping()
+ public Result edit(@RequestBody GoodsCustomizeTemplateForm form){
+ return goodsCustomizeTemplateService.update(form);
+ }
+
+ @PutMapping("/changeStatus/{id}")
+ public Result changeStatus(@PathVariable String id){
+ return goodsCustomizeTemplateService.changeStatus(id);
+ }
+ @DeleteMapping("/{id}")
+ public Result delete(@PathVariable String id){
+ return goodsCustomizeTemplateService.removeById(id);
+ }
+
+
+}
--
Gitblit v1.8.0