abu/wzj-boot
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]修改订单核销码

Browse Source
This commit is contained in:
wangqx 2025-09-12 16:24:06 +08:00
parent ab75ebf27c
commit ccf2c6b02e
4 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java
View File

@ -12,6 +12,7 @@ import com.wzj.soopin.order.domain.vo.OrderItemVO;
import com.wzj.soopin.order.domain.vo.OrderVO;
import com.wzj.soopin.order.service.OrderItemService;
import com.wzj.soopin.order.service.OrderService;
import com.wzj.soopin.order.service.VerificationCodeService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.web.core.BusinessImpl;
@ -28,6 +29,7 @@ public class OrderBusinessImpl extends BusinessImpl<OrderService, OrderConvert,
private final IMemberService memberService;
private final OrderItemService orderItemService;
private final OrderItemConvert orderItemConvert;
private final VerificationCodeService verificationCodeService;
@Override
public OrderVO info(Serializable id) {
@ -43,7 +45,9 @@ public class OrderBusinessImpl extends BusinessImpl<OrderService, OrderConvert,
//赋值
return itemVO;
}).collect(Collectors.toList());
vo.setItems(itemVOList);
//核销码
vo.setVerificationCodes(verificationCodeService.getByOrderId(vo.getId()));
return vo;
}
}

4
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java
View File

@ -1,7 +1,7 @@
package com.wzj.soopin.order.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.wzj.soopin.order.domain.entity.OrderItem;
import com.wzj.soopin.order.domain.entity.VerificationCodes;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.dromara.common.core.domain.model.BaseAudit;
@ -159,7 +159,7 @@ public class OrderVO extends BaseAudit {
private Integer distribution;
@Schema(description = "核销码")
private String code;
private List<VerificationCodes> verificationCodes;
@Schema(description = "使用的优惠卷id")
private Long memberCouponId;

6
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java
View File

@ -1,12 +1,12 @@
package com.wzj.soopin.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.wzj.soopin.order.domain.dto.CodeVerificationDto;
import com.wzj.soopin.order.domain.entity.VerificationCodes;
import com.wzj.soopin.order.domain.vo.ManagerOrderDetailVO;
import com.wzj.soopin.order.domain.vo.OrderVO;
import org.dromara.common.core.domain.R;
import java.util.List;
public interface VerificationCodeService extends IService<VerificationCodes> {
@ -15,4 +15,6 @@ public interface VerificationCodeService extends IService<VerificationCodes> {
void verifyCode(String code,String tenantId);
ManagerOrderDetailVO scan(String code);
List<VerificationCodes> getByOrderId(Long orderId);
}

21
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java
View File

@ -2,13 +2,9 @@ package com.wzj.soopin.order.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wzj.soopin.content.domain.po.Vlog;
import com.wzj.soopin.order.domain.dto.CodeVerificationDto;
import com.wzj.soopin.order.domain.entity.Order;
import com.wzj.soopin.order.domain.entity.VerificationCodes;
import com.wzj.soopin.order.domain.entity.VerificationLogs;
import com.wzj.soopin.order.domain.vo.ManagerOrderDetailVO;
import com.wzj.soopin.order.domain.vo.OrderVO;
import com.wzj.soopin.order.mapper.OrderMapper;
import com.wzj.soopin.order.mapper.VerificationCodesMapper;
import com.wzj.soopin.order.mapper.VerificationLogsMapper;
@ -19,18 +15,10 @@ import com.wzj.soopin.order.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.mq.config.RocketMQConfig;
import org.dromara.common.mq.domain.MQMessage;
import org.dromara.common.mq.enums.MessageActionEnum;
import org.dromara.common.mq.utils.MqUtil;
import org.dromara.common.satoken.utils.LoginHelper;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
/**
* @author fxh
@ -226,5 +214,10 @@ public class VerificationCodeServiceImpl extends ServiceImpl<VerificationCodesM
return uuid.substring(0, 16).toUpperCase();
}
@Override
public List<VerificationCodes> getByOrderId(Long orderId) {
LambdaQueryWrapper<VerificationCodes> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(VerificationCodes::getOrderId, orderId);
return codeMapper.selectList(wrapper);
}
}