fix: NPE 结算积分包未勾选税源地

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

@@ -134,7 +134,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 	public R<?> settleById(String pkgId) {
 
 		WmScorePackage wmScorePackage = wmScorePackageService.getById(pkgId);
-		wmScorePackage.setSubjectLocation(wmScorePackage.getLocation().name());
 
 		if (!"1".equals(wmScorePackage.getPackageFinishStatus())) {
 			return R.failed("积分包状态异常");
@@ -187,8 +186,15 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				SysUser user = sysUserMapper.selectById(item.getUserId());
 				item.setRealName(user.getRealname());
 				item.setIdCardNumber(user.getIdCardNumber());
+				if (item.getSubjectLocation() != null){
+					wmScorePackage.setSubjectLocation(item.getSubjectLocation().name());
+				}
 			});
 
+			if (StrUtil.isBlank(wmScorePackage.getSubjectLocation())){
+				return R.failed("结算积分包未勾选税源地");
+			}
+
 		}
 
 		Map<String, Object> resultMap = new HashMap<>(3);