feat: 积分包增加截止时间2

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

@@ -1712,8 +1712,10 @@ public class WmScorePackageController {
 		wmScorePackage.setPackageAuditStatus("0");
 		wmScorePackage.setSendPackageDeptId(deptId.toString());
 		wmScorePackage.setAllocationDate(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN).format(now));
-		// 默认截止日期为一年后
-		wmScorePackage.setEndTime(now.plusYears(1).toLocalDate());
+		if (wmScorePackage.getEndTime() == null) {
+			// 默认截止日期为一年后
+			wmScorePackage.setEndTime(now.plusYears(1).toLocalDate());
+		}
 
 		// 关联上级推广药品企业(兼容历史)
 		if (StringUtils.isEmpty(relPkgId)) {

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

@@ -839,8 +839,10 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		}
 		wmScorePackage.setCreateUser(currentUser.getId());
 		wmScorePackage.setCreateTime(now);
-		// 默认截止日期为一年后
-		wmScorePackage.setEndTime(now.plusYears(1).toLocalDate());
+		if (wmScorePackage.getEndTime() == null) {
+			// 默认截止日期为一年后
+			wmScorePackage.setEndTime(now.plusYears(1).toLocalDate());
+		}
 		boolean isAnswer = this.save(wmScorePackage);
 		if (isAnswer) {