From 7920beb7c7ed85e87721761e1b406e4a4890beb8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 12 九月 2025 14:55:51 +0800
Subject: [PATCH] 虚拟商品优惠劵
---
buyer-api/src/main/java/cn/lili/controller/lmk/CouponVirtualController.java | 37 +++++++++++++++++++++++++++++++++++++
framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml | 6 +++++-
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 | 4 ++--
framework/src/main/java/cn/lili/modules/lmk/domain/query/CouponVirtualQuery.java | 1 +
framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVO.java | 2 ++
6 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/CouponVirtualController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/CouponVirtualController.java
new file mode 100644
index 0000000..26d7f0d
--- /dev/null
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/CouponVirtualController.java
@@ -0,0 +1,37 @@
+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 com.baomidou.mybatisplus.core.metadata.IPage;
+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 09:41
+ **/
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/buyer/lmk/couponVirtual")
+public class CouponVirtualController {
+
+ private final CouponVirtualService couponVirtualService;
+
+ @GetMapping()
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result getPage(CouponVirtualQuery query){
+ //鏇村叿璁㈠崟id鏌ヨ
+ return couponVirtualService.page(query);
+ }
+
+}
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 43e14c2..ba64216 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
@@ -20,5 +20,6 @@
@Data
@ApiModel(value = "CouponVirtual鏌ヨ鍙傛暟", description = "铏氭嫙鍟嗗搧浼樻儬鍗锋煡璇㈠弬鏁�")
public class CouponVirtualQuery extends AbsQuery {
+ private String orderId;
}
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 07768e7..180b8be 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
@@ -59,6 +59,8 @@
private String claimStatus;
+ private Boolean deleteFlag;
+
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/vo/OrderSimpleXcxVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java
index 811f3d4..440fc4b 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
@@ -27,6 +27,8 @@
@Data
public class OrderSimpleXcxVO {
+ private String id;
+
@ApiModelProperty("sn")
private String sn;
@@ -154,6 +156,10 @@
@ApiModelProperty(value = "鍗栧璁㈠崟澶囨敞")
private String sellerRemark;
+
+ @ApiModelProperty(value = "鏄惁鏄ぜ鍝佸崱")
+ private String couponFlag;
+
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 80f5579..b300072 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
@@ -141,8 +141,8 @@
* @param queryWrapper 鏌ヨ鏉′欢
* @return 绠�鐭鍗曞垎椤�
*/
- @Select("select 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 " +
+ @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 " +
",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" +
diff --git a/framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml b/framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml
index 44f678c..9db5226 100644
--- a/framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml
@@ -64,7 +64,11 @@
FROM
lmk_coupon_virtual LCV
WHERE
- LCV.deleted = 0
+ LCV.delete_flag = 0
+ <if test="query.orderId != null and query.orderId !=''">
+ AND LCV.order_id = #{query.orderId}
+ </if>
</select>
+
</mapper>
--
Gitblit v1.8.0