批量处理GPT代充次数;fix 新增claude账号

.gitignore

@@ -47,3 +47,4 @@ mvnw.cmd
 
 cert/
 
+docs/

netflix-dao/src/main/java/com/cyksj/model/request/BatchRechargeRemainNumReq.java

@@ -0,0 +1,34 @@
+package com.cyksj.model.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 批量处理代充次数
+ */
+@Getter
+@Setter
+public class BatchRechargeRemainNumReq {
+
+    /**
+     * 订单号列表
+     */
+    private List<String> orderNos;
+
+    /**
+     * 变更次数，正数增加，负数扣除
+     */
+    private Integer num;
+
+    /**
+     * 卡密
+     */
+    private String cardKey;
+
+    /**
+     * 操作备注
+     */
+    private String remark;
+}

netflix-dao/src/main/java/com/cyksj/model/response/BatchRechargeRemainNumResp.java

@@ -0,0 +1,29 @@
+package com.cyksj.model.response;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 批量处理代充次数结果
+ */
+@Getter
+@Setter
+public class BatchRechargeRemainNumResp {
+
+    private String orderNo;
+
+    private Long relationId;
+
+    private Boolean success;
+
+    /**
+     * ship 发货，update 修改次数，sync 同步订单和车票时间
+     */
+    private String handleType;
+
+    private Integer beforeRemainNum;
+
+    private Integer afterRemainNum;
+
+    private String message;
+}

netflix-service/src/main/java/com/cyksj/service/gemini/GeminiService.java

@@ -1,7 +1,6 @@
 package com.cyksj.service.gemini;
 
 import com.cyksj.model.entity.GeminiUser;
-import com.cyksj.model.response.ConversationLimitResponse;
 import com.cyksj.model.response.GeminiCarPageResponse;
 import com.cyksj.model.response.GeminiCarStatusResponse;
 import com.cyksj.model.response.GeminiConversationCountResponse;

netflix-service/src/main/java/com/cyksj/service/mange/gpt/GptRechargeService.java

@@ -1,11 +1,15 @@
 package com.cyksj.service.mange.gpt;
 
 import com.cyksj.model.entity.GroupsRelation;
+import com.cyksj.model.request.BatchRechargeRemainNumReq;
 import com.cyksj.model.request.GptIndependentExportRechargeReq;
 import com.cyksj.model.request.GroupsRelationRechargeReq;
+import com.cyksj.model.response.BatchRechargeRemainNumResp;
 import com.cyksj.server.recharge.dto.TaskResult;
 import com.cyksj.server.recharge.dto.TokenParseResult;
 
