fix 镜像用户token错误日志;会话回传

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -3,7 +3,6 @@ package com.cyksj.service.chatgpt.impl;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
-import cn.hutool.core.util.RandomUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
@@ -354,6 +353,7 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUser.setUserToken(UUID.randomUUID().toString());
             chatgptUserMapper.insert(chatgptUser);
         } catch (DuplicateKeyException e) {
+            log.error("重复插入镜像用户:{}token,errmsg:{}", user.getNickname(), StringUtil.getErrorText(e));
         }
         return chatgptUser;
     }
@@ -384,6 +384,7 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUserTokenPrepareMapper.updateById(prepare);
             log.info("用户激活userToken:{}成功", prepare.getUserToken());
         } catch (DuplicateKeyException e) {
+            log.error("重复插入镜像车队用户:{}token,errmsg:{}" + chatgptUser.getId(), StringUtil.getErrorText(e));
         }
         return chatgptUser;
     }
@@ -799,8 +800,10 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                     .eq(ChatgptUserConversationRecord::getUserToken, userToken)
                     .orderByDesc(ChatgptUserConversationRecord::getId)
                     .last(" limit 1"));
-            chatgptUserConversationRecord.setConversationId(conversationId);
-            chatgptUserConversationRecordMapper.updateById(chatgptUserConversationRecord);
+            if (chatgptUserConversationRecord != null) {
+                chatgptUserConversationRecord.setConversationId(conversationId);
+                chatgptUserConversationRecordMapper.updateById(chatgptUserConversationRecord);
+            }
         }
     }
 

netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpEventActionServiceImpl.java

@@ -595,6 +595,7 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 			return null;
 		}
 		CorpCustomerAcquisitionLinkPopularize corpCustomerAcquisitionLinkPopularize = corpCustomerAcquisitionLinkPopularizeMapper.selectOne(Wrappers.lambdaQuery(CorpCustomerAcquisitionLinkPopularize.class)
+				.eq(CorpCustomerAcquisitionLinkPopularize::getIsChat, 1)
 				.eq(CorpCustomerAcquisitionLinkPopularize::getCustomerAcquistionLinkId, linkId).last("limit 1"));
 		if (corpCustomerAcquisitionLinkPopularize != null) {
 			//callback

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

@@ -501,7 +501,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         relationClearService.clearTicket(relation, source);
 
         //是否是GPT镜像规格
-        updateChatGptUserStatus(orderDon.getGoodsId(), orderDon.getRelationId());
+        delGptUser(orderDon.getGoodsId(), orderDon.getRelationId());
 
         if (plusPurchaseSkuRelation != null && plus_relationList != null) {
             plus_relationList.remove(relationId);
@@ -850,7 +850,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                 giftCardOrderUseRecordService.returnGiftCardCash(orderDon.getId());
             }
             //是否是GPT镜像规格
-            updateChatGptUserStatus(orderDon.getGoodsId(), orderDon.getRelationId());
+            delGptUser(orderDon.getGoodsId(), orderDon.getRelationId());
             //是否是分销订单
             //处理下级渠道分销提成
             handleSubRewards(orderDon);
@@ -1127,7 +1127,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
     /**
      * 删除gptUser
      */
-    public void updateChatGptUserStatus(Long goodsId, Long relationId) {
+    public void delGptUser(Long goodsId, Long relationId) {
         //gpt镜像
         if (goodsId != null && goodsId == 18) {
             Integer selectCount = chatgptUserMapper.selectCount(Wrappers.lambdaQuery(ChatgptUser.class)