Parcourir la source

Merge branch 'hotfix-20231007-batchpackagesn' into temp-pre

lixuesong il y a 1 an
Parent
commit
fb8943c266

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -332,7 +332,7 @@ public class WmPayOffController {
 		input.setPackageFinishStatus("1");
 		input.setTypeid("4");
 		input.setSettleFlag("1");
-		List<WmScorePackageSettleOutput> list = wmScorePackageService.listPackageSettleList(new Page<>(1, 9999), input).getRecords();
+		List<WmScorePackageSettleOutput> list = wmScorePackageService.listPackageSettleList(new Page<>(1, 499), input).getRecords();
 		List<WmScorePackageSettleExcelModel> exportList = new ArrayList<>();
 		if (CollectionUtil.isEmpty(list)) {
 			return Collections.emptyList();

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

@@ -3340,6 +3340,7 @@ public class WmScorePackageController {
 				scorePackage.setDescription(model.getDescription());
 				scorePackage.setUserList(StrUtil.isEmpty(model.getTargetId()) ? new ArrayList<>(1) :
 						Collections.singletonList(model.getTargetId()));
+				scorePackage.setPackageSn("PKG" + pkgSequence.nextNo());
 
 				wmScorePackageService.addWmScorePackage(scorePackage);