+import java.util.List;
+
 /**
  * 项目名: yhlxj11111111
  * 文件名: GptRechargeService
@@ -22,4 +26,6 @@ public interface GptRechargeService {
 	void gptIndependentExportRecharge(GptIndependentExportRechargeReq rechargeReq);
 
 	GroupsRelation getOrderRelation(String orderNo);
+
+	List<BatchRechargeRemainNumResp> batchUpdateRechargeRemainNum(long adminId, BatchRechargeRemainNumReq req);
 }

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

@@ -1,7 +1,9 @@
 package com.cyksj.service.mange.gpt.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
@@ -16,8 +18,10 @@ import com.cyksj.mapper.*;
 import com.cyksj.mapper.manage.cms.CmsUserMapper;
 import com.cyksj.model.dto.GptCardTokenDto;
 import com.cyksj.model.entity.*;
+import com.cyksj.model.request.BatchRechargeRemainNumReq;
 import com.cyksj.model.request.GptIndependentExportRechargeReq;
 import com.cyksj.model.request.GroupsRelationRechargeReq;
+import com.cyksj.model.response.BatchRechargeRemainNumResp;
 import com.cyksj.redis.RedisService;
 import com.cyksj.server.recharge.dto.CardKeyValidationResult;
 import com.cyksj.server.recharge.dto.TaskResult;
@@ -31,6 +35,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.Date;
 import java.util.List;
@@ -61,6 +66,8 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 
 	private final GptUserRechargeRecordService gptUserRechargeRecordService;
 
+	private final TransactionTemplate transactionTemplate;
+
 	private final RedisService redisService;
 
 	private final UserBindRelationService userBindRelationService;
@@ -465,6 +472,184 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 		return relation;
 	}
 
+	@Override
+	public List<BatchRechargeRemainNumResp> batchUpdateRechargeRemainNum(long adminId, BatchRechargeRemainNumReq req) {
+		if (CollUtil.isEmpty(req.getOrderNos())) {
+			throw BusinessRuntimeException.getInstance("订单号不能为空");
+		}
+		CmsUser cmsUser = cmsUserMapper.selectById(adminId);
+		String operator = cmsUser != null ? cmsUser.getNickname() : null;
+		return req.getOrderNos().stream()
+				.filter(StrUtil::isNotBlank)
+				.map(String::trim)
+				.distinct()
+				.map(orderNo -> batchHandleRechargeRemainNum(orderNo, req, operator))
+				.collect(Collectors.toList());
+	}
+
+	private BatchRechargeRemainNumResp batchHandleRechargeRemainNum(String orderNo, BatchRechargeRemainNumReq req, String operator) {
+		BatchRechargeRemainNumResp resp = new BatchRechargeRemainNumResp();
+		resp.setOrderNo(orderNo);
+		try {
+			transactionTemplate.execute(status -> {
+				OrderDon orderDon = getRechargeOrderDon(orderNo);
+				GroupsRelation relation = relationMapper.selectById(orderDon.getRelationId());
+				Assert.notNull(relation, "代充车票不存在");
+				resp.setRelationId(relation.getId());
+				if (relation.getRechargeStatus() == null) {
+					throw BusinessRuntimeException.getInstance("非代充类型车票");
+				}
+				GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
+				Assert.notNull(sku, "车票规格不存在");
+				if (relation.getRechargeNum() == null || relation.getRechargeRemainNum() == null) {
+					batchSyncRechargeOrder(orderDon, relation, sku, req, operator, resp);
+					resp.setSuccess(Boolean.TRUE);
+					return null;
+				}
+                //不处理gpt代充
+                if (true) {
+                    resp.setSuccess(Boolean.TRUE);
+                    return null;
+                }
+
+				boolean needShip = relation.getStartTime() == null
+						&& (relation.getRechargeStatus() == GroupsRelation.RechargeStatus.waiting
+						|| relation.getRechargeStatus() == GroupsRelation.RechargeStatus.recharge_error);
+				if (needShip) {
+					batchShipRechargeOrder(orderDon, relation, sku, req, operator, resp);
+				} else {
+					batchUpdateRechargeNum(relation, req, operator, resp);
+				}
+				resp.setSuccess(Boolean.TRUE);
+				return null;
+			});
+		} catch (Exception e) {
+			resp.setSuccess(Boolean.FALSE);
+			resp.setMessage(e.getMessage());
+		}
+		return resp;
+	}
+
+	private OrderDon getRechargeOrderDon(String orderNo) {
+		OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
+				.eq(OrderDon::getOrderNo, orderNo)
+				.notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
+				.orderByDesc(OrderDon::getId)
+				.last("limit 1"));
+		if (orderDon == null) {
+			orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
+					.eq(OrderDon::getOrderNo, orderNo)
+					.notIn(OrderDon::getStatus, Constant.noOrderStatus)
+					.orderByDesc(OrderDon::getId)
+					.last("limit 1"));
+		}
+		if (orderDon == null) {
+			throw BusinessRuntimeException.getInstance("订单不存在");
+		}
+		if (orderDon.getStatus() == OrderDon.Status.refund) {
+			throw BusinessRuntimeException.getInstance("该代充订单已退款");
+		}
+		return orderDon;
+	}
+
+	private void batchSyncRechargeOrder(OrderDon orderDon, GroupsRelation relation, GoodsDonSku sku, BatchRechargeRemainNumReq req, String operator, BatchRechargeRemainNumResp resp) {
+		resp.setHandleType("sync");
+		DateTime now = DateTime.now();
+		orderDon.setStatus(OrderDon.Status.complete);
+		orderDonMapper.updateById(orderDon);
+
+		relation.setRechargeStatus(GroupsRelation.RechargeStatus.complete);
+		relation.setOperator(operator);
+		relation.setSubmitTime(relation.getSubmitTime() != null ? relation.getSubmitTime() : now);
+		relation.setSendTime(now);
+		if (relation.getStartTime() == null) {
+			relation.setStartTime(now);
+			DateTime expiryTime;
+			if (sku.getDays() != null && sku.getDays() > 0) {
+				expiryTime = DateUtil.offsetDay(relation.getStartTime(), sku.getDays());
+			} else {
+				expiryTime = DateUtil.offsetMonth(relation.getStartTime(), sku.getMonths());
+			}
+			relation.setExpiryTime(expiryTime);
+		}
+		relationMapper.updateById(relation);
+		resp.setMessage("同步成功");
+	}
+
+	private void batchShipRechargeOrder(OrderDon orderDon, GroupsRelation relation, GoodsDonSku sku, BatchRechargeRemainNumReq req, String operator, BatchRechargeRemainNumResp resp) {
+		Integer subRechargeNum = getRechargeSubNum(sku);
+		Integer rechargeRemainNum = relation.getRechargeRemainNum();
+		if (rechargeRemainNum < subRechargeNum) {
+			throw BusinessRuntimeException.getInstance("剩余可代充次数不足");
+		}
+		resp.setHandleType("ship");
+		resp.setBeforeRemainNum(rechargeRemainNum);
+		DateTime now = DateTime.now();
+		orderDon.setStatus(OrderDon.Status.complete);
+		orderDonMapper.updateById(orderDon);
+
+		relation.setRechargeStatus(GroupsRelation.RechargeStatus.complete);
+		relation.setOperator(operator);
+		relation.setSubmitTime(relation.getSubmitTime() != null ? relation.getSubmitTime() : now);
+		relation.setSendTime(now);
+		if (relation.getStartTime() == null) {
+			relation.setStartTime(now);
+			DateTime expiryTime;
+			if (sku.getDays() != null && sku.getDays() > 0) {
+				expiryTime = DateUtil.offsetDay(relation.getStartTime(), sku.getDays());
+			} else {
+				expiryTime = DateUtil.offsetMonth(relation.getStartTime(), sku.getMonths());
+			}
+			relation.setExpiryTime(expiryTime);
+		}
+		if (StrUtil.isNotBlank(req.getCardKey())) {
+			relation.setCardKey(req.getCardKey());
+		}
+		relationMapper.updateById(relation);
+
+		int update = relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+				.set(GroupsRelation::getRechargeRemainNum, rechargeRemainNum - subRechargeNum)
+				.eq(GroupsRelation::getId, relation.getId())
+				.eq(GroupsRelation::getRechargeRemainNum, rechargeRemainNum));
+		if (update == 0) {
+			throw BusinessRuntimeException.getInstance("更新用户代充剩余次数失败，请重试");
+		}
+		resp.setAfterRemainNum(rechargeRemainNum - subRechargeNum);
+		gptUserRechargeRecordService.recordGptUserRechargeNum(req.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -subRechargeNum, operator, Optional.ofNullable(req.getRemark()).orElse("客服批量发货"));
+		resp.setMessage("发货成功");
+	}
+
+	private void batchUpdateRechargeNum(GroupsRelation relation, BatchRechargeRemainNumReq req, String operator, BatchRechargeRemainNumResp resp) {
+		if (req.getNum() == null || req.getNum() == 0) {
+			throw BusinessRuntimeException.getInstance("变更次数不能为空");
+		}
+		Integer rechargeRemainNum = relation.getRechargeRemainNum();
+		Integer afterRemainNum = rechargeRemainNum + req.getNum();
+		if (afterRemainNum < 0) {
+			throw BusinessRuntimeException.getInstance("扣除次数不能为负数");
+		}
+		resp.setHandleType("update");
+		resp.setBeforeRemainNum(rechargeRemainNum);
+		int update = relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+				.set(GroupsRelation::getRechargeNum, relation.getRechargeNum() + req.getNum())
+				.set(GroupsRelation::getRechargeRemainNum, afterRemainNum)
+				.eq(GroupsRelation::getId, relation.getId())
+				.eq(GroupsRelation::getRechargeRemainNum, rechargeRemainNum));
+		if (update == 0) {
+			throw BusinessRuntimeException.getInstance("修改用户代充次数错误，请重试");
+		}
+		resp.setAfterRemainNum(afterRemainNum);
+		gptUserRechargeRecordService.recordGptUserRechargeNum(req.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), req.getNum(), operator, Optional.ofNullable(req.getRemark()).orElse("批量修改代充次数"));
+		resp.setMessage("修改成功");
+	}
+
+	private Integer getRechargeSubNum(GoodsDonSku goodsDonSku) {
+		if (goodsDonSku.getRechargeType() != null && goodsDonSku.getRechargeType() == 2) {
+			return 12;
+		}
+		return 1;
+	}
+
 	public CardKeyValidationResult validateCardKey(String cardKey) {
 		log.info("开始验证卡密: {}", cardKey);
 		try {

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

@@ -25,6 +25,7 @@ import com.cyksj.model.excel.GptCardKeyExcelData;
 import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.model.manage.views.GroupsRelationBackView;
 import com.cyksj.model.request.*;
+import com.cyksj.model.response.BatchRechargeRemainNumResp;
 import com.cyksj.model.response.GptRechargeStatisticsRecordResp;
 import com.cyksj.model.views.*;
 import com.cyksj.server.recharge.dto.TaskResult;
@@ -343,6 +344,16 @@ public class CmsGroupRelationController {
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
 
+    /**
+     * 批量处理GPT代充次数
+     */
+    @PostMapping("/batch/recharge/update/remain/num")
+    public Result<List<BatchRechargeRemainNumResp>> batchUpdateRechargeRemainNum(@RequestBody BatchRechargeRemainNumReq req) {
+        long adminId = StpUtil.getLoginIdAsLong();
+        List<BatchRechargeRemainNumResp> result = gptRechargeService.batchUpdateRechargeRemainNum(adminId, req);
+        return GatewayResponse.SUCCESS.newBuilder().toResult(result);
+    }
+
     /**
      * 更新剩余次数 针对之前的代充账号
      */

netflix-web/src/main/java/com/cyksj/web/controller/manage/mirror/CmsClaudeController.java

@@ -105,7 +105,14 @@ public class CmsClaudeController {
         if (selectCount > 0) {
             throw BusinessRuntimeException.getInstance("请检验车队ID或账号是否已存在");
         }
-        claudeSessionService.getSession(claudeSession.getEmail(), claudeSession.getPassword(), claudeSession.getOfficialSession(), claudeSession.getIsPlus());
+        Integer sessionId = claudeSessionService.getSession(claudeSession.getEmail(), claudeSession.getPassword(), claudeSession.getOfficialSession(), claudeSession.getIsPlus());
+        if (sessionId != null) {
+            claudeSession.setStatus(1);
+        } else claudeSession.setStatus(0);
+        if (claudeSession.getIsPlus() == null) {
+            claudeSession.setIsPlus(1);
+        }
+        claudeSessionService.save(claudeSession);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }