Преглед изворни кода

Merge branch 'chatgpt' into dev

zoujiajian пре 2 година
родитељ
комит
7c5b1779b3

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

@@ -72,7 +72,7 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService{
            refreshToken = loginResult.getStr("refresh_token");
            officialSession = execute.body();
        }catch (Exception e){
-           throw BusinessRuntimeException.getInstance("登录获取token错误 error:" + StringUtil.getErrorText(e));
+           throw BusinessRuntimeException.getInstance("登录获取token错误 error:" + e.getMessage());
        }
         chatgptSession.setOfficialSession(officialSession);
         chatgptSession.setEmail(account.getAccount());

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

@@ -164,6 +164,9 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
     private final GroupRelationFrontService groupRelationFrontService;
 
     private final UserMapper userMapper;
+
+    private final ChatgptUserMapper chatgptUserMapper;
+
     private static final GlobalThreadPoolTaskExecutor TASK_POOL = GlobalThreadPoolTaskExecutor.getInstance();
 
     @Override
@@ -833,6 +836,11 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             if (gcCash != null && gcCash.compareTo(BigDecimal.ZERO) > 0) {
                 giftCardOrderUseRecordService.returnGiftCardCash(orderDon.getId());
             }
+            //是否是GPT镜像规格
+            if (orderDon.getGoodsId() == 18 && sku.getIsMirror()) {
+                chatgptUserMapper.delete(Wrappers.lambdaQuery(ChatgptUser.class)
+                        .eq(ChatgptUser::getRelationId, orderDon.getRelationId()));
+            }
         });
     }