提交代码

08.src/Xingxi/xingxi-miniprogram-api/pom.xml

@@ -124,6 +124,16 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.jhlabs</groupId>
+            <artifactId>filters</artifactId>
+            <version>2.0.235-1</version>
+        </dependency>
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.16</version>
+        </dependency>
     </dependencies>
 
     <build>

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/Order.java

@@ -0,0 +1,162 @@
+package com.xingxi.store.data.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xingxi.common.annotation.Excel;
+import com.xingxi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 订单对象 t_order
+ *
+ * @author xingxi
+ * @date 2025-02-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString
+public class Order extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    // 订单ID
+    private Long orderId;
+
+    // 订单号
+    @Excel(name = "订单号")
+    private String orderNo;
+
+    // 订单时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date orderTime;
+
+    // 订单状态
+    @Excel(name = "订单状态", dictType = "orderStatus")
+    private String orderStatus;
+
+    // 订单类别
+    @Excel(name = "订单类别", dictType = "orderType")
+    private String orderType;
+
+    // 优定团编号
+    @Excel(name = "优定团编号")
+    private Long groupId;
+
+    // 楼号
+    @Excel(name = "楼号")
+    private String buildingNo;
+
+    // 房号
+    @Excel(name = "房号")
+    private String roomNo;
+
+    // 跟团号
+    @Excel(name = "跟团号")
+    private Integer groupNo;
+
+    // 订单总额
+    @Excel(name = "订单总额")
+    private BigDecimal orderAmount;
+
+    // 支付金额
+    @Excel(name = "支付金额")
+    private BigDecimal payAmount;
+
+    // 商品数量
+    @Excel(name = "商品数量")
+    private Integer prodQuantity;
+
+    // 购方用户ID
+    @Excel(name = "购方用户ID")
+    private Long buyerId;
+
+    // 购方用户角色
+    @Excel(name = "购方用户角色")
+    private String buyerRole;
+
+    // 销方用户ID
+    @Excel(name = "销方用户ID")
+    private Long sellerId;
+
+    // 销方用户角色
+    @Excel(name = "销方用户角色")
+    private String sellerRole;
+
+    // 收款方ID
+    @Excel(name = "收款方ID")
+    private Long payeeId;
+
+    // 收款方角色
+    @Excel(name = "收款方角色")
+    private String payeeRole;
+
+    // 推荐人用户ID
+    @Excel(name = "推荐人用户ID")
+    private Long referrerId;
+
+    // 推荐人用户角色
+    @Excel(name = "推荐人用户角色")
+    private String referrerRole;
+
+    // 推荐人分佣比率
+    @Excel(name = "推荐人分佣比率")
+    private BigDecimal referrerRate;
+
+    // 平台服务费率
+    @Excel(name = "平台服务费率")
+    private BigDecimal serviceRate;
+
+    // 取消时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "取消时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date cancelTime;
+
+    // 完成时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date finishTime;
+
+    // 收件人省
+    @Excel(name = "收件人省")
+    private Long recProvId;
+
+    // 收件人省名称
+    @Excel(name = "收件人省名称")
+    private String recProvName;
+
+    // 收件人市
+    @Excel(name = "收件人市")
+    private Long recCityId;
+
+    // 收件人市名称
+    @Excel(name = "收件人市名称")
+    private String recCityName;
+
+    // 收件人区
+    @Excel(name = "收件人区")
+    private Long recAreaId;
+
+    // 收件人区名称
+    @Excel(name = "收件人区名称")
+    private String recAreaName;
+
+    // 收件人地址
+    @Excel(name = "收件人地址")
+    private String recAddress;
+
+    // 收件人姓名
+    @Excel(name = "收件人姓名")
+    private String recName;
+
+    // 收件人联系方式
+    @Excel(name = "收件人联系方式")
+    private String recPhone;
+
+    // 删除标志（0代表存在 2代表删除）
+    @Excel(name = "删除标志", readConverterExp = "0=代表存在,2=代表删除")
+    private String delFlag;
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderDTO.java

@@ -1,6 +1,5 @@
 package com.xingxi.store.data.domain;
 
-import com.xingxi.business.domain.Order;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Getter;
 import lombok.Setter;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderDetail.java

