Merge branch 'recharge_new_channel' into pre

# Conflicts:
#	netflix-service/src/main/java/com/cyksj/server/recharge/impl/GptProxyRechargeServiceImpl.java
#	netflix-service/src/main/java/com/cyksj/service/mange/gpt/impl/GptRechargeServiceImpl.java
#	netflix-service/src/main/java/com/cyksj/service/recharge/impl/SancRechargeServiceImpl.java

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -757,7 +757,7 @@ public interface Constant {
 	/**
 	 * cc api domain
 	 */
-	String CLAUDE_CODE_API_PREFIX = "https://cceo.nf.video/";
+	String CLAUDE_CODE_API_PREFIX = "http://104.238.220.246:18080/";
 
 	String CLAUDE_CODE_HEARD_KEY = "X-Admin-Key";
 
@@ -844,6 +844,16 @@ public interface Constant {
      */
     Long PLUS_AFDIAN_CHANNEL_ID = 14L;
 
+    /**
+     * cdk.org
+     */
+    Long CDK_CHANNEL_ID = 15L;
+
+    /**
+     * guofen.org
+     */
+    Long GUOFENZAIXIAN_CHANNEL_ID = 16L;
+
     /**
 	 * Adobe 全家桶
 	 */

netflix-dao/src/main/java/com/cyksj/mapper/manage/coupon/CouponUserMapper.java

@@ -1,5 +1,6 @@
 package com.cyksj.mapper.manage.coupon;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -43,4 +44,6 @@ public interface CouponUserMapper extends BaseMapper<CouponUser> {
 	Coupon selectUserCouponBySkuId(@Param("userId") Long userId, @Param("skuId") Long skuId);
 
 	Coupon selectNoLoginRecommendCouponReduce(@Param("goodsId") Long goodsId, @Param("price") BigDecimal price);
+
+    Integer selectAvailableCoupons(@Param("userId") long userId, @Param("status") CouponUser.Status status, @Param("now") DateTime now);
 }

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

@@ -0,0 +1,29 @@
+package com.cyksj.model.response.recharge;
+
+import lombok.Data;
+
+@Data
+public class CdkValidateResponse {
+
+    private Integer code;
+
+    private String message;
+
+    private ResponseData data;
+
+    private String request_id;
+
+    /**
+     * cdk
+     */
+    private String status;
+
+    @Data
+    public static class ResponseData {
+
+        /**
+         * guofen
+         */
+        private String status;
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.cyksj.model.response.recharge;
+
+import lombok.Data;
+
+@Data
+public class RechargeResponse {
+
+    private Integer code;
+
+    private String message;
+
+    private ResponseData data;
+
+    private String request_id;
+
+    /**
+     * cdk
+     */
+    private Boolean success;
+
+    @Data
+    public static class ResponseData {
+
+        /**
+         * guofen
+         */
+        private Boolean success;
+
+        private String message;
+    }
+}

netflix-dao/src/main/java/com/cyksj/model/views/CouponDetailView.java

@@ -19,7 +19,8 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "coupon c left join coupon_classification cc on cc.id = c.classification_id")
+@SearchBean(tables = "coupon c left join coupon_classification cc on cc.id = c.classification_id",
+        where = "c.deleted and c.status")
 public class CouponDetailView {
 	/**
 	 * 优惠券id

netflix-dao/src/main/java/com/cyksj/model/views/CouponUserView.java

@@ -21,7 +21,8 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "coupon_user cu left join coupon_active ca on ca.id = cu.coupon_active_id" +
-		" left join coupon c on c.id = cu.coupon_id left join coupon_classification cc on cc.id = c.classification_id")
+        " left join coupon c on c.id = cu.coupon_id left join coupon_classification cc on cc.id = c.classification_id",
+        where = "c.deleted and c.status")
 public class CouponUserView {
 	@DbField("cu.id")
 	private Long id;

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

@@ -38,7 +38,7 @@
                             from `coupon_distribute_popularize`
                             where deleted is true) cdp
                            on cdp.coupon_id = cp.id
-        where cp.deleted is true
+        where cp.deleted is true and cp.status
           and (cp.ex_code = #{couponExCode} or cdp.ex_code = #{couponExCode}) limit 1
     </select>
 

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

@@ -34,7 +34,7 @@
         if(c.is_valid_time is true and c.valid_end_time < now(),false,true) as flag
         from coupon_recommend cr left join coupon c on c.id = cr.coupon_id
         left join coupon_user cu on cu.coupon_id = c.id and cu.user_id = #{userId}
-        where cr.deleted is true and c.deleted is true and cr.status = 1
+        where cr.deleted is true and c.deleted is true and c.status and cr.status = 1
         and (cr.up_time is null or cr.up_time <= now()) and (cr.down_time is null or cr.down_time > now())
         <if test="couponId != null">
             and c.id = #{couponId}
@@ -51,7 +51,7 @@
         if(c.is_valid_time is true and c.valid_end_time &lt; now(),false,true) as flag
         from coupon_recommend cr left join coupon c on c.id = cr.coupon_id
         left join coupon_user cu on cu.coupon_id = c.id and cu.user_id = #{userId}
-        where cr.deleted is true and c.deleted is true and cr.status is true and cu.coupon_id is null
+        where cr.deleted is true and c.deleted is true and c.status and cr.status is true and cu.coupon_id is null
         and (cr.up_time is null or cr.up_time &lt;= now()) and (cr.down_time is null or cr.down_time > now())
         <if test='!isNewUser'>
             and c.scope !='newUser'

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

@@ -49,6 +49,7 @@
         </choose>
         where cu.user_id = #{userId}
         and cu.channel != 'exCode'
+        and cp.deleted and cp.status
         and cu.valid_end_time > now()
         <if test="couponId == null">
             order by isAvailable desc,orderby,couponMoney desc,cu.valid_end_time asc
@@ -75,6 +76,7 @@
             ck.sku_id = #{skuId}
         </if>
         and cu.user_id = #{userId}
+        and cp.deleted and cp.status
         and cu.status = 'unused'
         and cu.channel != 'exCode'
         and cu.valid_start_time &lt; now()
@@ -129,6 +131,7 @@
                        left join coupon_user cu on cu.coupon_id = c.id and cu.user_id = #{userId}
               where ca.deleted is true
                 and c.deleted is true
+                and c.status
                 and cu.id is null
                 and ca.expiry_status != 0
         and ca.`status` != 0
@@ -174,6 +177,7 @@
                  left join `coupon` c on c.id = cu.coupon_id
                  left join `coupon_active` ca on ca.id = cu.coupon_active_id
         where cu.user_id = #{userId}
+        and c.deleted and c.status
         <if test="couponId !=null">
             and cu.coupon_id = #{couponId}
         </if>
@@ -333,4 +337,17 @@
           and c.use_scope != 'renew'
         order by couponMoney desc limit 1
     </select>
+
+    <select id="selectAvailableCoupons" resultType="java.lang.Integer">
+        select count(1)
+        from (select coupon_id
+              from coupon_user
+              where user_id = #{userId}
+                and status = #{status}
+                and valid_start_time &lt; #{now}
+                and valid_end_time > #{now}) cu
+                 inner join coupon c on c.id = cu.coupon_id
+        where c.deleted
+          and c.status
+    </select>
 </mapper>

netflix-service/src/main/java/com/cyksj/server/recharge/impl/GptProxyRechargeServiceImpl.java

@@ -75,6 +75,10 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 
     private final SancRechargeService sancRechargeService;
 
+    private final CdkRechargeService cdkRechargeService;
+
+    private final GuofenzaixianRechargeService guofenzaixianRechargeService;
+
 	private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
 
 	private HttpRequest createBaseRequest(String url) {
@@ -394,6 +398,14 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
             //三川
             if (channelId == Constant.SC_CHANNEL_ID) {
                 return sancRechargeService.confirmRecharge(relation, gptCardKey, null);
+            }
+            //cdk
+            if (channelId == Constant.CDK_CHANNEL_ID) {
+                return cdkRechargeService.confirmRecharge(relation, gptCardKey, null);
+            }
+            //guofenzai
+            if (channelId == Constant.GUOFENZAIXIAN_CHANNEL_ID) {
+                return guofenzaixianRechargeService.confirmRecharge(relation, gptCardKey, null);
             }
 			//校验卡密是否可用
 			CardKeyValidationResult cardKeyValidationResult = validateCardKey(gptCardKey);
@@ -415,6 +427,7 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 					.set(GroupsRelation::getCardKey, gptCardKey)
 					.set(GroupsRelation::getGptToken, saveTokenJson)
 					.set(GroupsRelation::getGptTaskId, taskId)
+					.set(GroupsRelation::getOperator, null)
 					.eq(GroupsRelation::getId, relationId));
 			return taskId;
 		} finally {
@@ -494,7 +507,11 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 						.eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging));
 				//记录代充记录
 				if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
-                    gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -1, null, "自动代充");
+					String remark = "自动代充";
+					if (StrUtil.isNotBlank(relation.getOperator())) {
+						remark = "后台自动代充";
+					}
+					gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -1, relation.getOperator(), remark);
 					//修改对应订单状态
 					if (gptRechargeCardKey != null) {
 						Long orderId = gptRechargeCardKey.getOrderId();

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

@@ -85,6 +85,10 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 
     private final SancRechargeService sancRechargeService;
 
+    private final CdkRechargeService cdkRechargeService;
+
+    private final GuofenzaixianRechargeService guofenzaixianRechargeService;
+
 	private HttpRequest createBaseRequest(String url) {
 		return HttpRequest.get(url)
 				.header("accept", "application/json, text/plain, */*")
@@ -278,6 +282,18 @@ public class GptRechargeServiceImpl implements GptRechargeService {
                 req.setCmsUser(cmsUser);
                 relation.setCardKey(gptCardKey);
                 return sancRechargeService.confirmRecharge(relation, gptCardKey, cmsUser);
+            }
+            //cdk
+            if (gptRechargeCardKey.getChannelId() == Constant.CDK_CHANNEL_ID) {
+                req.setCmsUser(cmsUser);
+                relation.setCardKey(gptCardKey);
+                return cdkRechargeService.confirmRecharge(relation, gptCardKey, cmsUser);
+            }
+            //guofenzai
+            if (gptRechargeCardKey.getChannelId() == Constant.GUOFENZAIXIAN_CHANNEL_ID) {
+                req.setCmsUser(cmsUser);
+                relation.setCardKey(gptCardKey);
+                return guofenzaixianRechargeService.confirmRecharge(relation, gptCardKey, cmsUser);
             }
 			//校验卡密是否可用
 			CardKeyValidationResult cardKeyValidationResult = validateCardKey(gptCardKey);
@@ -579,7 +595,11 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 						.eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging));
 				//记录代充记录
 				if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
-                    gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -1, relation.getOperator(), "后台自动代充");
+					String remark = "自动代充";
+					if (StrUtil.isNotBlank(relation.getOperator())) {
+						remark = "后台自动代充";
+					}
+                    gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -1, relation.getOperator(), remark);
 				}
 			}
 		}

