55f4fb4bde47baa742716e4475b4e1c5e075d93a..f04b7fa5136257a8a8e14d1f46efa25801d616b8
2025-09-16 peng
处理图片显示问题
f04b7f 对比 | 目录
2025-09-16 peng
解决图片显示问题和实物商品与虚拟商品中不包含礼品卡时去除优惠卷id和名称
9d8092 对比 | 目录
2025-09-15 peng
调整领取逻辑
336b30 对比 | 目录
2025-09-15 peng
调整生成校验
818164 对比 | 目录
2025-09-15 zxl
虚拟优惠卷问题
f118f0 对比 | 目录
2025-09-12 peng
修改礼品卡领取
a576bf 对比 | 目录
2025-09-12 zxl
管理端
00423a 对比 | 目录
2025-09-12 zxl
管理端
e5d1c3 对比 | 目录
2025-09-12 peng
修改礼品卡领取
1fc2dd 对比 | 目录
2025-09-12 zxl
分享虚拟商品优惠劵
f5a352 对比 | 目录
2025-09-12 peng
Merge remote-tracking branch 'origin/send_coupon' into send_coupon
fa6528 对比 | 目录
2025-09-12 peng
添加获取卡包领取信息
7747b9 对比 | 目录
2025-09-12 zxl
虚拟商品优惠劵
7920be 对比 | 目录
2025-09-12 peng
Merge remote-tracking branch 'origin/send_coupon' into send_coupon
5100e0 对比 | 目录
2025-09-12 peng
bug调整
2e44ec 对比 | 目录
2025-09-11 zxl
虚拟商品优惠劵
2bd4d8 对比 | 目录
2025-09-11 zxl
Merge remote-tracking branch 'origin/send_coupon' into send_coupon
f827be 对比 | 目录
2025-09-11 zxl
虚拟商品优惠劵
e24ed6 对比 | 目录
2025-09-11 peng
Merge remote-tracking branch 'origin/dev' into send_coupon
127a0f 对比 | 目录
2025-09-11 peng
礼品卡
951140 对比 | 目录
2025-09-11 peng
礼品卡字段调整
2694ec 对比 | 目录
2025-09-11 peng
礼品卡字段调整
6d07f7 对比 | 目录
2025-09-11 peng
礼品卡字段调整
04d893 对比 | 目录
20个文件已修改
8个文件已添加
667 ■■■■■ 已修改文件
buyer-api/src/main/java/cn/lili/controller/lmk/CouponCardController.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
buyer-api/src/main/java/cn/lili/controller/lmk/CouponVirtualController.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
buyer-api/src/main/java/cn/lili/controller/order/AfterSaleBuyerController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/lmk/domain/entity/CouponVirtual.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/lmk/domain/query/CouponVirtualQuery.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVOInfo.java 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/lmk/enums/general/VirtualGoodsTypeEnum.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/lmk/service/CouponVirtualService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/lmk/service/impl/CouponVirtualServiceImpl.java 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/entity/enums/ClaimStatusEnum.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/entity/enums/CouPonFlagEnum.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/entity/enums/ShareStatusEnum.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manager-api/src/main/java/cn/lili/controller/lmk/CardPackController.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
buyer-api/src/main/java/cn/lili/controller/lmk/CouponCardController.java
New file
@@ -0,0 +1,37 @@
package cn.lili.controller.lmk;
import cn.lili.base.Result;
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.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Validated
@RequiredArgsConstructor
@Api(value = "小程序购物卡接口", tags = "小程序购物卡接口")
@RestController
@RequestMapping("/buyer/lmk/coupon/card")
public class CouponCardController {
    private final CouponVirtualService couponVirtualService;
    @PostMapping("/{cardId}")
    @ApiOperation(value = "领取购物卡", notes = "领取购物卡")
    public Result tackCardById(@PathVariable String cardId){
        return couponVirtualService.tackCardById(cardId);
    }
    @PostMapping("/changShareStatus/{cardId}")
    @ApiOperation(value = "更改分享状态", notes = "更改分享状态")
    public Result changShareStatus(@PathVariable String cardId){
        return couponVirtualService.changShareStatus(cardId);
    }
    @PostMapping("/couponCardInfo/{cardId}")
    @ApiOperation(value = "获取领取信息", notes = "获取领取信息")
    public Result couponCardInfo(@PathVariable String cardId){
        return couponVirtualService.couponCardInfo(cardId);
    }
}
buyer-api/src/main/java/cn/lili/controller/lmk/CouponVirtualController.java
New file
@@ -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);
    }
}
buyer-api/src/main/java/cn/lili/controller/order/AfterSaleBuyerController.java
@@ -64,6 +64,10 @@
    @GetMapping(value = "/get/{sn}")
    public ResultMessage<AfterSaleVO> get(@NotNull(message = "售后单号") @PathVariable("sn") String sn) {
        AfterSaleVO afterSale = OperationalJudgment.judgment(afterSaleService.getAfterSale(sn));
        String goodsImage = afterSale.getGoodsImage();
        if (StringUtils.isNotBlank(goodsImage)&&!goodsImage.contains("http")) {
            afterSale.setGoodsImage(cosUtil.getPreviewUrl(goodsImage));
        }
        return ResultUtil.data(afterSale);
    }
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
@@ -177,6 +177,10 @@
    @ApiModelProperty(value = "商品排序")
    private Integer goodsSort;
    @ApiModelProperty(value ="表示虚拟商品类型 现有类型:COUPON优惠劵")
    private String virtualGoodsType;
    public Goods() {
    }
