删除用户车票

netflix-dao/src/main/java/com/cyksj/model/entity/UserTicketClearedRecord.java

@@ -56,7 +56,8 @@ public class UserTicketClearedRecord extends BaseEntity{
 		disable("禁用账号分配车票"),
 		refund_balance("退款余额"),
 		abnormal("异常订单"),
-		dp("优惠加购订单退款")
+		dp("优惠加购订单退款"),
+		manual("手动清除"),
 		;
 		String desc;
 

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

@@ -6,10 +6,12 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GoodsDonSkuMapper;
 import com.cyksj.mapper.GroupsRelationIndependentRenewMapper;
@@ -21,6 +23,7 @@ import com.cyksj.model.manage.views.GroupsRelationBackView;
 import com.cyksj.model.views.GroupsRelationIndependentView;
 import com.cyksj.model.views.GroupsRelationRechargeView;
 import com.cyksj.model.views.OrderDonRenewView;
+import com.cyksj.service.relation.GroupRelationClearService;
 import com.cyksj.service.scheduler.SchedulerService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -61,6 +64,8 @@ public class CmsGroupRelationController {
 
     private final GroupsRelationIndependentRenewMapper groupsRelationIndependentRenewMapper;
 
+    private final GroupRelationClearService groupRelationClearService;
+
     @GetMapping("/get")
     public Result<List<GroupsRelationBackView>> get(){
         List<GroupsRelationBackView> search = beanSearcher.searchAll(GroupsRelationBackView.class, MapUtils.flatBuilder(request.getParameterMap())
@@ -235,4 +240,18 @@ public class CmsGroupRelationController {
                 .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }
+
+    /**
+     * 删除用户对应车票
+     */
+    @DeleteMapping("/clear/ticket/{relationId}")
+    @Log(module = "删除用户车票", businessType = BusinessType.DELETE, isSaveRequestData = true)
+    public Result<String> clearUserTicket(@PathVariable Long relationId) {
+        GroupsRelation relation = groupsRelationMapper.selectById(relationId);
+        if (relation == null) {
+            throw BusinessRuntimeException.getInstance("车票不存在");
+        }
+        groupRelationClearService.clearTicket(relation, UserTicketClearedRecord.Source.manual);
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
 }