@@ -0,0 +1,133 @@
+package com.xingxi.store.data.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xingxi.common.annotation.Excel;
+import com.xingxi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 订单明细对象 t_order_detail
+ *
+ * @author xingxi
+ * @date 2025-02-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString
+public class OrderDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    // 订单明细ID
+    private Long orderDetailId;
+
+    // 订单ID
+    @Excel(name = "订单ID")
+    private Long orderId;
+
+    // 套组ID
+    @Excel(name = "套组ID")
+    private String suiteId;
+
+    // 商品ID
+    @Excel(name = "商品ID")
+    private Long prodId;
+
+    // 商品名
+    @Excel(name = "商品名")
+    private String prodName;
+
+    // 属性组合编号
+    @Excel(name = "属性组合编号")
+    private Long pprId;
+
+    // 属性组合名称
+    @Excel(name = "属性组合名称")
+    private String pprName;
+
+    // 用户设计编号
+    @Excel(name = "用户设计编号")
+    private String upId;
+
+    // 元商品ID
+    @Excel(name = "元商品ID")
+    private Long orgProdId;
+
+    // 商品区分
+    @Excel(name = "商品区分")
+    private String prodType;
+
+    // 素材ID
+    @Excel(name = "素材ID")
+    private Long mateId;
+
+    // 素材名称
+    @Excel(name = "素材名称")
+    private String mateName;
+
+    // 素材区分
+    @Excel(name = "素材区分")
+    private String mateType;
+
+    // 平台经销标志 0：供应商直销，1：平台经销
+    @Excel(name = "平台经销标志")
+    private String pfSellFlag;
+
+    // 平台服务费率（供应商）
+    @Excel(name = "平台服务费率（供应商）")
+    private BigDecimal vendorServiceRate;
+
+    // 供应商ID
+    @Excel(name = "供应商ID")
+    private Long vendorId;
+
+    // 设计面数量
+    @Excel(name = "设计面数量")
+    private Integer surfaceQty;
+
+    // 单位数量
+    @Excel(name = "单位数量")
+    private Integer unitQty;
+
+    // 购买数量
+    @Excel(name = "购买数量")
+    private Integer buyQty;
+
+    // 售后中数量
+    @Excel(name = "售后中数量")
+    private Integer afterQty;
+
+    // 已退货数量
+    @Excel(name = "已退货数量")
+    private Integer returnQty;
+
+    // 购买单价
+    @Excel(name = "购买单价")
+    private BigDecimal buyPrice;
+
+    // 销方结算价
+    @Excel(name = "销方结算价")
+    private BigDecimal salePrice;
+
+    // 确认收货时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "确认收货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date confirmTime;
+
+    // 完成时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date finishTime;
+
+    // 订单明细状态
+    @Excel(name = "订单明细状态")
+    private String orderDetailStatus;
+
+    // 删除标志（0代表存在 2代表删除）
+    @Excel(name = "删除标志", readConverterExp = "0=代表存在,2=代表删除")
+    private String delFlag;
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderDetailDTO.java

@@ -1,7 +1,6 @@
 package com.xingxi.store.data.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.xingxi.business.domain.OrderDetail;
 import lombok.Getter;
 import lombok.Setter;
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/OrderCreateResponse.java

@@ -1,8 +1,8 @@
 package com.xingxi.store.model;
 
 
+import com.xingxi.store.data.domain.Order;
 import com.xingxi.store.data.domain.OrderPaySignDTO;
-import com.xingxi.business.domain.Order;
 import lombok.Value;
 
 @Value

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/clear/ClearOrderCanceledMqConsumer.java

