diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 3f7a0755..51002111 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -364,6 +364,7 @@ public class BuyOrderServiceImpl extends ServiceImpl impl LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(BuyOrder::getUserId,userOrderDto.getUserId()); wrapper.eq(userOrderDto.getOrderStatus()!=null,BuyOrder::getOrderStatus,userOrderDto.getOrderStatus()); + wrapper.orderByDesc(BuyOrder::getCreateTime); Page buyOrderPage = this.getBaseMapper().selectPage(new Page<>(userOrderDto.getPage(), userOrderDto.getLimit()), wrapper); for(BuyOrder b : buyOrderPage.getRecords()){ b.setUser(myUserService.getById(b.getUserId())); @@ -374,7 +375,7 @@ public class BuyOrderServiceImpl extends ServiceImpl impl bb.setProduct(shopProductService.getById(bb.getProductId())); } b.setProductList(buyOrderProducts); - b.setTimestamp(b.getCreateTime().getTime()); + b.setTimestamp(b.getCreateTime().getTime()/1000); } return buyOrderPage; @@ -399,7 +400,7 @@ public class BuyOrderServiceImpl extends ServiceImpl impl totalWeight = totalWeight.add( BigDecimal.valueOf(product.getWeight().doubleValue()).multiply(new BigDecimal(buyOrderProduct.getQuantity())) ); - totalWeight = totalWeight.setScale(0, RoundingMode.UP); + totalWeight = totalWeight.setScale(0, RoundingMode.UP);//对数值做增量舍 commodityList.add(commodity); } @@ -438,6 +439,8 @@ public class BuyOrderServiceImpl extends ServiceImpl impl buyOrderProduct.setShipped(1); } buyOrderProductService.updateBatchById(buyOrderProductList); + + //更改订单状态 QueryWrapper buyOrderQueryWrapper = new QueryWrapper<>(); buyOrderQueryWrapper.in("order_id", buyOrderIdList); List buyOrderList = list(buyOrderQueryWrapper);