netflix-service/src/main/java/com/cyksj/service/recharge/CdkRechargeService.java

@@ -0,0 +1,11 @@
+package com.cyksj.service.recharge;
+
+import com.cyksj.model.entity.CmsUser;
+import com.cyksj.model.entity.GroupsRelation;
+import com.cyksj.model.response.recharge.CdkValidateResponse;
+
+public interface CdkRechargeService {
+    CdkValidateResponse validateCardKey(String cardKey, String accessToken) throws Exception;
+
+    String confirmRecharge(GroupsRelation relation, String cardKey, CmsUser user);
+}

netflix-service/src/main/java/com/cyksj/service/recharge/GuofenzaixianRechargeService.java

@@ -0,0 +1,11 @@
+package com.cyksj.service.recharge;
+
+import com.cyksj.model.entity.CmsUser;
+import com.cyksj.model.entity.GroupsRelation;
+import com.cyksj.model.response.recharge.CdkValidateResponse;
+
+public interface GuofenzaixianRechargeService {
+    CdkValidateResponse validateCardKey(String cardKey, String accessToken) throws Exception;
+
+    String confirmRecharge(GroupsRelation relation, String cardKey, CmsUser user);
+}

netflix-service/src/main/java/com/cyksj/service/recharge/impl/CdkRechargeServiceImpl.java

