zoujiajian пре 1 година
родитељ
комит
abffea6f1e

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

@@ -58,7 +58,8 @@ public class UserTicketClearedRecord extends BaseEntity{
 		abnormal("异常订单"),
 		dp("优惠加购订单退款"),
 		manual("手动清除"),
-		refund("退款")
+		refund("退款"),
+		vip_refund("退款")
 		;
 		String desc;
 

+ 2 - 1
netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -21,7 +21,8 @@
         cmt = 0,
         aq_type = 1,
         invite_link = null,
-        contact = null
+        contact = null,
+        is_vip = 0
         where id = #{entity.id}
         <if test="expireTime != null">
             and expiry_time = #{expireTime}

+ 5 - 0
netflix-service/src/main/java/com/cyksj/service/mange/vip/impl/CmsVipOrderServiceImpl.java

@@ -15,6 +15,7 @@ import com.cyksj.redis.RedisService;
 import com.cyksj.service.mange.MirrorUserCleatService;
 import com.cyksj.service.mange.vip.CmsVipOrderService;
 import com.cyksj.service.order.OrderRefundService;
+import com.cyksj.service.relation.GroupRelationClearService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -61,6 +62,8 @@ public class CmsVipOrderServiceImpl implements CmsVipOrderService {
 
 	private final MirrorUserCleatService mirrorUserCleatService;
 
+	private final GroupRelationClearService groupRelationClearService;
+
 	@Override
 	public void refundOrders(OrderRefundReq refundReq) throws Exception {
 		VipOrderDon orderDon = vipOrderDonMapper.selectById(refundReq.getOrderId());
@@ -143,6 +146,8 @@ public class CmsVipOrderServiceImpl implements CmsVipOrderService {
 				.eq(GroupsRelation::getIsVip, Boolean.TRUE));
 		groupsRelations.forEach(ticket -> {
 			if (overdue) {
+				//清除车票
+				groupRelationClearService.clearTicket(ticket, UserTicketClearedRecord.Source.vip_refund);
 				GroupsTrips groupsTrips = groupsMapper.selectById(ticket.getGroupsId());
 				if (groupsTrips != null) {
 					GoodsDonSku sku = skuMapper.selectById(groupsTrips.getSkuId());