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

Merge remote-tracking branch 'origin/zcc'

Browse Source
This commit is contained in:
wangjinlei
2024-06-05 16:50:44 +08:00
parent 580270f1f0 72d6d1e888
commit 165a108ee2
7 changed files with 89 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java
View File

@@ -84,7 +84,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
new LambdaQueryWrapper<BuyOrderProduct>().eq(BuyOrderProduct::getOrderId, b.getOrderId()));
if (buyOrderProducts.size() > 0) {
for (BuyOrderProduct bb : buyOrderProducts){
bb.setProduct(shopProductDao.selectById(bb.getProductId()));
MPJLambdaWrapper<ShopProduct> w = new MPJLambdaWrapper<>();
w.disableLogicDel().eq(ShopProduct::getProductId,bb.getProductId());
bb.setProduct(shopProductDao.selectOne(w));
}
b.setProductList(buyOrderProducts);
b.setTimestamp(b.getCreateTime().getTime()/1000);
@@ -124,7 +126,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
//添加商品信息
MPJLambdaWrapper<BuyOrderProduct> buyOrderProductWrapper = new MPJLambdaWrapper<>();
buyOrderProductWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId);
buyOrderProductWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId);
//关掉本次查询del_flg = 0的条件，查询出已删除商品
buyOrderProductWrapper.disableSubLogicDel().leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId);
buyOrderProductWrapper.selectAs(BuyOrderProduct::getQuantity,"quantity");
buyOrderProductWrapper.selectAll(ShopProduct.class);
buyOrderProductWrapper.eq(BuyOrder::getOrderId,buyOrder.getOrderId());