feat: mah结算-代理商提交给药企时结算状态调整

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2727,7 +2727,6 @@ public class WmScorePackageController {
 				.eq("p.package_type2", packageType2)
 				.eq(scorePackageStatus != null, "p.score_package_status", scorePackageStatus)
 				.eq("p.send_package_dept_id", sendDeptId)
-				.isNull("p.mah_settle_dept_id")
 				.between(start != null && end != null, "p.create_time", start, end);
 
 		if (StrUtil.isNotBlank(scorePackageName)) {
@@ -2841,7 +2840,7 @@ public class WmScorePackageController {
 				.eq("p.package_type2", packageType2)
 				.eq(scorePackageStatus != null, "p.score_package_status", scorePackageStatus)
 				.eq("p.mah_settle_dept_id", sendDeptId)
-				.eq("p.mah_settle_step", UpmsType.MahSettleStep.BUSINESS.getType())
+				.in("p.mah_settle_step", UpmsType.MahSettleStep.BUSINESS.getType(), UpmsType.MahSettleStep.FINANCE.getType())
 				.between(start != null && end != null, "p.create_time", start, end);
 
 		if (StrUtil.isNotBlank(scorePackageName)) {

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

@@ -422,6 +422,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		updateEntity.setSettleAmount(total);
 		updateEntity.setId(input.getId());
 		updateEntity.setSettleStatus(DingEnum.SETTLE_STATUS_WAIT.getType());
+		updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SETTLEMENT_SUBMITTED.val());
 		updateEntity.setDescription(input.getDescription());
 		updateEntity.setSubType(String.valueOf(input.getSubjectLocation().getGigType().getCode()));
 		updateEntity.setLocation(location);
@@ -439,10 +440,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			updateEntity.setMahSettleStep(UpmsType.MahSettleStep.BUSINESS);
 			// 这里是MAH业务提交到上级业务的情况,设为不可结算
 			updateEntity.setSettleFlag("0");
-			// 设为待结算
-			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.getVal());
 		} else {
-			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SETTLEMENT_SUBMITTED.val());
 			if (StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage.getPackageType1())) {
 				// 多人承接积分包可以一直结算
 				updateEntity.setSettleFlag("0");