feat: MAH支付-积分包结算提交结算

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmPayOffServiceImpl.java

@@ -583,6 +583,14 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 
 		// 结算配置信息
 		HnqzUser operator = SecurityUtils.getUser();
+
+		if (SubjectLocation.MAH_SETTLE.equals(wmScorePackage.getLocation())) {
+			// MAH结算的情况-标记
+			input.setMahSettleDeptId(operator.getDeptId());
+		} else {
+			input.setMahSettleDeptId(null);
+		}
+
 		SysDeptSub sysDeptSub = sysDeptSubService.getDeptSub(operator.getDeptId(), location);
 		SysDept sysDept = sysDeptService.getById(sysDeptSub.getDeptId());
 		String taxCode = sysDept.getTaxCode();
@@ -658,10 +666,18 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
+			Integer deptId;
+			// MAH结算校验原企业认证信息
+			if (input.getMahSettleDeptId() != null) {
+				deptId = sysUser.getDeptId();
+			} else {
+				deptId = operator.getDeptId();
+			}
+
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, operator.getDeptId())
+					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -853,10 +869,18 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
+			Integer deptId;
+			// MAH结算校验原企业认证信息
+			if (input.getMahSettleDeptId() != null) {
+				deptId = sysUser.getDeptId();
+			} else {
+				deptId = operator.getDeptId();
+			}
+
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, operator.getDeptId())
+					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1043,10 +1067,18 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
+			Integer deptId;
+			// MAH结算校验原企业认证信息
+			if (input.getMahSettleDeptId() != null) {
+				deptId = sysUser.getDeptId();
+			} else {
+				deptId = operator.getDeptId();
+			}
+
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, operator.getDeptId())
+					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1242,10 +1274,18 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
+			Integer deptId;
+			// MAH结算校验原企业认证信息
+			if (input.getMahSettleDeptId() != null) {
+				deptId = sysUser.getDeptId();
+			} else {
+				deptId = operator.getDeptId();
+			}
+
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, operator.getDeptId())
+					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1434,10 +1474,18 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
+			Integer deptId;
+			// MAH结算校验原企业认证信息
+			if (input.getMahSettleDeptId() != null) {
+				deptId = sysUser.getDeptId();
+			} else {
+				deptId = operator.getDeptId();
+			}
+
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, operator.getDeptId())
+					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1620,10 +1668,18 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
+			Integer deptId;
+			// MAH结算校验原企业认证信息
+			if (input.getMahSettleDeptId() != null) {
+				deptId = sysUser.getDeptId();
+			} else {
+				deptId = operator.getDeptId();
+			}
+
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, operator.getDeptId())
+					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1817,10 +1873,18 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
+			Integer deptId;
+			// MAH结算校验原企业认证信息
+			if (input.getMahSettleDeptId() != null) {
+				deptId = sysUser.getDeptId();
+			} else {
+				deptId = operator.getDeptId();
+			}
+
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, operator.getDeptId())
+					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1959,10 +2023,18 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
+
+			Integer deptId;
+			// MAH结算校验原企业认证信息
+			if (input.getMahSettleDeptId() != null) {
+				deptId = sysUser.getDeptId();
+			} else {
+				deptId = operator.getDeptId();
+			}
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, operator.getDeptId())
+					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {