取消订单校验优化

xin

2025-08-19 d6d06b62f76cb972bb220035401520e100cb1a35

 oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java

@@ -54,7 +54,9 @@
    private final RedisUtils redisUtils;
    private final StoreService storeService;
    private final OrderOperationLogService operationLogService;
    private final static String DESCRIBE = "哦应：";
    private static final String DESCRIBE = "哦应：";
    private static final String ORDER_KEY = "oying:order";
    private static final String ORDER_STORE_KEY = "oying:order:store";

    @Override
    public PageResult<Order> queryAll(OrderQueryCriteria criteria, Page<Object> page) {
@@ -91,7 +93,8 @@
        if (!(address.getDistance().compareTo(BigDecimal.valueOf(store.getRadius())) <= 0)) {
            throw new BadRequestException("超出配送范围");
        }
        String orderNum = redisUtils.generateOrderSn(GenerateEnum.ORDER.getKey());
        // 订单号
        String orderNum = redisUtils.generateSn(ORDER_KEY, GenerateEnum.ORDER.getKey());
        // 总金额
        BigDecimal amount = BigDecimal.ZERO;
        // 商品快照
@@ -128,7 +131,7 @@
        // 订单信息
        Order order = new Order();
        order.setOrderNum(orderNum);
        order.setOrderStoreNum(redisUtils.generateOrderSn(Math.toIntExact(submit.getStoreId())).substring(orderNum.length() - 4));
        order.setOrderStoreNum(redisUtils.generateSn(ORDER_STORE_KEY, Math.toIntExact(submit.getStoreId())).substring(orderNum.length() - 4));
        order.setOrderStatus(OrderStatusEnum.ZERO.getKey());
        order.setOrderStatusDescribe(OrderStatusEnum.ZERO.getValue());
        order.setOrderRemark(submit.getRemark() != null ? submit.getRemark() : "");
@@ -172,7 +175,6 @@
        }

        OrderAddressSnapshot addressSnapshot = getOrderAddressSnapshot(orderNum, address);


        addressSnapshotService.save(addressSnapshot);
        orderMapper.insert(order);
@@ -265,7 +267,13 @@
    public OrderResponse getByOrderNum(String orderNum) {
        return new OrderResponse(orderMapper.getByOrderNum(orderNum),
                addressSnapshotService.queryByOrderNum(orderNum),
                operationLogService.getByOrderNum(orderNum));
                operationLogService.getByOrderNum(orderNum, null));
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Order queryByOrderNum(String orderNum) {
        return orderMapper.getByOrderNum(orderNum);
    }

    @Override
@@ -286,7 +294,7 @@
        OrderResponse response = getByOrderNum(orderNum);
        Order order = response.getOrder();
        if (order == null) {
            throw new BadRequestException("订单不存在");
            throw new BadRequestException("订单不存在！");
        }
        if (!SecurityUtils.getCurrentUserId().equals(order.getUserId())) {
            throw new BadRequestException("不能修改他人订单");
@@ -299,7 +307,7 @@
            case HWC:
            case HWC2:
                JSONObject object = swiftPassService.query(orderNum, anEnum);
                if (object.getString("trade_state").equals(PayStateEnum.NOTPAY.getKey())) {
                if (!object.getString("trade_state").equals(PayStateEnum.NOTPAY.getKey())) {
                    throw new BadRequestException(PayStateEnum.getValue(order.getPayState()));
                }
                swiftPassService.closeOrder(orderNum, anEnum);
@@ -327,6 +335,19 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteAll(List<Long> ids) {
        Long userid = SecurityUtils.getCurrentUserId();
        for (Long id : ids) {
            Order order = getById(id);
            if (order == null) {
                throw new BadRequestException("订单不存在！");
            }
            if (!order.getUserId().equals(userid)) {
                throw new BadRequestException("不能删除他人订单");
            }
            if (!order.getPayState().equals(PayStateEnum.NOTPAY.getKey())) {
                throw new BadRequestException("只能删除未支付订单");
            }
        }
        orderMapper.deleteBatchIds(ids);
    }