Merge branch 'master' of http://192.168.0.115:3000/lyhzzz/4dkankan-center-user

src/main/java/com/fdkankan/ucenter/service/impl/SceneUpgradeToV4Service.java

@@ -4,6 +4,7 @@ import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneKind;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
@@ -59,7 +60,11 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     @Override
     public Result upgrade(String num)  throws Exception{
 
-        ScenePro scenePro = sceneProService.getByNum(num);
+        boolean reUpgrade = false;
+        ScenePro scenePro = sceneProService.getOne(new LambdaQueryWrapper<ScenePro>().eq(ScenePro::getNum, num));
+        if(scenePro.getIsUpgrade() == CommonStatus.YES.code().intValue()){
+            reUpgrade = true;
+        }
 
         //加锁
         String lockKey = String.format(RedisLockKey.LOCK_SCENE_UPGRADE_V4, num);
@@ -101,7 +106,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             //发送mq
             HashMap<String, Object> msg = new HashMap<>();
             msg.put("sceneProId", scenePro.getId());
-            msg.put("reUpgrade", false);
+            msg.put("reUpgrade", reUpgrade);
             rabbitMqProducer.sendByWorkQueue(upgradeToV4, msg);
 
         }catch (Exception e){