@@ -0,0 +1,230 @@
+package com.cyksj.service.recharge.impl;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
+import com.cyksj.common.util.Jsons;
+import com.cyksj.mapper.*;
+import com.cyksj.model.entity.*;
+import com.cyksj.model.response.recharge.CdkValidateResponse;
+import com.cyksj.model.response.recharge.RechargeResponse;
+import com.cyksj.redis.RedisService;
+import com.cyksj.service.chatgpt.GptUserRechargeRecordService;
+import com.cyksj.service.recharge.CdkRechargeService;
+import com.cyksj.service.recharge.GptRechargeCardKeyChannelService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class CdkRechargeServiceImpl implements CdkRechargeService {
+    private final GptRechargeCardKeyChannelService gptRechargeCardKeyChannelService;
+
+    private final GroupsRelationMapper relationMapper;
+
+    private final GroupsMapper groupsMapper;
+
+    private final GoodsDonSkuMapper skuMapper;
+
+    private final RedisService redisService;
+
+    private final OrderDonMapper orderDonMapper;
+
+    private final GptRechargeCardKeyMapper gptRechargeCardKeyMapper;
+
+    private final GptUserRechargeRecordService gptUserRechargeRecordService;
+
+    private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
+
+    @Override
+    public CdkValidateResponse validateCardKey(String cardKey, String accessToken) throws Exception {
+        String BASE_URL = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
+        String url = BASE_URL + "/verify/cdk";
+
+        JSONObject params = new JSONObject();
+        params.putOpt("cdk", cardKey);
+
+        HttpResponse response = HttpRequest.post(url)
+                .body(params.toString())
+                .execute();
+        log.info("cdk.afdian验证卡密结果：{}", response.body());
+        CdkValidateResponse data = Jsons.parseObject(response.body(), CdkValidateResponse.class);
+        return data;
+    }
+
+    @Override
+    public String confirmRecharge(GroupsRelation relation, String gptCardKey, CmsUser cmsUser) {
+        Long relationId = relation.getId();
+        //校验卡密是否可用
+        CdkValidateResponse cdkValidateResponse = null;
+        try {
+            cdkValidateResponse = validateCardKey(gptCardKey, relation.getGptToken());
+        } catch (Exception e) {
+            if (cmsUser == null) {
+                throw BusinessRuntimeException.getInstance("系统繁忙，请重试");
+            }
+            throw BusinessRuntimeException.getInstance("卡密:{0}错误", gptCardKey);
+        }
+        if (!"valid".equals(cdkValidateResponse.getStatus())) {
+            if (cmsUser == null) {
+                throw BusinessRuntimeException.getInstance("系统繁忙，请重试");
+            }
+            throw BusinessRuntimeException.getInstance("错误卡密：{0}", gptCardKey);
+        }
+        String accessToken = relation.getGptToken();
+        String rechargeAccount = relation.getAccount();
+        //提交任务返回状态
+        Boolean success = false;
+        try {
+            success = submitTask(gptCardKey, accessToken);
+        } catch (Exception e) {
+            setRechargeRelationStatusAutoError(relation);
+            if (cmsUser == null) {
+                throw BusinessRuntimeException.getInstance("充值失败，请联系客服开通");
+            }
+            throw BusinessRuntimeException.getInstance("充值失败，{0}", e.getMessage());
+        }
+        String operator = null;
+        if (cmsUser != null) {
+            operator = cmsUser.getNickname();
+        }
+        String password = relation.getPassword();
+        String taskId = "yhrgzc:" + RandomUtil.randomNumbers(20);
+        relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+                //记录代充账号
+                .set(GroupsRelation::getAccount, rechargeAccount)
+                //记录操作人员
+                .set(GroupsRelation::getOperator, operator)
+                //密码
+                .set(StrUtil.isNotBlank(password), GroupsRelation::getPassword, password)
+                .set(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging)
+                .set(GroupsRelation::getCardKey, gptCardKey)
+                .set(GroupsRelation::getGptToken, accessToken)
+                .set(GroupsRelation::getGptTaskId, taskId)
+                .eq(GroupsRelation::getId, relationId));
+        relation.setRechargeStatus(GroupsRelation.RechargeStatus.recharging);
+        relation.setCardKey(gptCardKey);
+        if (cmsUser != null) {
+            relation.setOperator(cmsUser.getNickname());
+        }
+        resetGroupsRelationRechargeStatus(relation, success, rechargeAccount);
+        return taskId;
+    }
+
+    private Boolean submitTask(String cardKey, String accessToken) {
+        log.info("开始提交cdk.afdian任务 - 卡密: {}", cardKey);
+        try {
+            String BASE_URL = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
+            String url = BASE_URL + "/recharge";
+
+            JSONObject requestBody = new JSONObject();
+            requestBody.putOpt("cdk", cardKey);
+            requestBody.putOpt("session_data", Jsons.parseObject(accessToken, JSONObject.class));
+
+            HttpResponse response = HttpRequest.post(url)
+                    .setConnectionTimeout(10000)
+                    .body(requestBody.toString())
+                    .execute();
+            String body = response.body();
+            log.info("cdk.afdian任务提交响应: {}", body);
+
+            RechargeResponse rechargeResponse = Jsons.parseObject(body, RechargeResponse.class);
+            Boolean success = rechargeResponse.getSuccess();
+            return success;
+
+        } catch (Exception e) {
+            log.error("提交任务失败: {}", e.getMessage(), e);
+            throw new RuntimeException("提交任务失败: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 设置代充自动充值异常
+     */
+    public void setRechargeRelationStatusAutoError(GroupsRelation relation) {
+        TASK_EXECUTOR.execute(() -> {
+            relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+                    .set(GroupsRelation::getAccount, relation.getAccount())
+                    .set(GroupsRelation::getGptToken, relation.getGptToken())
+                    .set(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharge_error)
+                    .eq(GroupsRelation::getId, relation.getId()));
+        });
+    }
+
+    /**
+     * 更新代充状态
+     */
+    private void resetGroupsRelationRechargeStatus(GroupsRelation relation, Boolean taskStatus, String result) {
+        GroupsRelation.RechargeStatus rechargeStatus;
+        if (taskStatus) {
+            rechargeStatus = GroupsRelation.RechargeStatus.complete;
+        } else {
+            rechargeStatus = GroupsRelation.RechargeStatus.recharge_error;
+        }
+        String taskId = relation.getGptTaskId();
+        if (relation != null && relation.getRechargeStatus() == GroupsRelation.RechargeStatus.recharging) {
+            Integer rechargeRemainNum = relation.getRechargeRemainNum();
+            String cardKey = relation.getCardKey();
+            GptRechargeCardKey gptRechargeCardKey = gptRechargeCardKeyMapper.selectOne(Wrappers.lambdaQuery(GptRechargeCardKey.class).eq(GptRechargeCardKey::getCardKey, cardKey).last("limit 1"));
+            if (rechargeStatus == GroupsRelation.RechargeStatus.recharge_error) {
+                if (gptRechargeCardKey != null) {
+                    gptRechargeCardKeyMapper.update(null, Wrappers.lambdaUpdate(GptRechargeCardKey.class).set(GptRechargeCardKey::getStatus, Boolean.FALSE).set(GptRechargeCardKey::getOrderId, null).set(GptRechargeCardKey::getOrderNo, null).eq(GptRechargeCardKey::getId, gptRechargeCardKey.getId()).eq(GptRechargeCardKey::getStatus, Boolean.TRUE));
+                }
+            }
+            if (rechargeStatus == GroupsRelation.RechargeStatus.recharge_error) {
+                if (!redisService.setNx(RedisService.key.GPT_RECHARGE_RECOVER_KEY.getName() + taskId, taskId, RedisService.key.GPT_RECHARGE_RECOVER_KEY.getTimeout())) {
+                    return;
+                }
+            }
+            Date startTime = relation.getStartTime();
+            DateTime expiryTime = null;
+            if (rechargeStatus == GroupsRelation.RechargeStatus.complete && startTime == null) {
+                GroupsTrips groupsTrips = groupsMapper.selectById(relation.getGroupsId());
+                if (groupsTrips != null) {
+                    startTime = DateTime.now();
+                    GoodsDonSku sku = skuMapper.selectById(groupsTrips.getSkuId());
+                    if (sku.getDays() != null && sku.getDays() > 0) {
+                        expiryTime = DateUtil.offsetDay(startTime, sku.getDays());
+                    } else {
+                        expiryTime = DateUtil.offsetMonth(startTime, sku.getMonths());
+                    }
+                }
+            }
+            Integer rechargeNum = 1;
+            String rechargeErrorInfo = null;
+            if (rechargeStatus == GroupsRelation.RechargeStatus.recharge_error) {
+                rechargeErrorInfo = result;
+            }
+            relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class).set(rechargeStatus == GroupsRelation.RechargeStatus.recharge_error, GroupsRelation::getRechargeRemainNum, rechargeRemainNum + rechargeNum).set(GroupsRelation::getRechargeStatus, rechargeStatus).set(expiryTime != null, GroupsRelation::getStartTime, startTime).set(expiryTime != null, GroupsRelation::getExpiryTime, expiryTime).set(StrUtil.isNotEmpty(rechargeErrorInfo), GroupsRelation::getRechargeErrorInfo, rechargeErrorInfo).eq(GroupsRelation::getId, relation.getId()).le(GroupsRelation::getRechargeRemainNum, relation.getRechargeNum()).eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging));
+            //记录代充记录
+            if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
+                String remark = "自动代充";
+                if (StrUtil.isNotBlank(relation.getOperator())) {
+                    remark = "后台自动代充";
+                }
+                gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -rechargeNum, relation.getOperator(), remark);
+                //修改对应订单状态
+                if (gptRechargeCardKey != null) {
+                    Long orderId = gptRechargeCardKey.getOrderId();
+                    OrderDon orderDon = orderDonMapper.selectById(orderId);
+                    if (orderDon != null && orderDon.getStatus() == OrderDon.Status.hasPayment) {
+                        orderDon.setStatus(OrderDon.Status.complete);
+                        orderDonMapper.updateById(orderDon);
+                    }
+
+                }
+            }
+        }
+    }
+}

