Merge branch 'dev' of xiongzhu/zhumj into master

src/main/java/com/izouma/zhumj/service/CheckinInfoService.java

@@ -18,6 +18,7 @@ import com.izouma.zhumj.repo.*;
 import com.izouma.zhumj.repo.sale.ContractRepo;
 import com.izouma.zhumj.repo.sale.ContractStoreRepo;
 import com.izouma.zhumj.repo.sale.CustomerRepo;
+import com.izouma.zhumj.security.Authority;
 import com.izouma.zhumj.utils.BeanCopierUtils;
 import com.izouma.zhumj.utils.ObjUtils;
 import com.izouma.zhumj.utils.SecurityUtils;
@@ -157,6 +158,10 @@ public class CheckinInfoService {
 
     @Transactional
     public CheckinInfo in(CheckinInfoInDTO dto, boolean switchBed) {
+        if (SecurityUtils.getAuthenticatedUser().getAuthorities()
+                .contains(Authority.getInstance(Authority.NAME.ROLE_OPERATION_VIEWER))) {
+            throw new BusinessException("权限仅包含查看，无法入住");
+        }
         BedInfo bedInfo = bedInfoRepo.findById(dto.getBedId()).orElseThrow(new BusinessException("无床位信息"));
         RoomInfo roomInfo = bedInfo.getRoomInfo();
         if (roomInfo == null) {

src/main/java/com/izouma/zhumj/web/PersonalFeeController.java

@@ -10,7 +10,9 @@ import com.izouma.zhumj.enums.PayMethod;
 import com.izouma.zhumj.exception.BusinessException;
 import com.izouma.zhumj.repo.IndividualRentRepo;
 import com.izouma.zhumj.repo.PersonalFeeRepo;
+import com.izouma.zhumj.security.Authority;
 import com.izouma.zhumj.service.PersonalFeeService;
+import com.izouma.zhumj.utils.SecurityUtils;
 import com.izouma.zhumj.utils.excel.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,6 +42,10 @@ public class PersonalFeeController extends BaseController {
 
     @PostMapping("/save")
     public PersonalFee save(@RequestBody PersonalFee record) {
+        if (SecurityUtils.getAuthenticatedUser().getAuthorities()
+                .contains(Authority.getInstance(Authority.NAME.ROLE_OPERATION_VIEWER))) {
+            throw new BusinessException("权限仅包含查看，无法缴费");
+        }
         return personalFeeService.save(record);
     }