Quellcode durchsuchen

修改权益类型判断

tianboguang vor 2 Jahren
Ursprung
Commit
65d32b90c1

+ 3 - 4
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -745,11 +745,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
         if(!ObjectUtils.isEmpty(userIncrement) && userIncrement.getIsExpired().equals(ExpiredStatus.NOT_EXPIRED.code())){
             IncrementType type = incrementTypeService.getById(userIncrement.getIncrementTypeId());
-            if (type.getType().equals("cn")) {
+            if (ObjectUtils.isEmpty(type) || type.getType().equals("cn")) {
                 return PayStatus.PAY.code();
-            }
-            if (type.getType().equals("eur")){
-                totalSpace = type.getCameraCapacity()* 1024 * 1024L;
+            } else if (type.getType().equals("eur")) {
+                totalSpace = type.getCameraCapacity() * 1024 * 1024L;
             }
         }