ruoyi-admin/src/main/java/org/dromara/app/merchant/AppMerchantOrderController.java

@@ -1,9 +1,7 @@
 package org.dromara.app.merchant;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wzj.soopin.order.business.IOrderBusiness;
 import com.wzj.soopin.order.domain.bo.OrderBo;
-import com.wzj.soopin.order.domain.entity.Order;
 import com.wzj.soopin.order.domain.vo.OrderVO;
 import com.wzj.soopin.order.service.IMerchantOrderService;
 import com.wzj.soopin.order.service.VerificationCodeService;
@@ -32,8 +30,6 @@ public class AppMerchantOrderController {
     private final VerificationCodeService verificationCodeService;
 
     private final IMerchantOrderService merchantOrderService;
-
-    private final IOrderBusiness orderBusiness;
     /**
      * 扫码核销接口
      * @return 核销结果
@@ -68,8 +64,7 @@ public class AppMerchantOrderController {
         if(loginUser.getTenantId() == null){
             return R.fail("用户不是商户");
         }
-        Order order = verificationCodeService.scan(code);
-        return R.ok(orderBusiness.info(order.getId()));
+        return R.ok(verificationCodeService.scan(code));
     }
 
     @Tag(name ="查询订单列表")

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/CodePrefix.java

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

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

@@ -0,0 +1,36 @@
+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;
+    }
+}

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

@@ -18,4 +18,7 @@ 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);
 }

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

@@ -1,7 +1,6 @@
 package com.wzj.soopin.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-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 org.dromara.common.core.domain.R;
@@ -15,7 +14,7 @@ public interface VerificationCodeService extends IService<VerificationCodes> {
 
     void verifyCode(String  code,String tenantId);
 
-    Order scan(String code);
+    ManagerOrderDetailVO scan(String code);
 
     List<VerificationCodes> getByOrderId(Long orderId);
 }

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

@@ -5,7 +5,6 @@ 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;
@@ -16,12 +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.enums.CodePrefix;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author fxh
@@ -49,7 +46,7 @@ public class VerificationCodeServiceImpl  extends ServiceImpl<VerificationCodesM
     public R generateVerificationCode(Long orderId) {
         //  校验订单状态
         Order order = orderMapper.selectById(orderId);
-        if (order == null || !Objects.equals(order.getStatus(), OrderStatusEnum.VERIFY.getValue())) {
+        if (order == null || order.getStatus() != 6) {
            return R.fail("订单状态异常");
         }
 
@@ -102,7 +99,7 @@ public class VerificationCodeServiceImpl  extends ServiceImpl<VerificationCodesM
      * @param code
      */
     @Override
-    public Order scan(String code) {
+    public ManagerOrderDetailVO scan(String code) {
         // 查询核销码
         // 参数校验
         if (StringUtils.isBlank(code)  ) {
@@ -134,7 +131,7 @@ public class VerificationCodeServiceImpl  extends ServiceImpl<VerificationCodesM
         }
         // 检查订单状态
         Order order = orderMapper.selectById(verificationCodes.getOrderId());
-        if (order == null || !Objects.equals(order.getStatus(), OrderStatusEnum.VERIFY.getValue())) {
+        if (order == null || order.getStatus() != 6) {
             throw new IllegalArgumentException("订单状态异常，无法核销");
         }
 
@@ -143,7 +140,7 @@ public class VerificationCodeServiceImpl  extends ServiceImpl<VerificationCodesM
         if (verificationCodes.getStatus() == 1 || verificationCodes.getVerificationTime() != null) {
             throw new IllegalArgumentException("该订单已被核销，核销时间：" + verificationCodes.getVerificationTime());
         }
-        return order;
+        return orderService.selectById(verificationCodes.getOrderId());
     }
 
     @Override
@@ -214,7 +211,7 @@ public class VerificationCodeServiceImpl  extends ServiceImpl<VerificationCodesM
      */
     private String generateUniqueCode() {
         String uuid = java.util.UUID.randomUUID().toString().replaceAll("-", "");
-        return CodePrefix.HXM.name()+"-" + uuid.substring(0, 16).toUpperCase();
+        return uuid.substring(0, 16).toUpperCase();
     }
 
     @Override