提交

src/main/java/com/example/afrishop_v3/models/TbCfOrder.java

@@ -216,7 +216,7 @@ public class TbCfOrder {
     }
 
     public BigDecimal getReduceAmount() {
-        return this.reduceAmount == BigDecimal.ZERO ? new BigDecimal("0.0") : reduceAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
+        return this.reduceAmount == null ? new BigDecimal("0.0") : reduceAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
 
     }
 

src/main/java/com/example/afrishop_v3/quartz/OrderTask.java

@@ -110,8 +110,9 @@ public class OrderTask {
             orderRepository.save(order);
             List<TbCfItemOrderR> orderDetailList = itemOrderRepository.findAllByOrderId(order.getOrderId());
             for (TbCfItemOrderR orderDetail : orderDetailList) {
-                orderDetail.setOrderStatus(OrderStatusEnum.CLOSE.getValue());
-                itemOrderRepository.save(orderDetail);
+                //订单关闭
+//                orderDetail.setOrderStatus(OrderStatusEnum.CLOSE.getValue());
+//                itemOrderRepository.save(orderDetail);
                 logger.info("商品释放库存。。。");
                 //释放库存
                 Optional<TbCfItemSkus> skuOptional = itemSkuRepository.findFirstByItemId(orderDetail.getItemId());