Parcourir la source

挪了一下修改平台流水

LiRong il y a 1 semaine
Parent
commit
956f575e5b

+ 7 - 6
leromro-core/src/main/java/com/leromro/core/service/impl/OrderRefundServiceImpl.java

@@ -223,6 +223,10 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         Long mainOrderId = orderRefund.getMainOrderId();
         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");
+        List<SecondOrder> secondOrderList = secondOrdersMapper.selectList(secondOrderQueryWrapper);
+
         if (orderRefund.getStatus().equals("2")) {
             if (mainOrders.getPaymentMethod().equals("1")) {
                 //查询用户账余额账户
@@ -235,6 +239,9 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 //恢复用户余额,用户账户表增加钱数
                 UpdateWrapper<ClientAccount> clientAccountUpdateWrapper = new UpdateWrapper<ClientAccount>().eq("user_id", mainOrders.getUserId()).setSql("balance = balance + " + orderRefund.getRefundAmount());
                 clientAccountMapper.update(null, clientAccountUpdateWrapper);
+
+                //向平台流水表更改,减少其中的流水;
+                updatePlatformFinanceChange(secondOrderList,0,1,2);
             } else if (mainOrders.getPaymentMethod().equals("2")) {
                 //微信退款
             } else {
@@ -244,9 +251,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             orderRefund.setUpdateTime(DateTimeUtil.getNowTime());
             lOrderRefundMapper.updateLOrderRefund(orderRefund);
 
-            //查询要修改的小订单的列表
-            QueryWrapper<SecondOrder> secondOrderQueryWrapper = new QueryWrapper<SecondOrder>().eq("main_order_id", mainOrderId).eq("order_status", "1");
-            List<SecondOrder> secondOrderList = secondOrdersMapper.selectList(secondOrderQueryWrapper);
 
             //修改志愿者的工作时间以及日期
             updateVolunteerWorkDateAndTime(secondOrderList,mainOrders);
@@ -257,9 +261,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             updateMainOrderAndSeconderStatus(mainOrders,"6");
 
 
-            //向平台流水表更改,减少其中的流水;
-            updatePlatformFinanceChange(secondOrderList,0,1,2);
-
         } else if (orderRefund.getStatus().equals("3")) {
             //不通过
             orderRefund.setRefundApplyAmount(orderRefund.getRefundAmount());