orderinfo迁移

2025-11-26 15:41:04 +08:00
parent 9df0ee52ec
commit 6c4458113e
31 changed files with 392 additions and 75 deletions
--- a/cash-api/order-server/src/main/java/com/czg/config/RedisKeyExpirationListener.java
+++ b/cash-api/order-server/src/main/java/com/czg/config/RedisKeyExpirationListener.java
@@ -5,7 +5,7 @@ import com.czg.market.entity.MkShopCouponRecord;
 import com.czg.market.service.AcPushEventService;
 import com.czg.market.service.MkShopCouponRecordService;
 import com.czg.market.service.SmsPushEventService;
-import com.czg.order.service.OrderInfoService;
+import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -31,7 +31,7 @@ public class RedisKeyExpirationListener implements MessageListener {
    @Value("${spring.data.redis.database}")
    private String database;
    @Resource
-    private OrderInfoService orderInfoService;
+    private OrderInfoCustomServiceImpl orderInfoService;
    @DubboReference
    private ShopTableService tableService;
    @Resource
--- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
@@ -4,22 +4,20 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.CzgPayUtils;
-import com.czg.account.service.ShopInfoService;
 import com.czg.entity.CzgBaseRespParams;
 import com.czg.market.entity.MkShopConsumeDiscountRecord;
 import com.czg.market.service.MkDistributionUserService;
 import com.czg.market.service.MkShopConsumeDiscountRecordService;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.entity.OrderPayment;
-import com.czg.order.service.OrderInfoService;
 import com.czg.order.service.OrderPaymentService;
 import com.czg.service.market.service.impl.AppWxServiceImpl;
+import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl;
 import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -39,7 +37,7 @@ public class NotifyController {
    private static final String SUCCESS = "SUCCESS";

    @Resource
-    private OrderInfoService orderInfoService;
+    private OrderInfoCustomServiceImpl orderInfoService;

    @Resource
    private AppWxServiceImpl wxService;
--- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
@@ -5,10 +5,11 @@ import cn.hutool.core.util.URLUtil;
 import com.czg.annotation.Debounce;
 import com.czg.order.dto.CheckOrderPay;
 import com.czg.order.entity.OrderInfo;
-import com.czg.order.service.OrderInfoService;
+import com.czg.order.service.OrderInfoCustomService;
 import com.czg.resp.CzgResult;
 import com.czg.service.order.dto.OrderPayParamDTO;
 import com.czg.service.order.service.PayService;
+import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl;
 import com.czg.system.enums.SysParamCodeEnum;
 import com.czg.system.service.SysParamsService;
 import com.czg.utils.AssertUtil;
@@ -36,7 +37,7 @@ public class OrderPayController {
    @Resource
    private PayService payService;
    @Resource
-    private OrderInfoService orderInfoService;
+    private OrderInfoCustomServiceImpl orderInfoService;
    @DubboReference
    private SysParamsService paramsService;

--- a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java
@@ -5,7 +5,7 @@ import com.czg.annotation.SaStaffCheckPermission;
 import com.czg.config.RabbitPublisher;
 import com.czg.order.dto.*;
 import com.czg.order.entity.OrderInfo;
-import com.czg.order.service.OrderInfoService;
+import com.czg.order.service.OrderInfoCustomService;
 import com.czg.order.vo.HistoryOrderPrintVo;
 import com.czg.order.vo.HistoryOrderVo;
 import com.czg.order.vo.OrderInfoVo;
@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.*;
 public class AdminOrderController {

    @Resource
-    private OrderInfoService orderInfoService;
+    private OrderInfoCustomService orderInfoService;
    @Resource
    private PayService payService;
    @Resource
--- a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
@@ -9,12 +9,12 @@ import com.czg.order.dto.OrderInfoQueryDTO;
 import com.czg.market.entity.MemberOrder;
 import com.czg.order.entity.OrderInfo;
 import com.czg.market.service.MemberOrderService;
-import com.czg.order.service.OrderInfoService;
 import com.czg.order.vo.HistoryOrderVo;
 import com.czg.order.vo.OrderInfoVo;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import com.czg.service.order.enums.OrderStatusEnums;
+import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl;
 import com.czg.utils.AssertUtil;
 import com.czg.utils.ServletUtil;
 import com.mybatisflex.core.paginate.Page;
@@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.*;
 public class UserOrderController {

    @Resource
-    private OrderInfoService orderInfoService;
+    private OrderInfoCustomServiceImpl orderInfoService;

    @Resource
    private MemberOrderService memberOrderService;
--- a/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java
+++ b/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java
@@ -5,10 +5,12 @@ import cn.hutool.core.exceptions.ExceptionUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.config.RabbitConstants;
+import com.czg.market.service.OrderInfoService;
 import com.czg.order.entity.MqLog;
 import com.czg.order.service.MqLogService;
+import com.czg.order.service.OrderInfoCustomService;
 import com.czg.order.service.OrderInfoRpcService;
-import com.czg.order.service.OrderInfoService;
+import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl;
 import com.czg.service.order.utils.FunUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +31,7 @@ public class OrderMqListener {
    @Resource
    private MqLogService mqLogService;
    @Resource
-    private OrderInfoService orderInfoService;
+    private OrderInfoCustomServiceImpl orderInfoService;
    @Resource
    private FunUtil funUtil;

--- a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java
+++ b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java
@@ -1,31 +1,20 @@
 package com.czg.mq;

 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.czg.account.entity.PrintMachine;
-import com.czg.account.service.PrintMachineService;
 import com.czg.config.RabbitConstants;
 import com.czg.config.RedisCst;
 import com.czg.order.entity.MqLog;
-import com.czg.order.entity.OrderInfo;
 import com.czg.order.service.MqLogService;
-import com.czg.order.service.OrderInfoService;
 import com.czg.service.order.print.PrinterHandler;
 import com.czg.service.order.utils.FunUtil;
-import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;

-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;

 /**
--- a/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java
+++ b/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java
@@ -2,8 +2,8 @@ package com.czg.task;

 import cn.hutool.core.date.DateUtil;
 import com.czg.order.entity.OrderInfo;
-import com.czg.order.service.OrderInfoService;
 import com.czg.service.order.enums.OrderStatusEnums;
+import com.czg.service.order.service.impl.OrderInfoCustomServiceImpl;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
@Component
 public class OTimeTask {
    @Resource
-    private OrderInfoService orderInfoService;
+    private OrderInfoCustomServiceImpl orderInfoService;

    /**
     * order 过期