Browse Source

fix mj alpha

chenbiao 2 years ago
parent
commit
7468a04010

+ 1 - 0
netflix-service/src/main/java/com/cyksj/service/midjourney/MidjourneyService.java

@@ -15,4 +15,5 @@ public interface MidjourneyService {
 
     String getCarLoginUrl(Long userId, Long relationId, String carId);
 
+    void updateIcar(Long id, Boolean aBoolean);
 }

+ 5 - 0
netflix-service/src/main/java/com/cyksj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -110,6 +110,11 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         }
     }
 
+    @Override
+    public void updateIcar(Long id, Boolean isCar) {
+        midjourneyUserMapper.update(null,Wrappers.lambdaUpdate(MidjourneyUser.class).eq(MidjourneyUser::getId, id).set(MidjourneyUser::getIsCar,isCar));
+    }
+
 
     /**
      * 获取车位信息

+ 2 - 0
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -277,7 +277,9 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 						MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(ticket.getUserId(), ticket.getRelationId());
 						ticket.setMjUserFastNum(midjourneyUser.getMjFastNum());
 						ticket.setMjUserRelaxNum(midjourneyUser.getMjRelaxNum());
+						ticket.setIsCar(false);
 					} else {
+						ticket.setIsCar(true);
 						ticket.setMjUserFastNum(search.getMjUserFastNum());
 						ticket.setMjUserRelaxNum(search.getMjUserRelaxNum());
 					}

+ 16 - 3
netflix-web/src/main/java/com/cyksj/web/controller/mirror/MidjourneyController.java

@@ -6,10 +6,8 @@ import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.UpgradePackageMapper;
-import com.cyksj.model.entity.ChatgptUser;
 import com.cyksj.model.entity.MidjourneyUser;
 import com.cyksj.model.entity.UpgradePackage;
-import com.cyksj.model.views.ChatGptUserConversationRecordHistoryView;
 import com.cyksj.model.views.MidjouneyCarInfoView;
 import com.cyksj.model.views.MidjourneyUserConversationRecordHistoryView;
 import com.cyksj.model.views.MidjourneyUserView;
@@ -29,8 +27,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 
 /** server/镜像服务/mj绘画
  * @author zwhui
@@ -132,6 +130,21 @@ public class MidjourneyController {
         return GatewayResponse.SUCCESS.newBuilder().toResult(url);
     }
 
+    @PutMapping("/updateIsCar")
+    public Result<String> updateIsCar(@RequestBody MidjourneyUser midjourneyUser){
+        long userId = StpUserUtil.getLoginIdAsLong();
+        if (midjourneyUser.getRelationId() == null || midjourneyUser.getRelationId() == 0L) {
+            throw BusinessRuntimeException.getInstance("车票错误");
+        }
+
+        MidjourneyUser user = midjourneyService.getUser(userId, midjourneyUser.getRelationId());
+
+        if (user != null) {
+            midjourneyService.updateIcar(user.getId(), Optional.ofNullable(midjourneyUser.getIsCar()).orElse(true));
+        }
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
     /**
      * 获取车队历史记录
      */