@@ -194,6 +198,8 @@
        this.mobileIntro = goodsOperationDTO.getMobileIntro();
        this.goodsVideo = goodsOperationDTO.getGoodsVideo();
        this.price = goodsOperationDTO.getPrice();
        this.virtualGoodsType = goodsOperationDTO.getVirtualGoodsType();
        //不是预售商品预售时间置空
        if (!GoodsSalesModeEnum.PRESALE.name().equals(goodsOperationDTO.getSalesModel())) {
            goodsOperationDTO.setPreSaleBeginDate(null);
@@ -230,6 +236,12 @@
            if (!sku.containsKey("quantity") || StringUtil.isEmpty(sku.get("quantity").toString()) || Convert.toInt(sku.get("quantity").toString()) < 0) {
                throw new ServiceException(ResultCode.GOODS_SKU_QUANTITY_ERROR);
            }
            //没有优惠卷的商品需要移除优惠卷信息
            Object couponId = sku.get("couponId");
            if (couponId == null || StringUtil.isEmpty(couponId.toString())) {
                sku.remove("couponId");
                sku.remove("couponName");
            }
            sku.values().forEach(i -> {
                if (CharSequenceUtil.isBlank(i.toString())) {
                    throw new ServiceException(ResultCode.MUST_HAVE_GOODS_SKU_VALUE);
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
@@ -170,6 +170,12 @@
    @ApiModelProperty(value = "预警数量")
    private Integer alertQuantity;
    @ApiModelProperty(value ="优惠劵id")
    private String couponId;
    @ApiModelProperty(value ="优惠劵名")
    private String couponName;
    public Double getWeight() {
        if (weight == null) {
            return 0d;
@@ -223,6 +229,7 @@
        this.storeCategoryPath = goods.getStoreCategoryPath();
        this.freightTemplateId = goods.getTemplateId();
        this.recommend = goods.getRecommend();
    }
}
framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
@@ -158,6 +158,14 @@
    private BigDecimal commission;
    @ApiModelProperty(value = "商品排序")
    private Integer goodsSort;
    @ApiModelProperty(value = "优惠劵id")
    private String couponId;
    @ApiModelProperty(value = "优惠劵名")
    private String couponName;
    @ApiModelProperty(value ="表示虚拟商品类型 现有类型:COUPON优惠劵")
    private String virtualGoodsType;
    public String getGoodsName() {
        //对商品对名称做一个极限处理。这里没有用xss过滤是因为xss过滤为全局过滤,影响很大。
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
@@ -159,7 +159,7 @@
        // 检查是否需要生成索引
        List<GoodsSku> goodsSkus = GoodsSkuBuilder.buildBatch(goods, goodsOperationDTO.getSkuList());
        renderGoodsSkuList(goodsSkus, goodsOperationDTO);
        System.out.println(goodsSkus);
        if (!goodsSkus.isEmpty()) {
            this.saveOrUpdateBatch(goodsSkus);
            this.updateGoodsStock(goodsSkus);
framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java
@@ -4,6 +4,7 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Assert;
import cn.hutool.json.JSONUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dos.GoodsSku;
import org.springframework.stereotype.Component;
@@ -64,7 +65,7 @@
        Map<String, Object> specMap = new LinkedHashMap<>();
        // 原始规格项
        String[] ignoreOriginKeys = {"id", "sn", "cost", "price", "quantity", "weight", "alertQuantity"};
        String[] ignoreOriginKeys = {"id", "sn", "cost", "price", "quantity", "weight", "alertQuantity","couponId","couponName"};
        //获取规格信息
        for (Map.Entry<String, Object> spec : skuInfo.entrySet()) {
            //保存新增规格信息
@@ -83,6 +84,11 @@
        //规格信息
        if(StringUtils.isNotBlank(Convert.toStr(skuInfo.get("couponId")))){
            goodsSku.setCouponId(Convert.toStr(skuInfo.get("couponId"),""));
        }
        goodsSku.setCouponName(Convert.toStr(skuInfo.get("couponName"),""));
        goodsSku.setId(Convert.toStr(skuInfo.get("id"), ""));
        goodsSku.setSn(Convert.toStr(skuInfo.get("sn")));
        goodsSku.setWeight(Convert.toDouble(skuInfo.get("weight"), 0D));
framework/src/main/java/cn/lili/modules/lmk/domain/entity/CouponVirtual.java
@@ -4,7 +4,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
 * 虚拟商品优惠卷
@@ -22,9 +26,18 @@
    /** 订单id */
    private String orderId;
    @TableField("item_order_id")
    /** 订单id */
    private String itemOrderId;
    @TableField("goods_id")
    /** 商品id */
    private String goodsId;
    @TableField("sku_id")
    /** 商品id */
    private String skuId;
    @TableField("sku_name")
    /** 商品名称 */
@@ -42,6 +55,20 @@
    /** 优惠卷名称 */
    private String couponName;
    @TableField("user_id")
    /** 用户id */
    private String userId;
    @TableField("user_nickname")
    /** 用户昵称 */
    private String userNickname;
    @TableField("claim_time")
    /** 领取时间 */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date claimTime;
    @TableField("name")
    /** 名称 */
    private String name;
framework/src/main/java/cn/lili/modules/lmk/domain/query/CouponVirtualQuery.java
@@ -20,5 +20,9 @@
@Data
@ApiModel(value = "CouponVirtual查询参数", description = "虚拟商品优惠卷查询参数")
public class CouponVirtualQuery extends AbsQuery {
    private String orderId;
    private String userNickName;
    private String skuName;
}
framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVO.java
@@ -5,6 +5,7 @@
import cn.lili.base.AbsVo;
import cn.lili.modules.lmk.domain.entity.CouponVirtual;
import com.baomidou.mybatisplus.annotation.TableField;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
@@ -59,6 +60,12 @@
    private String claimStatus;
    private Boolean deleteFlag;
    private String original;
    private String userNickName;
    public static CouponVirtualVO getVoByEntity(@NonNull CouponVirtual entity, CouponVirtualVO vo) {
        if(vo == null) {
            vo = new CouponVirtualVO();
framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVOInfo.java
New file
@@ -0,0 +1,72 @@
package cn.lili.modules.lmk.domain.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
 * lmk-shop-java
 *
 * @author : zxl
 * @date : 2025-09-12 15:19
 **/
@Data
public class CouponVirtualVOInfo {
    private static final long serialVersionUID = 1L;
    private String id;
    private String orderId;
    private String itemOrderId;
    private String goodsId;
    private String skuId;
    private String skuName;
    private String couponId;
    private String couponNo;
    private String couponName;
    private String userId;
    private String userNickname;
    /** 领取时间 */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date claimTime;
    /** 领取时间 */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    /** 名称 */
    private String name;
    /** 是否分享 */
    private String shareStatus;
    /** 是否领取 */
    private String claimStatus;
    private String goodsUrl;
}
framework/src/main/java/cn/lili/modules/lmk/enums/general/VirtualGoodsTypeEnum.java
New file
@@ -0,0 +1,13 @@
package cn.lili.modules.lmk.enums.general;
import lombok.AllArgsConstructor;
import lombok.Getter;
@AllArgsConstructor
@Getter
public enum VirtualGoodsTypeEnum {
    COUPON("虚拟优惠劵");
    private String description;
}
framework/src/main/java/cn/lili/modules/lmk/service/CouponVirtualService.java
@@ -6,6 +6,7 @@
import cn.lili.modules.lmk.domain.form.CouponVirtualForm;
import cn.lili.modules.lmk.domain.query.CouponVirtualQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.List;
@@ -64,4 +65,10 @@
     * @return
     */
    Result all();
    Result tackCardById( String cardId);
    Result changShareStatus( String cardId);
    Result couponCardInfo(String cardId);
}
framework/src/main/java/cn/lili/modules/lmk/service/impl/CouponVirtualServiceImpl.java
@@ -1,22 +1,45 @@
package cn.lili.modules.lmk.service.impl;
import cn.lili.base.Result;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.modules.goods.service.GoodsService;
import cn.lili.modules.lmk.domain.entity.CouponVirtual;
import cn.lili.modules.lmk.domain.form.CouponVirtualForm;
import cn.lili.modules.lmk.domain.query.CouponVirtualQuery;
import cn.lili.modules.lmk.domain.vo.CouponVirtualVO;
import cn.lili.modules.lmk.domain.vo.CouponVirtualVOInfo;
import cn.lili.modules.lmk.mapper.CouponVirtualMapper;
import cn.lili.modules.lmk.service.CouponVirtualService;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.entity.enums.ClaimStatusEnum;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
import cn.lili.modules.order.order.entity.enums.RefundStatusEnum;
import cn.lili.modules.order.order.entity.enums.ShareStatusEnum;
import cn.lili.modules.order.order.service.OrderItemService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.promotion.service.MemberCouponService;
import cn.lili.utils.COSUtil;
import cn.lili.utils.PageUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -28,12 +51,27 @@
 */
@Service
@RequiredArgsConstructor
@Slf4j
public class CouponVirtualServiceImpl extends ServiceImpl<CouponVirtualMapper, CouponVirtual> implements CouponVirtualService {
    private final CouponVirtualMapper couponVirtualMapper;
    private final RedissonClient redissonClient;
    private final static String LOCK_COUPON_VIRTUAL_CARD_ID = "lock_coupon_virtual_card_id:";
    private final OrderItemService orderItemService;
    private final OrderService orderService;
    private final MemberCouponService memberCouponService;
    private final GoodsService goodsService;
    private final COSUtil cosUtil;
    /**
     * 添加
     *
     * @param form
     * @return
     */
@@ -46,6 +84,7 @@
    /**
     * 修改
     *
     * @param form
     * @return
     */
@@ -62,6 +101,7 @@
    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
@@ -73,6 +113,7 @@
    /**
     * id删除
     *
     * @param id
     * @return
     */
@@ -84,6 +125,7 @@
    /**
     * 分页查询
     *
     * @param query
     * @return
     */
@@ -91,11 +133,18 @@
    public Result page(CouponVirtualQuery query) {
        IPage<CouponVirtualVO> page = PageUtil.getPage(query, CouponVirtualVO.class);
        baseMapper.getPage(page, query);
        for (CouponVirtualVO record : page.getRecords()) {
            String original = record.getOriginal();
            if (StringUtils.isNotBlank(original) && !original.contains("http")) {
                record.setOriginal(cosUtil.getPreviewUrl(original));
            }
        }
        return Result.ok().data(page.getRecords()).total(page.getTotal());
    }
    /**
     * 根据id查找
     *
     * @param id
     * @return
     */
@@ -108,6 +157,7 @@
    /**
     * 列表
     *
     * @return
     */
    @Override
@@ -118,4 +168,95 @@
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result tackCardById(String cardId) {
        log.info("被领取的礼品卡的id为--------------------------->{}",cardId);
        AuthUser currentUser = UserContext.getCurrentUser();
        if (currentUser == null) {
            throw new ServiceException("当前用户没有登录");
        }
        String userId = currentUser.getId();
        String nickName = currentUser.getNickName();
        RLock lock = null;
        try {
            lock = redissonClient.getLock(LOCK_COUPON_VIRTUAL_CARD_ID + cardId);
            lock.lock();
            LambdaQueryWrapper<CouponVirtual> forUpdate = Wrappers.<CouponVirtual>lambdaQuery().eq(CouponVirtual::getId, cardId).last("FOR UPDATE");
            CouponVirtual cardInfo = this.getOne(forUpdate);
            if (cardInfo == null) {
                throw new ServiceException("当前优惠卷不存在");
            }
            if (ClaimStatusEnum.CLAIM.name().equals(cardInfo.getClaimStatus())) {
                throw new ServiceException("当前购物卡已经被领取");
            }
            //校验订单状态是否正常
            String orderNo = cardInfo.getOrderId();
            if (StringUtils.isBlank(orderNo)) {
                throw new ServiceException("当前订单不存在无法领取");
            }
            String itemOrderId = cardInfo.getItemOrderId();
            Order order = orderService.getBySn(orderNo);
            if (order == null) {
                throw new ServiceException("当前订单不存在无法领取");
            }
            if (!OrderStatusEnum.COMPLETED.name().equals(order.getOrderStatus())) {
                throw new ServiceException("订单状态异常无法领取");
            }
            OrderItem orderItem = orderItemService.getById(itemOrderId);
            if (orderItem == null) {
                throw new ServiceException("当前订单不存在");
            }
            String orderSn = orderItem.getOrderSn();
            if (!orderNo.equals(orderSn)) {
                throw new ServiceException("订单无法对应无法领取");
            }
            if (!RefundStatusEnum.NO_REFUND.name().equals(orderItem.getIsRefund())) {
                throw new ServiceException("当前订单已退款无法领取");
            }
            //领取对应的优惠卷
            memberCouponService.receiveCoupon(cardInfo.getCouponId(),userId , nickName);
            cardInfo.setUserNickname(nickName);
            cardInfo.setUserId(userId);
            cardInfo.setClaimStatus(ClaimStatusEnum.CLAIM.name());
            cardInfo.setShareStatus(ShareStatusEnum.SHARE.name());
            cardInfo.setClaimTime(new Date());
            boolean b = this.updateById(cardInfo);
            //去领取优惠卷
            if (!b) {
                throw new RuntimeException("领取失败");
            }
            return Result.ok().data(cardInfo.getCouponId());
        } finally {
            if ( lock != null && lock.isHeldByCurrentThread()) {
                lock.unlock();
            }
        }
    }
    @Override
    public Result changShareStatus(String cardId) {
        CouponVirtual couponVirtual = this.getById(cardId);
        couponVirtual.setShareStatus(ShareStatusEnum.SHARE.name());
        this.updateById(couponVirtual);
        return Result.ok();
    }
    @Override
    public Result couponCardInfo(String cardId) {
        CouponVirtual couponVirtual = this.getById(cardId);
        if (couponVirtual == null) {
            throw new ServiceException("当前购物卡不存在");
        }
        CouponVirtualVOInfo virtualVOInfo = new CouponVirtualVOInfo();
        BeanUtils.copyProperties(couponVirtual, virtualVOInfo);
        String goodsId = virtualVOInfo.getGoodsId();
        String url = goodsService.getById(goodsId).getOriginal();
        if (StringUtils.isNotBlank(url) && !url.contains("http")) {
            virtualVOInfo.setGoodsUrl(cosUtil.getPreviewUrl(url));
        }
        return Result.ok().data(virtualVOInfo);
    }
}
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
@@ -185,6 +185,12 @@
     */
    @ApiModelProperty(value = "订单类型")
    private String orderType;
    /**
     * @see CouPonFlagEnum
     */
    @ApiModelProperty(value = "是否是礼品卡")
    private String couponFlag;
    /**
     * 订单地址修改状态
     */
framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
@@ -85,6 +85,12 @@
    @ApiModelProperty(value = "促销id")
    private String promotionId;
    @ApiModelProperty(value = "优惠卷id")
    private String couponId;
    @ApiModelProperty(value = "优惠卷名称")
    private String couponName;
    @ApiModelProperty(value = "销售金额")
    private Double goodsPrice;
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";
framework/src/main/java/cn/lili/modules/order/order/entity/enums/ClaimStatusEnum.java
New file
@@ -0,0 +1,30 @@
package cn.lili.modules.order.order.entity.enums;
/**
 * 领取状态状态
 *
 **/
public enum ClaimStatusEnum {
    /**
     * 分享
     */
    CLAIM("领取"),
    /**
     * 未分享
     */
    NOT_CLAIM("未领取");
    private final String description;
    ClaimStatusEnum(String description) {
        this.description = description;
    }
    public String description() {
        return this.description;
    }
}
framework/src/main/java/cn/lili/modules/order/order/entity/enums/CouPonFlagEnum.java
New file
@@ -0,0 +1,29 @@
package cn.lili.modules.order.order.entity.enums;
/**
 * 分享状态
 *
 **/
public enum CouPonFlagEnum {
    /**
     * 礼品卡
     */
    COUPON("礼品卡"),
    /**
     * 不是礼品卡
     */
    NOT_COUPON("不是礼品卡");
    private final String description;
    CouPonFlagEnum(String description) {
        this.description = description;
    }
    public String description() {
        return this.description;
    }
}
framework/src/main/java/cn/lili/modules/order/order/entity/enums/ShareStatusEnum.java
New file
@@ -0,0 +1,29 @@
package cn.lili.modules.order.order.entity.enums;
/**
 * 分享状态
 *
 **/
public enum ShareStatusEnum {
    /**
     * 分享
     */
    SHARE("分享"),
    /**
     * 未分享
     */
    NOT_SHARE("未分享");
    private final String description;
    ShareStatusEnum(String description) {
        this.description = description;
    }
    public String description() {
        return this.description;
    }
}
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)) {
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" +
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -27,8 +27,10 @@
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
import cn.lili.modules.goods.service.GoodsService;
import cn.lili.modules.lmk.domain.entity.CouponVirtual;
import cn.lili.modules.lmk.domain.vo.OrderCountVO;
import cn.lili.modules.lmk.enums.general.AdminRoleEnum;
import cn.lili.modules.lmk.service.CouponVirtualService;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.member.mapper.MemberMapper;
@@ -47,7 +49,9 @@
import cn.lili.modules.permission.entity.dos.AdminUser;
import cn.lili.modules.permission.service.AdminUserService;
import cn.lili.modules.permission.service.RoleService;
import cn.lili.modules.promotion.entity.dos.Coupon;
import cn.lili.modules.promotion.entity.dos.Pintuan;
import cn.lili.modules.promotion.service.CouponService;
import cn.lili.modules.promotion.service.PintuanService;
import cn.lili.modules.store.entity.dto.StoreDeliverGoodsAddressDTO;
import cn.lili.modules.store.service.StoreDetailService;
@@ -87,6 +91,7 @@
import org.apache.poi.ss.util.CellRangeAddressList;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
@@ -199,8 +204,18 @@
    @Resource
    private RedisTemplate<Object,Object> redisTemplate;
    @Autowired
    private CouponService couponService;
    @Autowired
    private CouponVirtualService couponVirtualService;
    @Autowired
    private RedissonClient redissonClient;
    private final static  String LOCK_ORDER_NO_MQ="lock_order_no_mq:";
    private final static  String LOCK_EDIT_ORDER_ADDRESS="lock_edit_order_address:";
    private final static  String LOCK_COUPON_CARD="lock_coupon_card:";
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void intoDB(TradeDTO tradeDTO) {
@@ -786,17 +801,76 @@
    @OrderLogPoint(description = "'订单['+#orderSn+']核销,核销码['+#verificationCode+']'", orderSn = "#orderSn")
    @Transactional(rollbackFor = Exception.class)
    public Order take(String orderSn, String verificationCode) {
        Order order;
        RLock lock = redissonClient.getLock(LOCK_COUPON_CARD + orderSn);
        try {
             lock.lock();
            //获取订单信息
            order = this.getBySn(orderSn);
            //订单幂等问题
            if (OrderStatusEnum.COMPLETED.name().equals(order.getOrderStatus())) {
                throw new ServiceException("当前订单已完成无法再次核验");
            }
        //获取订单信息
        Order order = this.getBySn(orderSn);
        //检测虚拟订单信息
        checkVerificationOrder(order, verificationCode);
        order.setOrderStatus(OrderStatusEnum.COMPLETED.name());
        //订单完成
        this.complete(orderSn);
            //检测虚拟订单信息
            checkVerificationOrder(order, verificationCode);
            order.setOrderStatus(OrderStatusEnum.COMPLETED.name());
            //订单完成
            //获取所有的订单子项用于生成优惠卷订单信息
            List<OrderItem> orderItems = orderItemService.getByOrderSn(orderSn);
            List<CouponVirtual> couponVirtuals = new  ArrayList<>();
            for (OrderItem orderItem : orderItems) {
                String couponId = orderItem.getCouponId();
                if (StringUtils.isBlank(couponId)) {
                    continue;
                }
                String storeId = order.getStoreId();
                Coupon one = couponService.getOne(Wrappers.<Coupon>lambdaQuery().eq(Coupon::getStoreId, storeId).eq(Coupon::getId, couponId));
                if (one == null) {
                    log.error("当前订单订单号为:{}不存在中的优惠卷不存在----------------------->{}",order.getId(),orderItem.getOrderSn());
                }else {
                    Integer num = orderItem.getNum();
                    //当购买数量不为空的时候进行
                    if (num != null) {
                        for (int i = 1; i <= num; i++) {
                            CouponVirtual couponVirtual = getCouponVirtual(orderItem);
                            couponVirtual.setCouponNo(String.format("%08d", i));
                            couponVirtuals.add(couponVirtual);
                        }
                    }
                }
            }
            if (!couponVirtuals.isEmpty()) {
                order.setCouponFlag(CouPonFlagEnum.COUPON.name());
                couponVirtualService.saveBatch(couponVirtuals);
                //更新状态用于后续小程序判断弹出卷列表
                this.updateById(order);
            }
            this.complete(orderSn);
        } finally {
            assert lock != null;
            if (lock.isHeldByCurrentThread()) {
                lock.unlock();
            }
        }
        return order;
    }
    private static CouponVirtual getCouponVirtual(OrderItem orderItem) {
        CouponVirtual couponVirtual = new CouponVirtual();
        couponVirtual.setOrderId(orderItem.getOrderSn());
        couponVirtual.setCouponId(orderItem.getCouponId());
        couponVirtual.setCouponName(orderItem.getCouponName());
        couponVirtual.setGoodsId(orderItem.getGoodsId());
        couponVirtual.setSkuId(orderItem.getSkuId());
        couponVirtual.setItemOrderId(orderItem.getId());
        couponVirtual.setSkuName(orderItem.getGoodsName());
        couponVirtual.setName(orderItem.getCouponName());
        couponVirtual.setShareStatus(ShareStatusEnum.NOT_SHARE.name());
        couponVirtual.setClaimStatus(ClaimStatusEnum.NOT_CLAIM.name());
        return couponVirtual;
    }
    @Override
    public Order take(String verificationCode) {
        String storeId = OperationalJudgment.judgment(UserContext.getCurrentUser()).getStoreId();
framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml
@@ -18,6 +18,8 @@
        <result column="create_time" property="createTime" />
        <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">
@@ -60,11 +62,23 @@
            LCV.create_time,
            LCV.update_by,
            LCV.delete_flag,
            LCV.id
            LCV.user_nickname,
            LCV.id,
            LGS.original
        FROM
            lmk_coupon_virtual LCV
        lmk_coupon_virtual LCV JOIN li_goods_sku LGS ON LGS.id = LCV.sku_id
        WHERE
            LCV.deleted = 0
        LCV.delete_flag = 0 AND LGS.delete_flag = 0
        <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>
</mapper>
manager-api/src/main/java/cn/lili/controller/lmk/CardPackController.java
New file
@@ -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);
    }
}
manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java
@@ -4,6 +4,7 @@
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.OrderComplaint;
@@ -15,6 +16,7 @@
import cn.lili.modules.order.order.entity.vo.OrderComplaintVO;
import cn.lili.modules.order.order.service.OrderComplaintCommunicationService;
import cn.lili.modules.order.order.service.OrderComplaintService;
import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -23,6 +25,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
/**
@@ -48,11 +52,26 @@
    @Autowired
    private OrderComplaintCommunicationService orderComplaintCommunicationService;
    @Autowired
    private COSUtil cosUtil;
    @ApiOperation(value = "通过id获取")
    @ApiImplicitParam(name = "id", value = "投诉单ID", required = true, paramType = "path")
    @GetMapping(value = "/{id}")
    public ResultMessage<OrderComplaintVO> get(@PathVariable String id) {
        return ResultUtil.data(orderComplaintService.getOrderComplainById(id));
        OrderComplaintVO orderComplainById = orderComplaintService.getOrderComplainById(id);
        String goodsImage = orderComplainById.getGoodsImage();
        if (StringUtils.isNotBlank(goodsImage)&&!goodsImage.contains("http")) {
            orderComplainById.setGoodsImage(cosUtil.getPreviewUrl(goodsImage));
        }
        String[] orderComplaintImages = orderComplainById.getOrderComplaintImages();
        List<String> orderComplaintImagesList = Arrays.asList(orderComplaintImages);
        for (String orderComplaintImage : orderComplaintImages) {
            if (StringUtils.isNotBlank(orderComplaintImage)&&!orderComplaintImage.contains("http")) {
                orderComplaintImagesList.add(cosUtil.getPreviewUrl(orderComplaintImage));
            }
        }
        orderComplainById.setOrderComplaintImages(orderComplaintImagesList.toArray(new String[0]));
        return ResultUtil.data(orderComplainById);
    }
    @ApiOperation(value = "分页获取")
seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
@@ -155,6 +155,7 @@
    @ApiOperation(value = "新增商品")
    @PostMapping(value = "/create", consumes = "application/json", produces = "application/json")
    public ResultMessage<GoodsOperationDTO> save(@Valid @RequestBody GoodsOperationDTO goodsOperationDTO) {
        System.err.println(JSONObject.toJSONString(goodsOperationDTO));
        goodsService.addGoods(goodsOperationDTO);
        return ResultUtil.success();