|
@@ -1,25 +1,25 @@
|
|
|
package com.sd.business.service.order.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.sd.business.entity.order.dto.OrderInfoDto;
|
|
|
+import com.sd.business.entity.order.dto.OrderInfoSelectDto;
|
|
|
import com.sd.business.entity.order.dto.OrderSkuDto;
|
|
|
import com.sd.business.entity.order.enums.ArtworkLogTypeEnum;
|
|
|
import com.sd.business.entity.order.po.OrderInfo;
|
|
|
import com.sd.business.entity.order.po.OrderSku;
|
|
|
import com.sd.business.entity.order.po.OrderSkuArtworkLog;
|
|
|
+import com.sd.business.entity.order.vo.OrderInfoVo;
|
|
|
import com.sd.business.entity.order.vo.OrderSkuVo;
|
|
|
import com.sd.business.mapper.order.OrderMapper;
|
|
|
import com.sd.business.service.bom.BomSpecService;
|
|
|
import com.sd.business.service.order.OrderService;
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.sd.business.entity.order.vo.OrderInfoVo;
|
|
|
-import com.sd.business.entity.order.dto.OrderInfoSelectDto;
|
|
|
-import com.sd.business.entity.order.dto.OrderInfoDto;
|
|
|
import com.sd.business.service.order.OrderSkuArtworkLogService;
|
|
|
import com.sd.business.service.order.OrderSkuService;
|
|
|
import com.sd.business.util.CodeEnum;
|
|
|
-import com.sd.framework.util.sql.Sql;
|
|
|
import com.sd.framework.util.Assert;
|
|
|
+import com.sd.framework.util.sql.Sql;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -55,7 +55,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
|
|
|
.selectAll(OrderInfo.class)
|
|
|
.from(OrderInfo.class)
|
|
|
.orderByDesc(OrderInfo::getId)
|
|
|
- .page(dto.getPage());
|
|
|
+ .page(dto);
|
|
|
|
|
|
return page;
|
|
|
}
|