netflix-service/src/main/java/com/cyksj/service/recharge/impl/GuofenzaixianRechargeServiceImpl.java

@@ -0,0 +1,230 @@
+package com.cyksj.service.recharge.impl;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
+import com.cyksj.common.util.Jsons;
+import com.cyksj.mapper.*;
+import com.cyksj.model.entity.*;
+import com.cyksj.model.response.recharge.CdkValidateResponse;
+import com.cyksj.model.response.recharge.RechargeResponse;
+import com.cyksj.redis.RedisService;
+import com.cyksj.service.chatgpt.GptUserRechargeRecordService;
+import com.cyksj.service.recharge.GptRechargeCardKeyChannelService;
+import com.cyksj.service.recharge.GuofenzaixianRechargeService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class GuofenzaixianRechargeServiceImpl implements GuofenzaixianRechargeService {
+    private final GptRechargeCardKeyChannelService gptRechargeCardKeyChannelService;
+
+    private final GroupsRelationMapper relationMapper;
+
+    private final GroupsMapper groupsMapper;
+
+    private final GoodsDonSkuMapper skuMapper;
+
+    private final RedisService redisService;
+
+    private final OrderDonMapper orderDonMapper;
+
+    private final GptRechargeCardKeyMapper gptRechargeCardKeyMapper;
+
+    private final GptUserRechargeRecordService gptUserRechargeRecordService;
+
+    private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
+
+    @Override
+    public CdkValidateResponse validateCardKey(String cardKey, String accessToken) throws Exception {
+        String BASE_URL = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
+        String url = BASE_URL + "/verify/cdk";
+
+        JSONObject params = new JSONObject();
+        params.putOpt("cdk", cardKey);
+
+        HttpResponse response = HttpRequest.post(url)
+                .body(params.toString())
+                .execute();
+        log.info("gfcdk.afdian验证卡密结果：{}", response.body());
+        CdkValidateResponse data = Jsons.parseObject(response.body(), CdkValidateResponse.class);
+        return data;
+    }
+
+    @Override
+    public String confirmRecharge(GroupsRelation relation, String gptCardKey, CmsUser cmsUser) {
+        Long relationId = relation.getId();
+        //校验卡密是否可用
+        CdkValidateResponse cdkValidateResponse = null;
+        try {
+            cdkValidateResponse = validateCardKey(gptCardKey, relation.getGptToken());
+        } catch (Exception e) {
+            if (cmsUser == null) {
+                throw BusinessRuntimeException.getInstance("系统繁忙，请重试");
+            }
+            throw BusinessRuntimeException.getInstance("卡密:{0}错误", gptCardKey);
+        }
+        if (!"valid".equals(cdkValidateResponse.getData().getStatus())) {
+            if (cmsUser == null) {
+                throw BusinessRuntimeException.getInstance("系统繁忙，请重试");
+            }
+            throw BusinessRuntimeException.getInstance("卡密错误：{0}", gptCardKey);
+        }
+        String accessToken = relation.getGptToken();
+        String rechargeAccount = relation.getAccount();
+        //提交任务返回状态
+        Boolean success = false;
+        try {
+            success = submitTask(gptCardKey, accessToken);
+        } catch (Exception e) {
+            setRechargeRelationStatusAutoError(relation);
+            if (cmsUser == null) {
+                throw BusinessRuntimeException.getInstance("充值失败，请联系客服开通");
+            }
+            throw BusinessRuntimeException.getInstance("充值失败，{0}", e.getMessage());
+        }
+        String operator = null;
+        if (cmsUser != null) {
+            operator = cmsUser.getNickname();
+        }
+        String password = relation.getPassword();
+        String taskId = "yhrgzc:" + RandomUtil.randomNumbers(20);
+        relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+                //记录代充账号
+                .set(GroupsRelation::getAccount, rechargeAccount)
+                //记录操作人员
+                .set(GroupsRelation::getOperator, operator)
+                //密码
+                .set(StrUtil.isNotBlank(password), GroupsRelation::getPassword, password)
+                .set(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging)
+                .set(GroupsRelation::getCardKey, gptCardKey)
+                .set(GroupsRelation::getGptToken, accessToken)
+                .set(GroupsRelation::getGptTaskId, taskId)
+                .eq(GroupsRelation::getId, relationId));
+        relation.setRechargeStatus(GroupsRelation.RechargeStatus.recharging);
+        relation.setCardKey(gptCardKey);
+        if (cmsUser != null) {
+            relation.setOperator(cmsUser.getNickname());
+        }
+        resetGroupsRelationRechargeStatus(relation, success, rechargeAccount);
+        return taskId;
+    }
+
+    private Boolean submitTask(String cardKey, String accessToken) {
+        log.info("开始提交gfcdk.afdian任务 - 卡密: {}", cardKey);
+        try {
+            String BASE_URL = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
+            String url = BASE_URL + "/recharge";
+
+            JSONObject requestBody = new JSONObject();
+            requestBody.putOpt("cdk", cardKey);
+            requestBody.putOpt("session_data", Jsons.parseObject(accessToken, JSONObject.class));
+
+            HttpResponse response = HttpRequest.post(url)
+                    .setConnectionTimeout(10000)
+                    .body(requestBody.toString())
+                    .execute();
+            String body = response.body();
+            log.info("gfcdk.afdian任务提交响应: {}", body);
+
+            RechargeResponse rechargeResponse = Jsons.parseObject(body, RechargeResponse.class);
+            Boolean success = rechargeResponse.getData().getSuccess();
+            return success;
+
+        } catch (Exception e) {
+            log.error("提交任务失败: {}", e.getMessage(), e);
+            throw new RuntimeException("提交任务失败: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 设置代充自动充值异常
+     */
+    public void setRechargeRelationStatusAutoError(GroupsRelation relation) {
+        TASK_EXECUTOR.execute(() -> {
+            relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+                    .set(GroupsRelation::getAccount, relation.getAccount())
+                    .set(GroupsRelation::getGptToken, relation.getGptToken())
+                    .set(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharge_error)
+                    .eq(GroupsRelation::getId, relation.getId()));
+        });
+    }
+
+    /**
+     * 更新代充状态
+     */
+    private void resetGroupsRelationRechargeStatus(GroupsRelation relation, Boolean taskStatus, String result) {
+        GroupsRelation.RechargeStatus rechargeStatus;
+        if (taskStatus) {
+            rechargeStatus = GroupsRelation.RechargeStatus.complete;
+        } else {
+            rechargeStatus = GroupsRelation.RechargeStatus.recharge_error;
+        }
+        String taskId = relation.getGptTaskId();
+        if (relation != null && relation.getRechargeStatus() == GroupsRelation.RechargeStatus.recharging) {
+            Integer rechargeRemainNum = relation.getRechargeRemainNum();
+            String cardKey = relation.getCardKey();
+            GptRechargeCardKey gptRechargeCardKey = gptRechargeCardKeyMapper.selectOne(Wrappers.lambdaQuery(GptRechargeCardKey.class).eq(GptRechargeCardKey::getCardKey, cardKey).last("limit 1"));
+            if (rechargeStatus == GroupsRelation.RechargeStatus.recharge_error) {
+                if (gptRechargeCardKey != null) {
+                    gptRechargeCardKeyMapper.update(null, Wrappers.lambdaUpdate(GptRechargeCardKey.class).set(GptRechargeCardKey::getStatus, Boolean.FALSE).set(GptRechargeCardKey::getOrderId, null).set(GptRechargeCardKey::getOrderNo, null).eq(GptRechargeCardKey::getId, gptRechargeCardKey.getId()).eq(GptRechargeCardKey::getStatus, Boolean.TRUE));
+                }
+            }
+            if (rechargeStatus == GroupsRelation.RechargeStatus.recharge_error) {
+                if (!redisService.setNx(RedisService.key.GPT_RECHARGE_RECOVER_KEY.getName() + taskId, taskId, RedisService.key.GPT_RECHARGE_RECOVER_KEY.getTimeout())) {
+                    return;
+                }
+            }
+            Date startTime = relation.getStartTime();
+            DateTime expiryTime = null;
+            if (rechargeStatus == GroupsRelation.RechargeStatus.complete && startTime == null) {
+                GroupsTrips groupsTrips = groupsMapper.selectById(relation.getGroupsId());
+                if (groupsTrips != null) {
+                    startTime = DateTime.now();
+                    GoodsDonSku sku = skuMapper.selectById(groupsTrips.getSkuId());
+                    if (sku.getDays() != null && sku.getDays() > 0) {
+                        expiryTime = DateUtil.offsetDay(startTime, sku.getDays());
+                    } else {
+                        expiryTime = DateUtil.offsetMonth(startTime, sku.getMonths());
+                    }
+                }
+            }
+            Integer rechargeNum = 1;
+            String rechargeErrorInfo = null;
+            if (rechargeStatus == GroupsRelation.RechargeStatus.recharge_error) {
+                rechargeErrorInfo = result;
+            }
+            relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class).set(rechargeStatus == GroupsRelation.RechargeStatus.recharge_error, GroupsRelation::getRechargeRemainNum, rechargeRemainNum + rechargeNum).set(GroupsRelation::getRechargeStatus, rechargeStatus).set(expiryTime != null, GroupsRelation::getStartTime, startTime).set(expiryTime != null, GroupsRelation::getExpiryTime, expiryTime).set(StrUtil.isNotEmpty(rechargeErrorInfo), GroupsRelation::getRechargeErrorInfo, rechargeErrorInfo).eq(GroupsRelation::getId, relation.getId()).le(GroupsRelation::getRechargeRemainNum, relation.getRechargeNum()).eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging));
+            //记录代充记录
+            if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
+                String remark = "自动代充";
+                if (StrUtil.isNotBlank(relation.getOperator())) {
+                    remark = "后台自动代充";
+                }
+                gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -rechargeNum, relation.getOperator(), remark);
+                //修改对应订单状态
+                if (gptRechargeCardKey != null) {
+                    Long orderId = gptRechargeCardKey.getOrderId();
+                    OrderDon orderDon = orderDonMapper.selectById(orderId);
+                    if (orderDon != null && orderDon.getStatus() == OrderDon.Status.hasPayment) {
+                        orderDon.setStatus(OrderDon.Status.complete);
+                        orderDonMapper.updateById(orderDon);
+                    }
+
+                }
+            }
+        }
+    }
+}

