|
@@ -4,7 +4,6 @@ import cn.hutool.core.date.DatePattern;
|
|
import cn.hutool.core.date.LocalDateTimeUtil;
|
|
import cn.hutool.core.date.LocalDateTimeUtil;
|
|
import cn.hutool.core.util.IdUtil;
|
|
import cn.hutool.core.util.IdUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
import com.kxs.common.core.constant.CommonConstants;
|
|
import com.kxs.common.core.constant.CommonConstants;
|
|
@@ -20,10 +19,12 @@ import com.kxs.common.pay.model.QueryResponse;
|
|
import com.kxs.common.security.util.SecurityUtils;
|
|
import com.kxs.common.security.util.SecurityUtils;
|
|
import com.kxs.lhb.basic.api.amqp.RabbitOrderTimeoutQueueMQ;
|
|
import com.kxs.lhb.basic.api.amqp.RabbitOrderTimeoutQueueMQ;
|
|
import com.kxs.lhb.basic.api.constant.enums.OrderStatusEnum;
|
|
import com.kxs.lhb.basic.api.constant.enums.OrderStatusEnum;
|
|
-import com.kxs.lhb.basic.api.dto.tongyi.*;
|
|
|
|
|
|
+import com.kxs.lhb.basic.api.dto.tongyi.OrderCancelReq;
|
|
|
|
+import com.kxs.lhb.basic.api.dto.tongyi.OrderSubmitReq;
|
|
|
|
+import com.kxs.lhb.basic.api.dto.tongyi.PreNumbersReq;
|
|
|
|
+import com.kxs.lhb.basic.api.dto.tongyi.QueryOrderReq;
|
|
import com.kxs.lhb.basic.api.model.*;
|
|
import com.kxs.lhb.basic.api.model.*;
|
|
import com.kxs.lhb.basic.api.vo.admin.sysOrder.QueryLogisticsVO;
|
|
import com.kxs.lhb.basic.api.vo.admin.sysOrder.QueryLogisticsVO;
|
|
-import com.kxs.lhb.basic.api.vo.tongyi.OrderChargeLevelRes;
|
|
|
|
import com.kxs.lhb.basic.api.vo.tongyi.QueryLogisticsRes;
|
|
import com.kxs.lhb.basic.api.vo.tongyi.QueryLogisticsRes;
|
|
import com.kxs.lhb.basic.biz.channel.BasicService;
|
|
import com.kxs.lhb.basic.biz.channel.BasicService;
|
|
import com.kxs.lhb.basic.biz.mapper.LhbOrderMapper;
|
|
import com.kxs.lhb.basic.biz.mapper.LhbOrderMapper;
|
|
@@ -35,7 +36,6 @@ import org.springframework.scheduling.annotation.Async;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.io.IOException;
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|