@@ -1,106 +0,0 @@
-package com.xingxi.mq.consumer.clear;
-
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import com.xingxi.common.mq.bo.order.OrderCanceledBO;
-import com.xingxi.common.mq.constant.OrderMqKey;
-import com.xingxi.common.mq.core.AbstractRabbitConsumer;
-import com.xingxi.common.utils.DateUtils;
-import com.xingxi.mq.server.order.service.IClearOrderVoService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @ClassName ClearOrderCanceledMqConsumer
- * @projectName xingxi
- * @Deacription 订单取消消息接受处理
- * @Author FZ.Dong
- * @Date 2020/9/15 16:56
- * @Version 1.0
- **/
-@Slf4j
-@Component
-public class ClearOrderCanceledMqConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IClearOrderVoService iClearOrderVoService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_CLEAR_FOR_CANCELED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_CLEAR_FOR_CANCELED,
-                OrderMqKey.EDIT_ROUTE_FOR_CANCELED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_CLEAR_FOR_CANCELED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("清分订单取消MQ： 处理推送的订单数据【{}】", body);
-        Date nowDate = DateUtils.getNowDate();
-
-        // json对象转换
-        List<OrderCanceledBO> canceledBos = JSON.parseArray(body, OrderCanceledBO.class);
-
-        // 按照订单分组
-        Map<Long, List<OrderCanceledBO>> orderMap = canceledBos.stream().collect(Collectors.groupingBy(item -> item.getOrderId()));
-        // 按照订单分组
-        for (Map.Entry<Long, List<OrderCanceledBO>> orderEntry : orderMap.entrySet()) {
-
-            // 订单ID
-            Long orderId = orderEntry.getKey();
-
-            // 退款明细
-            List<OrderCanceledBO> cancels = orderEntry.getValue();
-//            for (OrderCanceledBO ocbo : cancels) {
-//                ClearOrderDetail scod = new ClearOrderDetail();
-//                // 设置订单编号
-//                scod.setOrderId(ocbo.getOrderId());
-//                scod.setSuiteId(ocbo.getSuiteId());
-//                scod.setOrderDetailId(ocbo.getOrderDetailId());
-//                // 订单明细数据取得
-//                List<ClearOrderDetail> detailList = iClearOrderDetailService.selectClearOrderDetailList(scod);
-//                for(ClearOrderDetail cod : detailList) {
-//                    ClearOrderDetail ucod = new ClearOrderDetail();
-//                    ucod.setId(cod.getId());
-//                    // 设置退货数量等于订单数量
-//                    ucod.setReturnQty(cod.getOrderQty());
-//                    // 取消状态
-//                    ucod.setOrderStatus(EOrderStatus.CANCELLED.getVal());
-//                    // 设置更新用户
-//                    ucod.setUpdateUser("清分订单取消MQ");
-//                    // 设置更新时间
-//                    ucod.setUpdateTime(nowDate);
-//                    iClearOrderDetailService.updateClearOrderDetail(ucod);
-//                }
-//            }
-
-            // 明细全取消的情况，主订单也更新取消状态
-//            ClearOrder uco = new ClearOrder();
-//            uco.setOrderId(orderId);
-//            uco.setOrderStatus(EOrderStatus.CANCELLED.getVal());
-//            uco.setUpdateTime(nowDate);
-//            uco.setUpdateUser("清分订单取消MQ");
-//            iClearOrderVoService.syncOrderStatusByOrderId(uco);
-        }
-        log.info("清分订单取消MQ： 推送的订单数据处理完成.");
-        return true;
-    }
-    
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/clear/ClearOrderFinishedMqConsumer.java

