|
|
@@ -1,5 +1,6 @@
|
|
|
package com.poyee.facade.impl;
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
@@ -28,6 +29,7 @@ import com.poyee.utils.LocaleTimeZoneUtil;
|
|
|
import com.poyee.utils.ServletUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.springframework.context.annotation.Bean;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.List;
|
|
|
@@ -69,7 +71,10 @@ public class ProductItemFacade implements IProductItemFacade {
|
|
|
return res;
|
|
|
})
|
|
|
.collect(Collectors.toList());
|
|
|
- return PageInfo.of(productListResList);
|
|
|
+ PageInfo<ProductItemListRes> returnPageInfo = new PageInfo<>();
|
|
|
+ BeanUtil.copyProperties(productItemPageInfo, returnPageInfo);
|
|
|
+ returnPageInfo.setList(productListResList);
|
|
|
+ return returnPageInfo;
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -133,7 +138,10 @@ public class ProductItemFacade implements IProductItemFacade {
|
|
|
lambdaQueryWrapper.in(ProductItem::getId, orderServiceProductItemSearchReq.getItemList());
|
|
|
}
|
|
|
PageInfo<ProductItem> productItemPageInfo = new PageInfo<>(this.productItemService.list(lambdaQueryWrapper));
|
|
|
- return PageInfo.of(productItemMapstruct.convertRes(productItemPageInfo.getList()));
|
|
|
+ PageInfo<OrderServiceProductItemSearchRes> returnPageInfo = new PageInfo<>();
|
|
|
+ BeanUtil.copyProperties(productItemPageInfo, returnPageInfo);
|
|
|
+ returnPageInfo.setList(productItemMapstruct.convertRes(productItemPageInfo.getList()));
|
|
|
+ return returnPageInfo;
|
|
|
}
|
|
|
}
|
|
|
|