netflix-service/src/main/java/com/cyksj/service/recharge/impl/SancRechargeServiceImpl.java

@@ -77,7 +77,7 @@ public class SancRechargeServiceImpl implements SancRechargeService {
             if (cmsUser == null) {
                 throw BusinessRuntimeException.getInstance("系统繁忙，请稍后重试");
             }
-            throw BusinessRuntimeException.getInstance("库存不足");
+            throw BusinessRuntimeException.getInstance("三川库存不足");
         }
         //校验卡密是否可用
         CardVerificationResponse cardVerificationResponse = null;

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

@@ -580,7 +580,7 @@ public class CmsGroupRelationController {
         cardKey.forEach(key -> {
             try {
                 GptRechargeCardKey gptRechargeCardKey = new GptRechargeCardKey();
-                gptRechargeCardKey.setCardKey(key);
+                gptRechargeCardKey.setCardKey(key.trim());
                 gptRechargeCardKey.setType(type);
                 gptRechargeCardKey.setChannelId(channelId);
                 gptRechargeCardKeyMapper.insert(gptRechargeCardKey);

netflix-web/src/main/java/com/cyksj/web/controller/user/UserController.java

@@ -177,12 +177,8 @@ public class UserController {
         }).collect(Collectors.toList());
         //车票
         personalView.setNumOfTickets(renewalViews.size());
-        //优惠券
-        Integer couponSize = couponUserMapper.selectCount(Wrappers.lambdaQuery(CouponUser.class)
-                .eq(CouponUser::getUserId, userId)
-                .eq(CouponUser::getStatus, CouponUser.Status.unused)
-                .le(CouponUser::getValidStartTime, now)
-                .gt(CouponUser::getValidEndTime, now));
+        //优惠券 需要排除已删除/后台失效的优惠券
+        Integer couponSize = couponUserMapper.selectAvailableCoupons(userId, CouponUser.Status.unused, now);
         personalView.setNumOfCoupons(couponSize);
         //积分
         User user = userService.getById(userId);