From e5d1c3fe19960323b0d2eecf21050f11eccf6aeb Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 12 九月 2025 18:55:37 +0800
Subject: [PATCH] 管理端
---
manager-api/src/main/java/cn/lili/controller/lmk/CardPackController.java | 36 ++++++++++++++++++++++++++++++++++++
framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml | 9 +++++++++
framework/src/main/java/cn/lili/modules/lmk/domain/query/CouponVirtualQuery.java | 3 +++
framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVO.java | 2 ++
framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java | 5 +++++
5 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/CouponVirtualQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/CouponVirtualQuery.java
index ba64216..e86c8f9 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/CouponVirtualQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/CouponVirtualQuery.java
@@ -21,5 +21,8 @@
@ApiModel(value = "CouponVirtual鏌ヨ鍙傛暟", description = "铏氭嫙鍟嗗搧浼樻儬鍗锋煡璇㈠弬鏁�")
public class CouponVirtualQuery extends AbsQuery {
private String orderId;
+ private String userNickName;
+
+ private String skuName;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVO.java
index 6393c98..e526df0 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVO.java
@@ -64,6 +64,8 @@
private String original;
+ private String userNickName;
+
public static CouponVirtualVO getVoByEntity(@NonNull CouponVirtual entity, CouponVirtualVO vo) {
if(vo == null) {
vo = new CouponVirtualVO();
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
index 89e1722..5075613 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
@@ -117,6 +117,9 @@
@ApiModelProperty(value = "璁㈠崟淇冮攢绫诲瀷")
private String orderPromotionType;
+ private String couponFlag;
+
+
public <T> QueryWrapper<T> queryWrapper() {
AuthUser currentUser = UserContext.getCurrentUser();
QueryWrapper<T> wrapper = new QueryWrapper<>();
@@ -180,6 +183,8 @@
//鎸夎瘎浠风姸鎬�
wrapper.eq(CharSequenceUtil.isNotEmpty(commentStatus), "oi.comment_status", commentStatus);
+ wrapper.eq(CharSequenceUtil.isNotEmpty(couponFlag),"o.coupon_flag", couponFlag);
+
//鎸夋爣绛炬煡璇�
if (CharSequenceUtil.isNotEmpty(tag)) {
String orderStatusColumn = "o.order_status";
diff --git a/framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml b/framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml
index 16a2ad1..dda1ad7 100644
--- a/framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml
@@ -19,6 +19,7 @@
<result column="update_by" property="updateBy" />
<result column="delete_flag" property="deleteFlag" />
<result column="original" property="original" />
+ <result column="user_nickname" property="userNickName" />
</resultMap>
<select id="getById" resultMap="BaseResultMap">
@@ -61,6 +62,8 @@
LCV.create_time,
LCV.update_by,
LCV.delete_flag,
+ LCV.user_nickname,
+ LCV.id
LCV.id,
LGS.original
FROM
@@ -70,6 +73,12 @@
<if test="query.orderId != null and query.orderId !=''">
AND LCV.order_id = #{query.orderId}
</if>
+ <if test="query.userNickName != null and query.userNickName !=''">
+ AND LCV.user_nickname like CONCAT('%', #{query.userNickName}, '%')
+ </if>
+ <if test="query.skuName != null and query.skuName !=''">
+ AND LCV.sku_name like CONCAT('%', #{query.skuName}, '%')
+ </if>
</select>
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/CardPackController.java b/manager-api/src/main/java/cn/lili/controller/lmk/CardPackController.java
new file mode 100644
index 0000000..0e53834
--- /dev/null
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/CardPackController.java
@@ -0,0 +1,36 @@
+package cn.lili.controller.lmk;
+
+
+import cn.lili.base.Result;
+import cn.lili.modules.lmk.domain.query.CouponVirtualQuery;
+import cn.lili.modules.lmk.service.CouponVirtualService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * lmk-shop-java
+ *
+ * @author : zxl
+ * @date : 2025-09-12 18:11
+ **/
+@Validated
+@RequiredArgsConstructor
+@Api(value = "绀煎搧鍗″寘", tags = "绀煎搧鍗″寘")
+@RestController
+@RequestMapping("/manager/cardPack")
+public class CardPackController {
+ private final CouponVirtualService couponVirtualService;
+
+ @GetMapping
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result getPage(CouponVirtualQuery query){
+ //鏇村叿璁㈠崟id鏌ヨ
+ return couponVirtualService.page(query);
+ }
+
+}
--
Gitblit v1.8.0