@@ -1,106 +0,0 @@
-package com.xingxi.mq.consumer.clear;
-
-import com.xingxi.common.mq.bo.order.OrderFinishedBO;
-import com.xingxi.common.mq.constant.OrderMqKey;
-import com.xingxi.common.mq.core.AbstractRabbitConsumer;
-import com.xingxi.common.utils.DateUtils;
-import com.xingxi.mq.server.order.service.IOrderDetailVoService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ClassName ClearOrderReturnedMqConsumer
- * @projectName xingxi
- * @Deacription 订单完成消息接受处理
- * @Author FZ.Dong
- * @Date 2020/9/15 16:56
- * @Version 1.0
- **/
-@Slf4j
-@Component
-public class ClearOrderFinishedMqConsumer extends AbstractRabbitConsumer
-{
-    @Resource
-    private IOrderDetailVoService orderDetailVoService;
-
-//    @Resource
-//    private IClearOrderService iClearOrderService;
-
-//    @Resource
-//    private IClearOrderDetailService iClearOrderDetailService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_CLEAR_FOR_FINISHED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_CLEAR_FOR_FINISHED,
-                OrderMqKey.EDIT_ROUTE_FOR_FINISHED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_CLEAR_FOR_FINISHED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("清分订单完成MQ： 处理推送的订单数据【{}】", body);
-
-        Date nowDate = DateUtils.getNowDate();
-
-        // json对象转换
-        OrderFinishedBO orderFinishedBO = JSON.parseObject(body, OrderFinishedBO.class);
-
-        // 订单明细
-//        ClearOrderDetail scod = new ClearOrderDetail();
-//        // 设置订单编号
-//        scod.setOrderId(orderFinishedBO.getOrderId());
-//        scod.setOrderDetailId(orderFinishedBO.getOrderDetailId());
-//        scod.setSuiteId(orderFinishedBO.getSuiteId());
-//        // 订单明细数据取得
-//        List<ClearOrderDetail> detailList = iClearOrderDetailService.selectClearOrderDetailList(scod);
-
-//        if(CollectionUtils.isEmpty(detailList)){
-//            log.info("清分订单完成MQ： 订单【{}】明细表不存在，不做处理.", orderFinishedBO.getOrderId());
-//            return true;
-//        }
-//        for(ClearOrderDetail cod : detailList) {
-//            ClearOrderDetail ucod = new ClearOrderDetail();
-//            ucod.setId(cod.getId());
-//            // 完成状态
-//            ucod.setOrderStatus(EOrderStatus.FINISHED.getVal());
-//            // 完成时间
-//            ucod.setFinishTime(nowDate);
-//            // 设置更新用户
-//            ucod.setUpdateUser("清分订单完成MQ");
-//            // 设置更新时间
-//            ucod.setUpdateTime(nowDate);
-//            iClearOrderDetailService.updateClearOrderDetail(ucod);
-//        }
-
-        // 明细全完成的情况，主订单也更新完成状态
-//        if(orderDetailVoService.checkOrderFinished(orderFinishedBO.getOrderId()) <= 0) {
-//            ClearOrder uco = new ClearOrder();
-//            uco.setOrderId(orderFinishedBO.getOrderId());
-//            uco.setOrderStatus(EOrderStatus.FINISHED.getVal());
-//            uco.setUpdateTime(nowDate);
-//            uco.setUpdateUser("清分订单完成MQ");
-//            iClearOrderService.updateClearOrder(uco);
-//        }
-        log.info("清分订单完成MQ： 推送的订单数据处理完成.");
-        return true;
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/clear/ClearOrderReturnedMqConsumer.java

@@ -1,85 +0,0 @@
-package com.xingxi.mq.consumer.clear;
-
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import com.xingxi.common.mq.constant.OrderMqKey;
-import com.xingxi.common.mq.core.AbstractRabbitConsumer;
-import com.xingxi.common.utils.DateUtils;
-import com.xingxi.mq.server.order.service.IClearOrderDetailVoService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ClassName ClearOrderReturnedMqConsumer
- * @projectName xingxi
- * @Deacription 订单退货消息接受处理
- *              更新退货数量
- * @Author FZ.Dong
- * @Date 2020/9/15 16:56
- * @Version 1.0
- **/
-@Slf4j
-@Component
-public class ClearOrderReturnedMqConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IClearOrderDetailVoService iClearOrderDetailVoService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_CLEAR_FOR_RETURNED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_CLEAR_FOR_RETURNED,
-                OrderMqKey.EDIT_ROUTE_FOR_CANCELED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_CLEAR_FOR_RETURNED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("清分订单退货完成MQ： 处理推送的订单数据【{}】", body);
-
-        Date nowDate = DateUtils.getNowDate();
-
-        // json对象转换
-//        List<OrderReturnedBO> returnList = JSON.parseArray(body, OrderReturnedBO.class);
-//
-//        for (OrderReturnedBO orbo : returnList) {
-//
-//            int returnQty = 0;
-//            if(orbo.getStockQty() != null) {
-//                returnQty = orbo.getStockQty();
-//            }
-//            if(orbo.getScrapQty() != null) {
-//                returnQty = returnQty + orbo.getScrapQty();
-//            }
-//            if(returnQty <= 0) {
-//                continue;
-//            }
-//            ClearOrderDetail ucod = new ClearOrderDetail();
-//            // 设置订单编号
-//            ucod.setOrderId(orbo.getOrderId());
-//            ucod.setOrderDetailId(orbo.getOrderDetailId());
-//            ucod.setSuiteId(orbo.getSuiteId());
-//            ucod.setReturnQty(returnQty);
-//            ucod.setUpdateTime(nowDate);
-//            ucod.setUpdateUser("清分订单退货完成MQ");
-//            iClearOrderDetailVoService.updateReturnQty(ucod);
-//        }
-
-        log.info("清分订单退货完成MQ： 推送的订单数据处理完成.");
-        return true;
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/order/OrderReturnedConsumer.java

@@ -7,8 +7,8 @@ import com.xingxi.common.mq.bo.order.OrderReturnedBO;
 import com.xingxi.common.mq.constant.OrderMqKey;
 import com.xingxi.common.mq.core.AbstractRabbitConsumer;
 import com.xingxi.common.utils.DateUtils;
+import com.xingxi.mq.entity.OrderDetail;
 import com.xingxi.mq.server.order.service.IOrderDetailVoService;
-import com.xingxi.business.domain.OrderDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.Message;

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/mapper/OrderDetailMqMapper.java

@@ -1,6 +1,6 @@
 package com.xingxi.mq.server.order.mapper;
 
-import com.xingxi.business.domain.OrderDetail;
+import com.xingxi.mq.entity.OrderDetail;
 import org.springframework.stereotype.Repository;
 
 /**

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/impl/OrderDetailVoServiceImpl.java

@@ -1,8 +1,8 @@
 package com.xingxi.mq.server.order.service.impl;
 
+import com.xingxi.mq.entity.OrderDetail;
 import com.xingxi.mq.server.order.mapper.OrderDetailMqMapper;
 import com.xingxi.mq.server.order.service.IOrderDetailVoService;
-import com.xingxi.business.domain.OrderDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;