Selaa lähdekoodia

bug修改,订单申请退款后,小订单状态也改成申请退款中

LiRong 3 kuukautta sitten
vanhempi
commit
84a9c3aeea

+ 8 - 5
leromro-core/src/main/java/com/leromro/core/service/impl/OrderRefundServiceImpl.java

@@ -195,11 +195,14 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             if (secondOrderList.size() <= 0){
                 throw new RuntimeException("订单已全部开始,不可退款");
             }
+            List<Long> secondOrderIdList = secondOrderList.stream().map(SecondOrder::getSecondOrderId).collect(Collectors.toList());
             orderRefund.setStatus("0");
             orderRefund.setRefundAmount(mainOrders.getServiceOnePrice().multiply(BigDecimal.valueOf(mainOrders.getSingleQuantity())).multiply(new BigDecimal(mainOrders.getTotalTimes() - secondOrderList.size())));
             this.save(orderRefund);
-            UpdateWrapper<MainOrders> mainOrderUpdateWrapper = new UpdateWrapper<MainOrders>().eq("main_order_id", mainOrderId).set("order_status", "5");
+            UpdateWrapper<MainOrders> mainOrderUpdateWrapper = new UpdateWrapper<MainOrders>().eq("main_order_id", secondOrderIdList).set("order_status", "5");
             mainOrdersMapper.update(null, mainOrderUpdateWrapper);
+            UpdateWrapper<SecondOrder> secondOrderUpdateWrapper = new UpdateWrapper<SecondOrder>().in("second_order_id", mainOrderId).set("order_status", "5");
+            secondOrdersMapper.update(null, secondOrderUpdateWrapper);
             return AjaxResult.success("已提交申请");
         } else if (mainOrders.getOrderStatus().equals("4") || mainOrders.getOrderStatus().equals("8")) {
             return AjaxResult.success("订单已全部完成,不可退款");
@@ -286,7 +289,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         QueryWrapper<MainOrders> mainOrdersQueryWrapper = new QueryWrapper<MainOrders>().eq("main_order_id", mainOrderId);
         MainOrders mainOrders = mainOrdersMapper.selectOne(mainOrdersQueryWrapper);
         //查询要修改的小订单的列表
-        QueryWrapper<SecondOrder> secondOrderQueryWrapper = new QueryWrapper<SecondOrder>().eq("main_order_id", mainOrderId).eq("order_status", "1");
+        QueryWrapper<SecondOrder> secondOrderQueryWrapper = new QueryWrapper<SecondOrder>().eq("main_order_id", mainOrderId).eq("order_status", "5");
         List<SecondOrder> secondOrderList = secondOrdersMapper.selectList(secondOrderQueryWrapper);
 
         if (orderRefund.getStatus().equals("2")) {
@@ -338,8 +341,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             //更改状态 更改更新时间,更改审批状态、退款钱数、原因、图片。
             orderRefund.setUpdateTime(DateTimeUtil.getNowTime());
             lOrderRefundMapper.updateLOrderRefund(orderRefund);
-
-
             //修改志愿者的工作时间以及日期
             updateVolunteerWorkDateAndTime(secondOrderList,mainOrders);
 
@@ -364,6 +365,8 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             } else {
                 UpdateWrapper<MainOrders> mainOrdersMapperUpdateWrapper = new UpdateWrapper<MainOrders>().eq("main_order_id", mainOrderId).set("order_status", 3);
                 mainOrdersMapper.update(null, mainOrdersMapperUpdateWrapper);
+                UpdateWrapper<SecondOrder> secondOrdersMapperUpdateWrapper = new UpdateWrapper<SecondOrder>().eq("main_order_id", mainOrderId).eq("order_status",5).set("order_status", 1);
+                secondOrdersMapper.update(null, secondOrdersMapperUpdateWrapper);
             }
             lOrderRefundMapper.updateLOrderRefund(orderRefund);
         }
@@ -441,7 +444,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         UpdateWrapper<MainOrders> mainOrderUpdateWrapper = new UpdateWrapper<MainOrders>().eq("main_order_id", mainOrderId).set("order_status",mainOrdersOrderStatus);
         mainOrdersMapper.update(null, mainOrderUpdateWrapper);
         //修改,小订单表
-        UpdateWrapper<SecondOrder> secondOrderUpdateWrapper = new UpdateWrapper<SecondOrder>().eq("main_order_id", mainOrderId).in("order_status","0","1").set("order_status", secondOrderStatus);
+        UpdateWrapper<SecondOrder> secondOrderUpdateWrapper = new UpdateWrapper<SecondOrder>().eq("main_order_id", mainOrderId).in("order_status","0","5").set("order_status", secondOrderStatus);
         secondOrdersMapper.update(null, secondOrderUpdateWrapper);
     }