订单列表
This commit is contained in:
@@ -53,4 +53,6 @@ public class BuyOrderProduct {
|
||||
|
||||
@TableField(exist = false)
|
||||
private ShopProduct product;
|
||||
@TableField(exist = false)
|
||||
private ExpressOrder expressOrder;
|
||||
}
|
||||
|
||||
@@ -383,36 +383,37 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
|
||||
ShopProduct byId = shopProductService.getById(b1.getProductId());
|
||||
byId.setBooks(shopProductBookService.getBookByProductId(byId.getProductId()));
|
||||
b1.setProduct(byId);
|
||||
b1.setExpressOrder(expressOrderDao.selectById(b1.getExpressOrderId()));
|
||||
}
|
||||
b.setProductList(buyOrderProducts);
|
||||
//添加快递包裹信息
|
||||
LambdaQueryWrapper<BuyOrderProduct> b_wrapper = new LambdaQueryWrapper<>();
|
||||
b_wrapper.eq(BuyOrderProduct::getOrderId,b.getOrderId());
|
||||
b_wrapper.gt(BuyOrderProduct::getExpressOrderId,0);
|
||||
List<Integer> collect = buyOrderProductService.getBaseMapper().selectList(b_wrapper).stream().map(BuyOrderProduct::getExpressOrderId).collect(Collectors.toList());
|
||||
if(collect.size()>0){
|
||||
List<ExpressOrder> expressOrders = expressOrderService.getBaseMapper().selectList(new LambdaQueryWrapper<ExpressOrder>().in(ExpressOrder::getId, collect));
|
||||
for (ExpressOrder e : expressOrders){
|
||||
MPJLambdaWrapper<BuyOrderProduct> buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>();
|
||||
buyOrderProductMPJLambdaWrapper.selectAll(ShopProduct.class);
|
||||
buyOrderProductMPJLambdaWrapper.select(BuyOrderProduct::getQuantity);
|
||||
buyOrderProductMPJLambdaWrapper.select(BuyOrder::getOrderSn);
|
||||
buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId);
|
||||
buyOrderProductMPJLambdaWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId);
|
||||
buyOrderProductMPJLambdaWrapper.eq(BuyOrderProduct::getExpressOrderId,e.getId());
|
||||
List<ShopProduct> shopProducts = buyOrderProductDao.selectJoinList(ShopProduct.class, buyOrderProductMPJLambdaWrapper);
|
||||
for(ShopProduct s : shopProducts){
|
||||
MPJLambdaWrapper<ShopProductBookEntity> shopProductBookEntityMPJLambdaWrapper = new MPJLambdaWrapper<>();
|
||||
shopProductBookEntityMPJLambdaWrapper.selectAll(BookEntity.class);
|
||||
shopProductBookEntityMPJLambdaWrapper.leftJoin(BookEntity.class,BookEntity::getId,ShopProductBookEntity::getBookId);
|
||||
shopProductBookEntityMPJLambdaWrapper.eq(ShopProductBookEntity::getProductId,s.getProductId());
|
||||
List<BookEntity> bookEntities = shopProductBookDao.selectJoinList(BookEntity.class, shopProductBookEntityMPJLambdaWrapper);
|
||||
s.setBooks(bookEntities);
|
||||
}
|
||||
e.setProducts(shopProducts);
|
||||
}
|
||||
b.setExpressList(expressOrders);
|
||||
}
|
||||
// LambdaQueryWrapper<BuyOrderProduct> b_wrapper = new LambdaQueryWrapper<>();
|
||||
// b_wrapper.eq(BuyOrderProduct::getOrderId,b.getOrderId());
|
||||
// b_wrapper.gt(BuyOrderProduct::getExpressOrderId,0);
|
||||
// List<Integer> collect = buyOrderProductService.getBaseMapper().selectList(b_wrapper).stream().map(BuyOrderProduct::getExpressOrderId).collect(Collectors.toList());
|
||||
// if(collect.size()>0){
|
||||
// List<ExpressOrder> expressOrders = expressOrderService.getBaseMapper().selectList(new LambdaQueryWrapper<ExpressOrder>().in(ExpressOrder::getId, collect));
|
||||
// for (ExpressOrder e : expressOrders){
|
||||
// MPJLambdaWrapper<BuyOrderProduct> buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>();
|
||||
// buyOrderProductMPJLambdaWrapper.selectAll(ShopProduct.class);
|
||||
// buyOrderProductMPJLambdaWrapper.select(BuyOrderProduct::getQuantity);
|
||||
// buyOrderProductMPJLambdaWrapper.select(BuyOrder::getOrderSn);
|
||||
// buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId);
|
||||
// buyOrderProductMPJLambdaWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId);
|
||||
// buyOrderProductMPJLambdaWrapper.eq(BuyOrderProduct::getExpressOrderId,e.getId());
|
||||
// List<ShopProduct> shopProducts = buyOrderProductDao.selectJoinList(ShopProduct.class, buyOrderProductMPJLambdaWrapper);
|
||||
// for(ShopProduct s : shopProducts){
|
||||
// MPJLambdaWrapper<ShopProductBookEntity> shopProductBookEntityMPJLambdaWrapper = new MPJLambdaWrapper<>();
|
||||
// shopProductBookEntityMPJLambdaWrapper.selectAll(BookEntity.class);
|
||||
// shopProductBookEntityMPJLambdaWrapper.leftJoin(BookEntity.class,BookEntity::getId,ShopProductBookEntity::getBookId);
|
||||
// shopProductBookEntityMPJLambdaWrapper.eq(ShopProductBookEntity::getProductId,s.getProductId());
|
||||
// List<BookEntity> bookEntities = shopProductBookDao.selectJoinList(BookEntity.class, shopProductBookEntityMPJLambdaWrapper);
|
||||
// s.setBooks(bookEntities);
|
||||
// }
|
||||
// e.setProducts(shopProducts);
|
||||
// }
|
||||
// b.setExpressList(expressOrders);
|
||||
// }
|
||||
}
|
||||
return buyOrderPage;
|
||||
}
|
||||
|
||||
@@ -162,7 +162,15 @@ public class PointServiceImpl extends ServiceImpl<PointDao, PointEntity> impleme
|
||||
k="列缺";
|
||||
} else if (s=="临泣") {
|
||||
k="外关";
|
||||
}else{
|
||||
}else if (s=="内关") {
|
||||
k="公孙";
|
||||
}else if (s=="后溪") {
|
||||
k="申脉";
|
||||
}else if (s=="列缺") {
|
||||
k="照海";
|
||||
}else if (s=="外关") {
|
||||
k="临泣";
|
||||
} else{
|
||||
k="";
|
||||
}
|
||||
HashMap<String, Object> flag = new HashMap<>();
|
||||
@@ -208,7 +216,15 @@ public class PointServiceImpl extends ServiceImpl<PointDao, PointEntity> impleme
|
||||
k="列缺";
|
||||
} else if (s=="临泣") {
|
||||
k="外关";
|
||||
}else{
|
||||
}else if (s=="内关") {
|
||||
k="公孙";
|
||||
}else if (s=="后溪") {
|
||||
k="申脉";
|
||||
}else if (s=="列缺") {
|
||||
k="照海";
|
||||
}else if (s=="外关") {
|
||||
k="临泣";
|
||||
} else{
|
||||
k="";
|
||||
}
|
||||
HashMap<String, Object> flag = new HashMap<>();
|
||||
|
||||
Reference in New Issue
Block a user