Merge branch 'renew_upgrade' into pre

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

@@ -349,6 +349,10 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         String refundType = refundReq.getRefundType();
         //校验订单是否符合退款
         checkOrderRefund(orderDon, goodsDon, sku, refundReq);
+        //续费升级订单
+        if (orderDon.getOrderType() == 2 && sku.getIsMirror()) {
+            mirrorUserCleatService.handleRenewUpgradeOrders(orderDon);
+        }
         //空订单关闭
         if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0 && orderDon.getBalance().compareTo(BigDecimal.ZERO) == 0
                 && orderDon.getRelationId() == 0) {
@@ -1079,10 +1083,6 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             if (orderDon.getOrderType() == 1) {
                 mirrorUserCleatService.delMirrorUser(orderDon.getGoodsId(), orderDon.getRelationId());
             }
-            //续费升级订单
-            if (orderDon.getOrderType() == 2 && sku.getIsMirror()) {
-                mirrorUserCleatService.handleRenewUpgradeOrders(orderDon);
-            }
             //是否是分销订单
             //处理下级渠道分销提成
             handleSubRewards(orderDon);

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

@@ -109,7 +109,7 @@ public class MirrorController {
             ChatgptSession session = chatGptAccountService.checkSession(carId);
             if (session.getIsCar()) {
                 log.info("用户:{}通过userToken:{}访问镜像车队carId:{}成功", user.getName(), userToken, carId);
-                return GatewayResponse.SUCCESS.newBuilder().setMsg("登陆成功").setCode(1).toResult();
+                return GatewayResponse.SUCCESS.newBuilder().setMsg("登陆成功").setCode(1).toResult(user.getRelationId().toString());
             }
         } catch (Exception e) {
             log.error("服务器错误", e);