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-13 15:03:43 +08:00
parent e74226d2d4
commit 7a9765d1be
4 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/CodePrefix.java Normal file
View File

@ -0,0 +1,19 @@
package org.dromara.common.core.enums;
/**
* 数字编码前缀，扫码用
*/
public enum CodePrefix {
/**
* 核销
*/
HXM,
/**
* 好友
*/
HYM,
/**
* 推广
*/
TGM;
}

36
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/OrderStatus.java
View File

@ -1,36 +0,0 @@
package org.dromara.common.core.enums;
/**
* 用户状态
*
* @author ruoyi
*/
public enum OrderStatus
{
ALL_DATA(-1,"全部订单"),
UN_PAY(0, "待付款"),
NOT_DELIVERED(1, "待发货"),
DELIVERED(2, "待收货"),
COMPLETE(3, "已完成"),
CLOSED(4, "已关闭"),
INVALID(5, "无效订单"),
WAIT_VERIFY(6, "待核销"),
VERIFY(7, "已核销"),
REFUUND(-2, "售后订单");
private final Integer type;
private final String msg;
private OrderStatus(Integer type, String msg) {
this.type = type;
this.msg = msg;
}
public Integer getType() {
return this.type;
}
public String getMsg() {
return this.msg;
}
}

3
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/convert/OrderItemConvert.java
View File

@ -18,7 +18,4 @@ import org.mapstruct.Mapper;
@Mapper(componentModel = "spring")
public interface OrderItemConvert extends BaseConverter<OrderItemVO, OrderItemBo, OrderItem> {
// List<OrderVO> dos2vos(List<Order> list);
// OrderVO do2vo(Order order);
}

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

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wzj.soopin.order.domain.entity.Order;
import com.wzj.soopin.order.domain.entity.VerificationCodes;
import com.wzj.soopin.order.domain.vo.ManagerOrderDetailVO;
import com.wzj.soopin.order.emum.OrderStatusEnum;
import com.wzj.soopin.order.mapper.OrderMapper;
import com.wzj.soopin.order.mapper.VerificationCodesMapper;
import com.wzj.soopin.order.mapper.VerificationLogsMapper;
@ -15,10 +16,12 @@ 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.enums.CodePrefix;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
/**
* @author fxh
@ -46,7 +49,7 @@ public class VerificationCodeServiceImpl extends ServiceImpl<VerificationCodesM
public R generateVerificationCode(Long orderId) {
// 校验订单状态
Order order = orderMapper.selectById(orderId);
if (order == null || order.getStatus() != 6) {
if (order == null || !Objects.equals(order.getStatus(), OrderStatusEnum.VERIFY.getValue())) {
return R.fail("订单状态异常");
}
@ -211,7 +214,7 @@ public class VerificationCodeServiceImpl extends ServiceImpl<VerificationCodesM
*/
private String generateUniqueCode() {
String uuid = java.util.UUID.randomUUID().toString().replaceAll("-", "");
return uuid.substring(0, 16).toUpperCase();
return CodePrefix.HXM.name()+"-" + uuid.substring(0, 16).toUpperCase();
}
@Override