zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单列表

Browse Source
This commit is contained in:
wangjinlei
2023-12-08 17:24:01 +08:00
parent bbe04ad425
commit c23bb86aca
3 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/book/entity/BuyOrderProduct.java
View File

@@ -53,4 +53,6 @@ public class BuyOrderProduct {
@TableField(exist = false) @TableField(exist = false)
private ShopProduct product; private ShopProduct product;
@TableField(exist = false)
private ExpressOrder expressOrder;
} }

55
src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
View File

@@ -383,36 +383,37 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
ShopProduct byId = shopProductService.getById(b1.getProductId()); ShopProduct byId = shopProductService.getById(b1.getProductId());
byId.setBooks(shopProductBookService.getBookByProductId(byId.getProductId())); byId.setBooks(shopProductBookService.getBookByProductId(byId.getProductId()));
b1.setProduct(byId); b1.setProduct(byId);
b1.setExpressOrder(expressOrderDao.selectById(b1.getExpressOrderId()));
} }
b.setProductList(buyOrderProducts); b.setProductList(buyOrderProducts);
//添加快递包裹信息 //添加快递包裹信息
LambdaQueryWrapper<BuyOrderProduct> b_wrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<BuyOrderProduct> b_wrapper = new LambdaQueryWrapper<>();
b_wrapper.eq(BuyOrderProduct::getOrderId,b.getOrderId()); // b_wrapper.eq(BuyOrderProduct::getOrderId,b.getOrderId());
b_wrapper.gt(BuyOrderProduct::getExpressOrderId,0); // b_wrapper.gt(BuyOrderProduct::getExpressOrderId,0);
List<Integer> collect = buyOrderProductService.getBaseMapper().selectList(b_wrapper).stream().map(BuyOrderProduct::getExpressOrderId).collect(Collectors.toList()); // List<Integer> collect = buyOrderProductService.getBaseMapper().selectList(b_wrapper).stream().map(BuyOrderProduct::getExpressOrderId).collect(Collectors.toList());
if(collect.size()>0){ // if(collect.size()>0){
List<ExpressOrder> expressOrders = expressOrderService.getBaseMapper().selectList(new LambdaQueryWrapper<ExpressOrder>().in(ExpressOrder::getId, collect)); // List<ExpressOrder> expressOrders = expressOrderService.getBaseMapper().selectList(new LambdaQueryWrapper<ExpressOrder>().in(ExpressOrder::getId, collect));
for (ExpressOrder e : expressOrders){ // for (ExpressOrder e : expressOrders){
MPJLambdaWrapper<BuyOrderProduct> buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>(); // MPJLambdaWrapper<BuyOrderProduct> buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>();
buyOrderProductMPJLambdaWrapper.selectAll(ShopProduct.class); // buyOrderProductMPJLambdaWrapper.selectAll(ShopProduct.class);
buyOrderProductMPJLambdaWrapper.select(BuyOrderProduct::getQuantity); // buyOrderProductMPJLambdaWrapper.select(BuyOrderProduct::getQuantity);
buyOrderProductMPJLambdaWrapper.select(BuyOrder::getOrderSn); // buyOrderProductMPJLambdaWrapper.select(BuyOrder::getOrderSn);
buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId); // buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId);
buyOrderProductMPJLambdaWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId); // buyOrderProductMPJLambdaWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId);
buyOrderProductMPJLambdaWrapper.eq(BuyOrderProduct::getExpressOrderId,e.getId()); // buyOrderProductMPJLambdaWrapper.eq(BuyOrderProduct::getExpressOrderId,e.getId());
List<ShopProduct> shopProducts = buyOrderProductDao.selectJoinList(ShopProduct.class, buyOrderProductMPJLambdaWrapper); // List<ShopProduct> shopProducts = buyOrderProductDao.selectJoinList(ShopProduct.class, buyOrderProductMPJLambdaWrapper);
for(ShopProduct s : shopProducts){ // for(ShopProduct s : shopProducts){
MPJLambdaWrapper<ShopProductBookEntity> shopProductBookEntityMPJLambdaWrapper = new MPJLambdaWrapper<>(); // MPJLambdaWrapper<ShopProductBookEntity> shopProductBookEntityMPJLambdaWrapper = new MPJLambdaWrapper<>();
shopProductBookEntityMPJLambdaWrapper.selectAll(BookEntity.class); // shopProductBookEntityMPJLambdaWrapper.selectAll(BookEntity.class);
shopProductBookEntityMPJLambdaWrapper.leftJoin(BookEntity.class,BookEntity::getId,ShopProductBookEntity::getBookId); // shopProductBookEntityMPJLambdaWrapper.leftJoin(BookEntity.class,BookEntity::getId,ShopProductBookEntity::getBookId);
shopProductBookEntityMPJLambdaWrapper.eq(ShopProductBookEntity::getProductId,s.getProductId()); // shopProductBookEntityMPJLambdaWrapper.eq(ShopProductBookEntity::getProductId,s.getProductId());
List<BookEntity> bookEntities = shopProductBookDao.selectJoinList(BookEntity.class, shopProductBookEntityMPJLambdaWrapper); // List<BookEntity> bookEntities = shopProductBookDao.selectJoinList(BookEntity.class, shopProductBookEntityMPJLambdaWrapper);
s.setBooks(bookEntities); // s.setBooks(bookEntities);
} // }
e.setProducts(shopProducts); // e.setProducts(shopProducts);
} // }
b.setExpressList(expressOrders); // b.setExpressList(expressOrders);
} // }
} }
return buyOrderPage; return buyOrderPage;
} }

20
src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java
View File

@@ -162,7 +162,15 @@ public class PointServiceImpl extends ServiceImpl<PointDao, PointEntity> impleme
k="列缺"; k="列缺";
} else if (s=="临泣") { } else if (s=="临泣") {
k="外关"; k="外关";
}else{ }else if (s=="内关") {
k="公孙";
}else if (s=="后溪") {
k="申脉";
}else if (s=="列缺") {
k="照海";
}else if (s=="外关") {
k="临泣";
} else{
k=""; k="";
} }
HashMap<String, Object> flag = new HashMap<>(); HashMap<String, Object> flag = new HashMap<>();
@@ -208,7 +216,15 @@ public class PointServiceImpl extends ServiceImpl<PointDao, PointEntity> impleme
k="列缺"; k="列缺";
} else if (s=="临泣") { } else if (s=="临泣") {
k="外关"; k="外关";
}else{ }else if (s=="内关") {
k="公孙";
}else if (s=="后溪") {
k="申脉";
}else if (s=="列缺") {
k="照海";
}else if (s=="外关") {
k="临泣";
} else{
k=""; k="";
} }
HashMap<String, Object> flag = new HashMap<>(); HashMap<String, Object> flag = new HashMap<>();