Merge branch 'bug-eur-36825' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/service/impl/OrderServiceImpl.java
#	src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

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

@@ -163,11 +163,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
             orderItemEntity.setShippingStatus(ShippingStatus.unshipped.name());
             orderItemEntity.setExpressName("顺丰速运");
             orderItemEntity.setGoodsCount(requestCart.getGoodsCount());
-            if("en".equals(param.getLang())){
-                orderItemEntity.setGoodsName(responseGoods.getNameEn());
-            }else {
-                orderItemEntity.setGoodsName(responseGoods.getName());
-            }
+            orderItemEntity.setGoodsName(responseGoods.getName());
             orderItemEntity.setGoodsSn(responseGoods.getGoodsSn());
             orderItemEntity.setRecStatus("A");
             orderItemEntity.setCreateTime(DateUserUtil.getDate(new Date()));
@@ -178,7 +174,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
             orderItemEntities.add(orderItemEntity);
 
             goodsAmount = goodsAmount.add(orderItemEntity.getGoodsPrice().multiply(new BigDecimal(orderItemEntity.getGoodsCount())));
-            PayGoods payGoods = new PayGoods(orderItemEntity.getGoodsName(),orderItemEntity.getGoodsCount(),3);
+            PayGoods payGoods = new PayGoods(orderItemEntity.getGoodsName(),orderItemEntity.getGoodsCount());
             goodsInfoList.add(payGoods);
         }
 
@@ -306,7 +302,6 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
             }
             return incrementOrderService.insertIncrementOrder(user, param,incrementType);
         }
-
         IncrementType incrementType = incrementTypeService.getById(param.getIncrementType());
         if(incrementType == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);

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

@@ -239,10 +239,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
      */
     @Override
     public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus) {
-        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
-        LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
-        wrapper.eq(ScenePro::getStatus,-2);
-        plusWr.eq(ScenePlus::getSceneStatus,-2);
+
         Long totalSpace = cameraDetail.getTotalSpace();
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
         if(userIncrement!=null){
@@ -255,6 +252,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
             }
         }
+        //使用容量大于总容量，不予解封
+        if(payStatus == 1 && totalSpace != -1 && cameraDetail.getUsedSpace() >= cameraDetail.getTotalSpace()){
+            return;
+        }
+        // 总容量大于已使用容量，不予封存
+        if (payStatus ==  -2 && (totalSpace == -1 || totalSpace >= cameraDetail.getUsedSpace() )) {
+            return;
+        }
+
+        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePro::getStatus,-2);
+        plusWr.eq(ScenePlus::getSceneStatus,-2);
 
         log.info("lockOrUnLockBySpace---cameraId:{},payStatus:{},totalSpace:{},useSpace{}",
                 cameraId,payStatus,totalSpace,cameraDetail.getUsedSpace());
@@ -264,10 +274,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             wrapper.eq(ScenePro::getPayStatus,-2);
             plusWr.eq(ScenePlus::getPayStatus,-2);
         }else {
-            if (totalSpace == -1 || totalSpace >= cameraDetail.getUsedSpace()) {
-                // 总容量大于已使用容量，不予封存
-                return;
-            }
             wrapper.orderByDesc(ScenePro::getCreateTime);
             plusWr.orderByDesc(ScenePlus::getCreateTime);
             wrapper.eq(ScenePro::getPayStatus,1);
@@ -284,12 +290,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         List<Long> lockedIds = new ArrayList<>();
 
-        if(totalSpace == -1 && payStatus == 1){
+        if(totalSpace == -1){   //  无限容量 全部解封
             List<Long> collect = list.stream().map(ScenePro::getId).collect(Collectors.toList());
             List<Long> collect2 = plusList.stream().map(ScenePlus::getId).collect(Collectors.toList());
             lockedIds.addAll(collect);
             lockedIds.addAll(collect2);
-            lockOrUnLockScenes(lockedIds,payStatus);  //  无限容量 全部解封
+            lockOrUnLockScenes(lockedIds,1);
             return;
         }
 
@@ -297,14 +303,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Long accumulateSpace = 0L;
         if(payStatus == 1){
             beyondSpace =  totalSpace - cameraDetail.getUsedSpace();
-            getScenePlusLockedIds(lockedIds, plusList, beyondSpace, accumulateSpace);
             getSceneLockedIds(lockedIds,list,beyondSpace,accumulateSpace);
+            getScenePlusLockedIds(lockedIds, plusList, beyondSpace, accumulateSpace);
         }else {
             beyondSpace =  cameraDetail.getUsedSpace() - totalSpace;
             getSceneLockedIds(lockedIds, list, beyondSpace, accumulateSpace);
             getScenePlusLockedIds(lockedIds,plusList,beyondSpace,accumulateSpace);
         }
-
         lockOrUnLockScenes(lockedIds,payStatus);
     }
 
@@ -955,7 +960,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             infoVo.setStatus(scenePlus.getSceneStatus());
             dataSource = scenePlusExt.getDataSource();
         }
-        
+
         if(dataSource != null){
             if(!fYunFileService.fileExist(dataSource.replace("/mnt/data","home") +"/data.fdage")){
                 infoVo.setResourceDel(1);