Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/service/mac/MacTransferService.java

@@ -187,6 +187,15 @@ public class MacTransferService extends BaseService<MacTransfer> {
 			rollbackFor = {Exception.class}
 	)
 	public ResponseResultVO<?> update(MacTransferVO macTransferVO) {
+		MacTransfer macTransferForUpdate =  macTransferMapper.selectByIdForUpdate(macTransferVO.getTrfId());
+		if(!macTransferForUpdate.getFlgValid()){
+			throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVOICE_ISFLGVALID_FALSE.getMessage());
+		}
+		// 如果是期初转账，不允许操作
+		if(macTransferForUpdate.getTrfType() == 0){
+			throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVOICE_ISQICHU.getMessage());
+		}
+
 		// 将之前的明细全部删除
 		List<MacTransferItem> MacTransferItemOriginalList = macTransferItemMapper.selectByZIdForUpdate(macTransferVO.getTrfId());
 		// 需要重新计算的资金账户
@@ -274,6 +283,10 @@ public class MacTransferService extends BaseService<MacTransfer> {
 		if (!macTransferForUpdate.getFlgValid()) {
 			throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISFLGVALID_FALSE.getMessage());
 		}
+		// 如果是期初转账，不允许操作
+		if(macTransferForUpdate.getTrfType() == 0){
+			throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVOICE_ISQICHU.getMessage());
+		}
 
 		// 将之前的明细全部删除
 		List<MacTransferItem> MacTransferItemOriginalList = macTransferItemMapper.selectByZIdForUpdate(id);