From 4735bf93cce99c4cb22c14d52dba12ae6023642f Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 13 十月 2025 16:26:38 +0800
Subject: [PATCH] 定制模块
---
buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java | 22 ++++++++++++++++++++++
buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java | 2 ++
framework/src/main/java/cn/lili/modules/lmk/domain/entity/UserCheckTemplate.java | 4 ++++
framework/src/main/java/cn/lili/modules/lmk/domain/form/CustomizeTemplateForm.java | 3 +++
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java | 6 ++++++
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java | 2 +-
6 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
index 23db668..251c210 100644
--- a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
@@ -9,7 +9,10 @@
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.lmk.domain.entity.UserCheckTemplate;
import cn.lili.modules.lmk.enums.general.AdminRoleEnum;
+import cn.lili.modules.lmk.enums.general.TemplateContentTypeEnum;
+import cn.lili.modules.lmk.service.UserCheckTemplateService;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderPackage;
@@ -27,7 +30,9 @@
import cn.lili.modules.system.entity.vo.Traces;
import cn.lili.utils.COSUtil;
import cn.lili.utils.CommonUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -70,6 +75,8 @@
@Autowired
private AdminUserService adminUserService;
+ @Autowired
+ private UserCheckTemplateService userCheckTemplateService;
@ApiOperation(value = "鏌ヨ浼氬憳璁㈠崟鍒楄〃")
@GetMapping
public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) {
@@ -103,6 +110,21 @@
orderSearchParams.setMemberId(currentUser.getId());
return ResultUtil.data(orderService.queryByXcxParams(orderSearchParams));
}
+ @ApiOperation(value = "鏍规嵁璁㈠崟鍙锋煡璇㈠畾鍒舵ā鏉垮～鍐欎俊鎭�")
+ @GetMapping("/customize/{sn}")
+ public ResultMessage<List<UserCheckTemplate>> customize(@PathVariable @NotBlank String sn) {
+ LambdaQueryWrapper<UserCheckTemplate> eq = Wrappers.<UserCheckTemplate>lambdaQuery().eq(UserCheckTemplate::getOrderSn, sn);
+ List<UserCheckTemplate> list = userCheckTemplateService.list(eq);
+ for (UserCheckTemplate userCheckTemplate : list) {
+ if (TemplateContentTypeEnum.IMAGE.name().equals(userCheckTemplate.getContentType())) {
+ String content = userCheckTemplate.getContent();
+ if (StringUtils.isNotBlank(content)&&!content.contains("http")) {
+ userCheckTemplate.setContent(cosUtil.getPreviewUrl(content));
+ }
+ }
+ }
+ return ResultUtil.data(list);
+ }
@ApiOperation(value = "璁㈠崟鏄庣粏")
@ApiImplicitParams({
diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
index 9fc0b62..260219a 100644
--- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
@@ -62,7 +62,9 @@
String orderSns = cashierParam.getOrderSns();
for (CustomizeTemplateForm customizeTemplateForm : templateForm) {
UserCheckTemplate userCheckTemplate = new UserCheckTemplate();
+ userCheckTemplate.setContentType(customizeTemplateForm.getContentType());
userCheckTemplate.setChooseImg(payParam.getChooseImage());
+ userCheckTemplate.setChooseImgId(payParam.getChooseImageId());
userCheckTemplate.setTemplateName(payParam.getTemplateName());
userCheckTemplate.setTemplateId(payParam.getTemplateId());
userCheckTemplate.setOrderSn(orderSns);
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/UserCheckTemplate.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/UserCheckTemplate.java
index 76d8d7e..649bb1d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/UserCheckTemplate.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/UserCheckTemplate.java
@@ -49,5 +49,9 @@
/** 閫夋嫨妯℃澘鍥剧墖 */
private String chooseImg;
+ @TableField("content_type")
+ /** 妯℃澘鏂囨湰绫诲瀷 */
+ private String contentType;
+
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/CustomizeTemplateForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/CustomizeTemplateForm.java
index 0841a94..b2f0770 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/CustomizeTemplateForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/CustomizeTemplateForm.java
@@ -16,4 +16,7 @@
/** 瀛愭ā鏉垮��*/
private String value;
+ /** 瀛愭ā鏉跨被鍨�*/
+ private String contentType;
+
}
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java
index 440fc4b..2c9941e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java
@@ -160,6 +160,12 @@
@ApiModelProperty(value = "鏄惁鏄ぜ鍝佸崱")
private String couponFlag;
+ /**
+ * @see cn.lili.modules.order.order.entity.enums.CustomizeFlagEnum
+ */
+ @ApiModelProperty(value = "鏄惁鏄畾鍒跺晢鍝�")
+ private String customizeFlag;
+
private int i = 0;
public List<OrderItemVO> initOrderItems() {
if (CharSequenceUtil.isEmpty(groupGoodsId)) {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
index 238bbc7..59d35b1 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
@@ -145,7 +145,7 @@
* @return 绠�鐭鍗曞垎椤�
*/
@Select("select o.id,o.sn,o.flow_price,o.create_time,o.order_status,o.pay_status,o.payment_method,o.payment_time,o.member_name,o.store_name as " +
- "store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status,o.order_promotion_type,o.seller_remark,o.coupon_flag " +
+ "store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status,o.order_promotion_type,o.seller_remark,o.coupon_flag,o.customize_flag " +
",GROUP_CONCAT(oi.goods_id) as group_goods_id," +
" GROUP_CONCAT(oi.sku_id) as group_sku_id," +
" GROUP_CONCAT(oi.num) as group_num" +
--
Gitblit v1.8.0