fix 代充设置次数加上总次数；更换车票去掉退款状态订单限制

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -739,7 +739,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
                     .in(OrderDon::getUserId, userIdList)
                     .eq(OrderDon::getRelationId, relationId)
-                    .notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
+                    .notIn(OrderDon::getStatus, Constant.noOrderStatus)
                     .orderByDesc(OrderDon::getId)
                     .last("limit 1"));
             OrderDiscountPlusPurchaseSkuRelation plusPurchaseSkuRelation = null;
@@ -775,9 +775,9 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                 }
             }
             Assert.notNull(orderDon, "订单不存在");
-            if (orderDon.getStatus() == OrderDon.Status.refund) {
-                throw BusinessRuntimeException.getInstance("订单已退款");
-            }
+//            if (orderDon.getStatus() == OrderDon.Status.refund) {
+//                throw BusinessRuntimeException.getInstance("订单已退款");
+//            }
 
             //获取新车队
             LambdaQueryWrapper<GroupsTrips> queryWrapper = Wrappers.lambdaQuery(GroupsTrips.class)

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -256,6 +256,7 @@ public class CmsGroupRelationController {
                 throw BusinessRuntimeException.getInstance("扣除次数不能为负数");
             }
             int update = groupsRelationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+                    .set(GroupsRelation::getRechargeNum, relation.getRechargeNum() + req.getNum())
                     .set(GroupsRelation::getRechargeRemainNum, subAfterNum)
                     .eq(GroupsRelation::getId, relationId)
                     .eq(GroupsRelation::getRechargeRemainNum, rechargeRemainNum));