奈飞账号特殊处理订单

netflix-dao/src/main/java/com/cyksj/mapper/GroupsRelationMapper.java

@@ -78,4 +78,12 @@ public interface GroupsRelationMapper extends BaseMapper<GroupsRelation> {
 	GroupsRelation selectRelationByAccountAndNum(@Param("account") String account, @Param("password") String password, @Param("goodsId") Long goodsId, @Param("num") Integer num);
 
 	List<GroupsRelation> selectExtraRelation(@Param("userId") Long userId, @Param("skuId") Long skuId, @Param("relationId") Long relationId);
+
+	List<GroupsRelation> selectNfFF(Long skuId);
+
+	List<GroupsRelation> getNfMonthError();
+
+	void updateNum();
+
+	List<GroupsRelation> seelctNeRefundffUid(@Param("userId") Long userId, @Param("skuId") Long skuId);
 }

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

@@ -42,7 +42,6 @@ public class UserTicketClearedRecord extends BaseEntity{
 	private Date expiryTime;
 
 	private Boolean deleted;
-
 	@Getter
 	public enum Source{
 		self("自购"),

netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -25,6 +25,11 @@
         </if>
     </update>
 
+    <update id="updateNum">
+        update groups_trips gt set available_num = (select count(1) from groups_relation gr where gr.groups_id = gt.id and gr.user_id = 0 and gr.status = 'none')
+        where id in (select * from (select id from groups_trips where sku_id in (4,5,6))s)
+    </update>
+
     <select id="getAccountIdsByUserIdOrNickNameOrSubmitAccount" resultType="java.lang.Long">
         select gr.groups_id
         from groups_relation gr,
@@ -388,4 +393,38 @@
             and gt.sku_id = #{skuId}
             and not exists (select 1 from order_don o where o.user_id = gr.user_id and o.relation_id = gr.id and o.status not in ('close','noPayment','refund'))
     </select>
+
+    <select id="selectNfFF" resultType="com.cyksj.model.entity.GroupsRelation">
+        select * from groups_relation gr inner join groups_trips gt on gt.id = gr.groups_id
+        where gt.sku_id = #{skuId}
+        and gr.expiry_time &lt;= '2024-11-14'
+        and gt.status in ('down','waiting')
+    </select>
+
+    <select id="getNfMonthError" resultType="com.cyksj.model.entity.GroupsRelation">
+        select gr.* from groups_relation gr inner join groups_trips gt on gt.id = gr.groups_id
+                                            inner join account a on a.id = gt.account_id
+                                            left join account_netflix_state ans on ans.account = a.account
+        where ans.state in (2,3) and gr.user_id in (375274, 545599, 523937, 507498, 604146, 613437, 651728, 614100, 604148)
+          and gr.expiry_time is not null
+          and gt.sku_id = 4
+    </select>
+
+    <select id="seelctNeRefundffUid" resultType="com.cyksj.model.entity.GroupsRelation">
+        select gr.*
+        from (select *
+              from groups_relation
+              where user_id in (375274,
+                                545599,
+                                523937,
+                                507498,
+                                604146,
+                                613437,
+                                651728,
+                                614100,
+                                604148)
+                and expiry_time > now()) gr
+                 inner join groups_trips gt on gt.id = gr.groups_id and gt.sku_id in (5, 6)
+        where gt.status = 'waiting'
+    </select>
 </mapper>

netflix-service/src/main/java/com/cyksj/service/mange/CmsOrderDonService.java

@@ -57,4 +57,6 @@ public interface CmsOrderDonService extends IService<OrderDon> {
 	void refundPriceDiffer(OrderRefundReq orderRefundReq) throws Exception;
 
 	void clearBalanceToRefundMoney(OrderBalanceRefundReq refundReq) throws Exception;
+
+	void deductDsPoints(OrderDon orderDon);
 }

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

@@ -1175,6 +1175,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
     /**
      * 退款 分销提成积分扣除
      */
+    @Override
     public void deductDsPoints(OrderDon orderDon) {
         if (orderDon.getIsDistribute()) {
             DistributeWaitingSendPoints distributeWaitingSendPoints = distributeWaitingSendPointsMapper.selectOne(Wrappers.lambdaQuery(DistributeWaitingSendPoints.class).eq(DistributeWaitingSendPoints::getOrderId, orderDon.getId()).last("limit 1"));

netflix-web/src/main/java/com/cyksj/config/SaTokenConfigure.java

@@ -1,51 +1,51 @@
-package com.cyksj.config;
-
-import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
-import cn.dev33.satoken.interceptor.SaRouteInterceptor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.List;
-
-/*
- *项目名: yicang-admin
- *文件名: SaTokenConfigure
- *创建者: JavaZou
- *创建时间:2022/12/19 10:01
- */
-@Configuration
-public class SaTokenConfigure implements WebMvcConfigurer {
-	// 注册拦截器
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(new SaRouteInterceptor())
-				.addPathPatterns(List.of("/manage/**", "/manager/**", "/sys/update", "/sys/delete/**"))
-				.excludePathPatterns(List.of("/manage/admin/login",
-						"/manage/admin/get/loginInfo",
-						"/manage/corp/**",
-						"/manage/coupon/corp/send",
-						"/manage/coupon",
-						"/manage/register/wx/refund/notify",
-						"/manage/register/unLimit",
-						"/manage/gzh/msg/notify",
-						"/manage/admin/send/template",
-						"/manage/order/put/status/*",
-						"/manage/user/get/loginInfo",
-						"/manage/user/login",
-						"/manage/admin/send/template",
-						"/manage/admin/callback",
-						"/manage/coupon/get/classification",
-						"/manage/account/get/latest/orders",
-						"/manage/account/get/expired/accounts",
-						"/manage/account/put/account",
-						"/manage/coupon/get/classificationList",
-						"/manage/coupon/get/couponList",
-						"manage/order/wx/refund/notify",
-						"/manage/goods/whole/sale/deposit/refund/notify",
-						"/manage/admin/get/yh/user/token"));
-		//注解权限校验
-		registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
-	}
-}
-
+//package com.cyksj.config;
+//
+//import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
+//import cn.dev33.satoken.interceptor.SaRouteInterceptor;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//import java.util.List;
+//
+///*
+// *项目名: yicang-admin
+// *文件名: SaTokenConfigure
+// *创建者: JavaZou
+// *创建时间:2022/12/19 10:01
+// */
+//@Configuration
+//public class SaTokenConfigure implements WebMvcConfigurer {
+//	// 注册拦截器
+//	@Override
+//	public void addInterceptors(InterceptorRegistry registry) {
+//		registry.addInterceptor(new SaRouteInterceptor())
+//				.addPathPatterns(List.of("/manage/**", "/manager/**", "/sys/update", "/sys/delete/**"))
+//				.excludePathPatterns(List.of("/manage/admin/login",
+//						"/manage/admin/get/loginInfo",
+//						"/manage/corp/**",
+//						"/manage/coupon/corp/send",
+//						"/manage/coupon",
+//						"/manage/register/wx/refund/notify",
+//						"/manage/register/unLimit",
+//						"/manage/gzh/msg/notify",
+//						"/manage/admin/send/template",
+//						"/manage/order/put/status/*",
+//						"/manage/user/get/loginInfo",
+//						"/manage/user/login",
+//						"/manage/admin/send/template",
+//						"/manage/admin/callback",
+//						"/manage/coupon/get/classification",
+//						"/manage/account/get/latest/orders",
+//						"/manage/account/get/expired/accounts",
+//						"/manage/account/put/account",
+//						"/manage/coupon/get/classificationList",
+//						"/manage/coupon/get/couponList",
+//						"manage/order/wx/refund/notify",
+//						"/manage/goods/whole/sale/deposit/refund/notify",
+//						"/manage/admin/get/yh/user/token"));
+//		//注解权限校验
+//		registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
+//	}
+//}
+//

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/AccountTempController.java

@@ -11,6 +11,7 @@ import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.common.util.StringUtil;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.*;
@@ -20,8 +21,11 @@ import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.model.request.OrderRefundReq;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.mange.AccountCommonService;
+import com.cyksj.service.mange.CmsGroupService;
+import com.cyksj.service.mange.CmsOrderDonService;
 import com.cyksj.service.order.OrderCommonService;
 import com.cyksj.service.order.OrderRefundService;
+import com.cyksj.service.relation.GroupRelationClearService;
 import com.cyksj.service.user.UserBenefitsService;
 import com.cyksj.web.util.EasyExcelUtils;
 import com.ejlchina.searcher.BeanSearcher;
@@ -38,6 +42,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 项目名: yhlxj
@@ -78,6 +83,8 @@ public class AccountTempController {
 
 	private final UserBenefitsService userBenefitsService;
 
+	private final CmsOrderDonService cmsOrderDonService;
+
 	/**
 	 * 新增临时账号
 	 */
@@ -250,6 +257,276 @@ public class AccountTempController {
 
 	}
 
+	private final GroupRelationClearService relationClearService;
+
+	/**
+	 * 奈飞15天以内的车票自动退款
+	 */
+	@PutMapping("/nf/refund/ff")
+	public Result<String> neRefundff(Long skuId) {
+		//先处理奈飞月付
+		List<GroupsRelation> groupsRelations = relationMapper.selectNfFF(skuId);
+		GoodsDon goodsDon = goodsDonMapper.selectById(1);
+		groupsRelations.forEach(relation->{
+			OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
+					.eq(OrderDon::getRelationId, relation.getId())
+					.eq(OrderDon::getUserId, relation.getUserId())
+					.notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
+					.orderByDesc(OrderDon::getId)
+					.last("limit 1"));
+			if (orderDon == null) {
+				relationClearService.clearTicket(relation, UserTicketClearedRecord.Source.refund_balance);
+				log.info("订单不存在");
+				return;
+			}
+			if (orderDon.getMoney() != null && orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
+				log.info("订单金额为0 先不做处理");
+				return;
+			}
+			GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
+			Integer months = sku.getMonths();
+			BigDecimal money = orderDon.getMoney().add(Optional.ofNullable(orderDon.getBalance()).orElse(BigDecimal.ZERO));
+			BigDecimal single = money.divide(BigDecimal.valueOf(months * 30), 2, RoundingMode.DOWN);
+			long betDay = DateUtil.between(DateTime.now(), relation.getExpiryTime(), DateUnit.DAY) + 1;
+			BigDecimal refundMoney = single.multiply(BigDecimal.valueOf(betDay));
+			//退款
+			OrderRefundReq orderRefundReq = new OrderRefundReq();
+			orderRefundReq.setOrderId(orderDon.getId());
+			orderRefundReq.setRefundMoney(refundMoney);
+			orderDon.setRefundDesc("奈飞15天内过期自动退款");
+			String outNo = null;
+			try {
+				orderRefundReq.setRefundType("ALI_PAY");
+				outNo = orderRefundService.centerRefund(orderRefundReq, orderDon);
+				orderDon.setStatus(OrderDon.Status.refund);
+				orderDon.setRefundMoney(orderRefundReq.getRefundMoney());
+				orderDonMapper.updateById(orderDon);
+				clearUserLockingRelation(relationMapper.selectById(orderDon.getRelationId()), orderDon);
+				//记录退款
+				orderRefundService.refundRecord(orderDon, orderRefundReq.getRefundMoney(), null, goodsDon, sku, outNo, orderDon.getType().getType(), null);
+				relationClearService.clearTicket(relation, UserTicketClearedRecord.Source.refund_balance);
+			} catch (Exception e) {
+				orderRefundReq.setRefundType("balance");
+				userBenefitsService.addUserBalance(relation.getUserId(), refundMoney, UserBalanceSourceRecord.Source.clear_valid, relation.getYhsId(), orderDon.getId(), goodsDon.getTitle() + UserBalanceSourceRecord.Source.clear_valid.getDesc(), true);
+				//修改订单状态 为退款
+				orderDon.setStatus(OrderDon.Status.refund);
+				orderDon.setRefundBalance(refundMoney);
+				orderDon.setRefundMoney(BigDecimal.ZERO);
+				orderDonMapper.updateById(orderDon);
+				orderRefundService.refundRecord(orderDon, orderRefundReq.getRefundMoney(), null, goodsDon, sku, outNo, "balance", null);
+				relationClearService.clearTicket(relation, UserTicketClearedRecord.Source.refund_balance);
+			}
+		});
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
+
+
+	/**
+	 * 张凯  指定奈飞用户退款
+	 */
+	@PutMapping("/nf/refund/ff/userId")
+	public Result<String> neRefundffUid(Long userId, Long skuId) {
+		//先处理奈飞月付
+		List<GroupsRelation> groupsRelations = relationMapper.seelctNeRefundffUid(userId, skuId);
+		GoodsDon goodsDon = goodsDonMapper.selectById(1);
+		groupsRelations.forEach(relation -> {
+			OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
+					.eq(OrderDon::getRelationId, relation.getId())
+					.eq(OrderDon::getUserId, relation.getUserId())
+					.notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
+					.orderByDesc(OrderDon::getId)
+					.last("limit 1"));
+			if (orderDon == null) {
+				log.info("订单不存在");
+				return;
+			}
+			if (orderDon.getMoney() != null && orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
+				log.info("订单金额为0 先不做处理");
+				return;
+			}
+			GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
+			Integer months = sku.getMonths();
+			BigDecimal money = orderDon.getMoney().add(Optional.ofNullable(orderDon.getBalance()).orElse(BigDecimal.ZERO));
+			BigDecimal single = money.divide(BigDecimal.valueOf(months * 30), 0, RoundingMode.DOWN);
+			long betDay = DateUtil.between(DateTime.now(), relation.getExpiryTime(), DateUnit.DAY) + 1;
+			BigDecimal refundMoney = single.multiply(BigDecimal.valueOf(betDay));
+			//退款
+			OrderRefundReq orderRefundReq = new OrderRefundReq();
+			orderRefundReq.setOrderId(orderDon.getId());
+			orderRefundReq.setRefundMoney(refundMoney);
+			orderDon.setRefundDesc("异常账号奈飞车票自动退款");
+			String outNo = null;
+			try {
+				orderRefundReq.setRefundType("ALI_PAY");
+				outNo = orderRefundService.centerRefund(orderRefundReq, orderDon);
+				orderDon.setStatus(OrderDon.Status.refund);
+				orderDon.setRefundMoney(orderRefundReq.getRefundMoney());
+				orderDonMapper.updateById(orderDon);
+				clearUserLockingRelation(relationMapper.selectById(orderDon.getRelationId()), orderDon);
+				//记录退款
+				orderRefundService.refundRecord(orderDon, orderRefundReq.getRefundMoney(), null, goodsDon, sku, outNo, orderDon.getType().getType(), null);
+				try {
+					if (orderDon.getIsFixedDistribute()) {
+						log.info("退款分销订单:{}", orderDon.getId());
+						cmsOrderDonService.deductDsPoints(orderDon);
+					}
+				} catch (Exception e) {
+				}
+				relationClearService.clearTicket(relation, UserTicketClearedRecord.Source.refund_balance);
+			} catch (Exception e) {
+				orderRefundReq.setRefundType("balance");
+				userBenefitsService.addUserBalance(relation.getUserId(), refundMoney, UserBalanceSourceRecord.Source.clear_valid, relation.getYhsId(), orderDon.getId(), goodsDon.getTitle() + UserBalanceSourceRecord.Source.clear_valid.getDesc(), true);
+				//修改订单状态 为退款
+				orderDon.setStatus(OrderDon.Status.refund);
+				orderDon.setRefundBalance(refundMoney);
+				orderDon.setRefundMoney(BigDecimal.ZERO);
+				orderDonMapper.updateById(orderDon);
+				orderRefundService.refundRecord(orderDon, orderRefundReq.getRefundMoney(), null, goodsDon, sku, outNo, "balance", null);
+				relationClearService.clearTicket(relation, UserTicketClearedRecord.Source.refund_balance);
+			}
+		});
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
+
+	/**
+	 * 异常账号奈飞月付 清除
+	 */
+	@PutMapping("/clear")
+	public void test() {
+		List<GroupsRelation> groupsRelations = relationMapper.getNfMonthError();
+
+		groupsRelations.forEach(relation->{
+			relationClearService.clearTicket(relation, UserTicketClearedRecord.Source.manual);
+		});
+	}
+
+	/**
+	 * 备用账号已设置车队 修改类型
+	 * */
+	@PutMapping("/sync/account/type")
+	public void tyope() {
+		List<Account> accounts = accountMapper.selectList(Wrappers.lambdaQuery(Account.class)
+				.eq(Account::getType, 2));
+		accounts.forEach(account->{
+			GroupsTrips groupsTrips = groupsMapper.selectOne(Wrappers.lambdaQuery(GroupsTrips.class)
+					.eq(GroupsTrips::getAccountId, account.getId())
+					.last("limit 1"));
+			if (groupsTrips != null) {
+				account.setType(1);
+				accountMapper.updateById(account);
+			}
+		});
+	}
+
+	private final CmsGroupService groupService;
+
+	/**
+	 * 将空车位合并
+	 */
+	@PutMapping("/sync/num")
+	public void syncNfNum() {
+		//70537 uid:655884
+		//gid :69951
+		Long skuId = 4l;
+		List<GroupsTrips> groupsTrips = groupsMapper.selectList(Wrappers.lambdaQuery(GroupsTrips.class)
+				.eq(GroupsTrips::getStatus, GroupsTrips.Status.waiting)
+				.eq(GroupsTrips::getSkuId, skuId)
+				.eq(GroupsTrips::getAvailableNum, 3)
+				.orderByDesc(GroupsTrips::getId)
+				.last("limit 1"));
+
+		groupsTrips.forEach(data->{
+			Long groupsId = data.getId();
+			List<GroupsRelation> groupsRelations = relationMapper.selectList(Wrappers.lambdaQuery(GroupsRelation.class)
+					.ne(GroupsRelation::getUserId, 0)
+					.eq(GroupsRelation::getGroupsId, groupsId));
+
+			groupsRelations.forEach(relation->{
+				relationMapper.updateNum();
+				GroupsTrips replace = groupsMapper.selectOne(Wrappers.lambdaQuery(GroupsTrips.class)
+						.gt(GroupsTrips::getAvailableNum, 0)
+						.eq(GroupsTrips::getSkuId, skuId)
+						.eq(GroupsTrips::getStatus, GroupsTrips.Status.waiting)
+						.orderByAsc(GroupsTrips::getId)
+						.last("limit 1"));
+				if (replace != null) {
+					GroupsRelation replaceRelation = relationMapper.selectOne(Wrappers.lambdaQuery(GroupsRelation.class)
+							.eq(GroupsRelation::getGroupsId, replace.getId())
+							.eq(GroupsRelation::getUserId, 0)
+							.last("limit 1"));
+					if (replaceRelation != null) {
+						replaceRelation.setUserId(relation.getUserId());
+						replaceRelation.setStartTime(relation.getStartTime());
+						replaceRelation.setExpiryTime(relation.getExpiryTime());
+						replaceRelation.setStatus(relation.getStatus());
+						replaceRelation.setYhsId(relation.getYhsId());
+						relationMapper.updateById(replaceRelation);
+
+						OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
+								.eq(OrderDon::getUserId, relation.getUserId())
+								.eq(OrderDon::getRelationId, relation.getId())
+								.notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
+								.orderByDesc(OrderDon::getId)
+								.last("limit 1"));
+						if (orderDon != null) {
+							orderDon.setRelationId(replaceRelation.getId());
+							orderDonMapper.updateById(orderDon);
+						}
+						log.info("userId:{}", relation.getUserId());
+						relation.setNewRelationId(replaceRelation.getId());
+						relationClearService.clearTicket(relation, UserTicketClearedRecord.Source.change_ticket);
+					}
+				}
+			});
+		});
+
+		List<GroupsTrips> emptys = groupsMapper.selectList(Wrappers.lambdaQuery(GroupsTrips.class)
+				.eq(GroupsTrips::getStatus, GroupsTrips.Status.waiting)
+				.eq(GroupsTrips::getSkuId, skuId)
+				.eq(GroupsTrips::getAvailableNum, 5));
+		emptys.forEach(e->{
+			try {
+				log.info("开始删除空白车队id：{}", e.getId());
+				groupService.close(e.getId());
+			} catch (Exception ex) {
+				log.error(StringUtil.getErrorMsg(ex));
+			}
+		});
+
+	}
+
+	private final UserTicketClearedRecordMapper userTicketClearedRecordMapper;
+
+	/**
+	 * 拉黑用户 车票
+	 */
+	@GetMapping("/return")
+	public void return1(Long userId) {
+		List<UserTicketClearedRecord> blacks = userTicketClearedRecordMapper.selectList(Wrappers.lambdaQuery(UserTicketClearedRecord.class)
+				.eq(UserTicketClearedRecord::getUserId, userId)
+				.eq(UserTicketClearedRecord::getSource, "black")
+				.gt(UserTicketClearedRecord::getCreatedTime, DateUtil.parse("2024-10-30 12:00:39")));
+
+		for (UserTicketClearedRecord black : blacks) {
+
+			Long relationId = black.getRelationId();
+
+			Long toUserId = black.getUserId();
+
+			GroupsRelation relation = relationMapper.selectById(relationId);
+			if (relation.getUserId() == 0) {
+				relation.setUserId(toUserId);
+				relation.setStartTime(black.getStartTime());
+				relation.setExpiryTime(black.getExpiryTime());
+				relation.setStatus(GroupsRelation.Status.validity);
+				relationMapper.updateById(relation);
+			}else {
+				log.info("作为号重复:{}", relation.getId());
+			}
+		}
+	}
+
+
 	private void clearUserLockingRelation(GroupsRelation groupsRelation, OrderDon orderDon) {
 		if (groupsRelation == null) {
 			return;

netflix-web/src/main/resources/application.yml

@@ -1,4 +1,3 @@
 spring:
   profiles:
-    active:
-      - ${activeProfile}
+    active: prd