Merge branch 'fix-dupPkgName'

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

@@ -2729,9 +2729,9 @@ public class WmScorePackageController {
 				.eq("p.send_package_dept_id", sendDeptId)
 				.between(start != null && end != null, "p.create_time", start, end);
 
-		if (StrUtil.isNotBlank(scorePackageName)){
+		if (StrUtil.isNotBlank(scorePackageName)) {
 //			queryWrapper.like( "p.score_package_name", scorePackageName).or().like( "p.pkg_sn", scorePackageName);
-			queryWrapper.and(wrapper -> wrapper.like( "p.score_package_name", scorePackageName).or().like( "p.pkg_sn", scorePackageName));
+			queryWrapper.and(wrapper -> wrapper.like("p.score_package_name", scorePackageName).or().like("p.pkg_sn", scorePackageName));
 		}
 
 		if (StringUtil.isEmpty(typeId)) {
@@ -2921,14 +2921,14 @@ public class WmScorePackageController {
 	 */
 	@GetMapping("/page-mah-settle-package")
 	public R pageMahSettlePackage(@RequestParam(value = "current") Integer current,
-							   @RequestParam(value = "size") Integer size,
-							   @RequestParam(value = "packageType1") String packageType1,
-							   @RequestParam(value = "packageType2") Integer packageType2,
-							   @RequestParam(value = "scorePackageName", required = false) String scorePackageName,
-							   @RequestParam(value = "scorePackageStatus", required = false) Integer scorePackageStatus,
-							   @RequestParam(value = "typeid", required = false) String typeId,
-							   @RequestParam(value = "monthStart", required = false) String monthStart,
-							   @RequestParam(value = "monthEnd", required = false) String monthEnd
+								  @RequestParam(value = "size") Integer size,
+								  @RequestParam(value = "packageType1") String packageType1,
+								  @RequestParam(value = "packageType2") Integer packageType2,
+								  @RequestParam(value = "scorePackageName", required = false) String scorePackageName,
+								  @RequestParam(value = "scorePackageStatus", required = false) Integer scorePackageStatus,
+								  @RequestParam(value = "typeid", required = false) String typeId,
+								  @RequestParam(value = "monthStart", required = false) String monthStart,
+								  @RequestParam(value = "monthEnd", required = false) String monthEnd
 	) {
 
 		Integer sendDeptId = SecurityUtils.getUser().getDeptId();
@@ -3037,7 +3037,7 @@ public class WmScorePackageController {
 			}
 		}
 
-		if (StrUtil.isBlank(wmScorePackage.getPackageSn())){
+		if (StrUtil.isBlank(wmScorePackage.getPackageSn())) {
 			return R.failed("积分包序列号必填");
 		}
 
@@ -3060,43 +3060,42 @@ public class WmScorePackageController {
 		return wmScorePackageService.updateEasy(wmScorePackage);
 	}
 
-	@ApiOperation(value = "修改积分包", notes = "修改积分包")
+	/**
+	 * 更新积分包信息
+	 *
+	 * @param wmScorePackage 积分包信息
+	 * @return 更新结果
+	 */
 	@SysLog("修改积分包(小包)")
 	@PostMapping("/updateWmScorePackage")
-	public R updateWmScorePackage(@RequestBody WmScorePackage wmScorePackage) {
+	public R<?> updateWmScorePackage(@RequestBody WmScorePackage wmScorePackage) {
+
 		log.info("修改积分包(小包)入参:{}", wmScorePackage);
-		if (wmScorePackage.getPackageType1().equals("1")) {//定额
-			if (wmScorePackage.getScore() <= 0) {
-				return R.failed("积分包分值必须大于0");
-			}
+
+		//定额
+		if (wmScorePackage.getPackageType1().equals("1") && wmScorePackage.getScore() <= 0) {
+			return R.failed("积分包分值必须大于0");
 		}
 
-		/**
-		 *
-		 *
-		 * 被领取的积分包 不能修改
-		 */
-		WmScorePackageStatus statusQuery = new WmScorePackageStatus();
-		statusQuery.setPackageId(wmScorePackage.getId());
-//		statusQuery.setStatus("2");
-		int total = wmScorePackageStatusService.count(Wrappers.query(statusQuery).lambda()
-				.in(WmScorePackageStatus::getStatus, "1", "2"));
+		// 被领取的积分包 不能修改
+		int total = wmScorePackageStatusService.count(Wrappers.<WmScorePackageStatus>lambdaQuery().eq(WmScorePackageStatus::getPackageId, wmScorePackage.getId()).in(WmScorePackageStatus::getStatus, "1", "2"));
 		if (total > 0) {
 			return R.failed("积分包已被领取，不能修改");
 		}
-		WmScorePackage oldData = wmScorePackageService.getById(wmScorePackage.getId());
-		if (StringUtils.isNotEmpty(wmScorePackage.getScorePackageName())
-				&& !oldData.getScorePackageName().equals(wmScorePackage.getScorePackageName())) {
-			WmScorePackage wmScorePackage1 = new WmScorePackage();
-			wmScorePackage1.setDelFlag("0");
-			wmScorePackage1.setScorePackageName(wmScorePackage.getScorePackageName());
-			wmScorePackage1.setDeptId(wmScorePackage.getDeptId());
-			List<WmScorePackage> wmScorePackageList = wmScorePackageService.listWmScorePackages(wmScorePackage1);
-			if (wmScorePackageList.size() > 0) {
-				return R.failed("积分包名称已存在");
+
+		// 校验重名
+		if (StrUtil.isNotBlank(wmScorePackage.getScorePackageName())) {
+
+			long existed = wmScorePackageService.count(Wrappers.<WmScorePackage>lambdaQuery()
+					.eq(WmScorePackage::getDelFlag, "0")
+					.eq(WmScorePackage::getDeptId, wmScorePackage.getDeptId())
+					.eq(WmScorePackage::getScorePackageName, wmScorePackage.getScorePackageName()));
+			if (existed != 0) {
+				return R.failed("积分包名称或积分包序列号已存在");
 			}
 
 		}
+
 		return wmScorePackageService.updateWmScorePackage(wmScorePackage);
 	}
 

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

@@ -117,7 +117,7 @@ public interface WmScorePackageService extends IService<WmScorePackage> {
 
 	R updateEasy(WmScorePackage wmScorePackage);
 
-	R updateWmScorePackage(WmScorePackage wmScorePackage);
+	R<?> updateWmScorePackage(WmScorePackage wmScorePackage);
 
 	WmScorePackage selectRelationScoreIdList(WmScorePackage wmScorePackage);
 

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

@@ -631,16 +631,28 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	public R addWmScorePackage(WmScorePackage wmScorePackage) {
 		HnqzUser currentUser = SecurityUtils.getUser();
 		//判断名字不能重复和积分包序列号不能重复
-		if (null != wmScorePackage.getScorePackageName() && !"".equals(wmScorePackage.getScorePackageName())) {
-			WmScorePackage wmScorePackage1 = new WmScorePackage();
-			wmScorePackage1.setDelFlag("0");
-			wmScorePackage1.setDeptId(currentUser.getDeptId() + "");
-			wmScorePackage1.setScorePackageName(wmScorePackage.getScorePackageName());
-			List<WmScorePackage> wmScorePackageList = this.list(Wrappers.<WmScorePackage>lambdaQuery(wmScorePackage1).or().eq(WmScorePackage::getPackageSn, wmScorePackage.getPackageSn()));
-			if (wmScorePackageList.size() > 0) {
+		if (StrUtil.isNotBlank(wmScorePackage.getScorePackageName())) {
+
+			long existed = this.count(Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getDelFlag, "0").eq(WmScorePackage::getDeptId, currentUser.getDeptId().toString()).and(
+					i -> i.eq(WmScorePackage::getScorePackageName, wmScorePackage.getScorePackageName()).or().eq(WmScorePackage::getPackageSn, wmScorePackage.getPackageSn())
+			));
+			if (existed != 0) {
 				return R.failed("积分包名称或积分包序列号已存在");
 			}
+
 		}
+
+		//
+		// if (null != wmScorePackage.getScorePackageName() && !"".equals(wmScorePackage.getScorePackageName())) {
+		// 	WmScorePackage wmScorePackage1 = new WmScorePackage();
+		// 	wmScorePackage1.setDelFlag("0");
+		// 	wmScorePackage1.setDeptId(currentUser.getDeptId() + "");
+		// 	wmScorePackage1.setScorePackageName(wmScorePackage.getScorePackageName());
+		// 	List<WmScorePackage> wmScorePackageList = this.list(Wrappers.<WmScorePackage>lambdaQuery(wmScorePackage1).or().eq(WmScorePackage::getPackageSn, wmScorePackage.getPackageSn()));
+		// 	if (wmScorePackageList.size() > 0) {
+		// 		return R.failed("积分包名称或积分包序列号已存在");
+		// 	}
+		// }
 		if (wmScorePackage.getPackageType1().equals("1")) {//定额
 			if (!StringUtil.isEmpty(wmScorePackage.getUserScore()) && wmScorePackage.getUserNum() > 0) {
 				wmScorePackage.setScore(Integer.valueOf(wmScorePackage.getUserScore()) * wmScorePackage.getUserNum());
@@ -1348,7 +1360,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	}
 
 
-	private WmScorePackage getRemainScore(String pkgId){
+	private WmScorePackage getRemainScore(String pkgId) {
 
 		List<WmScorePackage> packages = this.list(Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getDelFlag, "0").eq(WmScorePackage::getEnableFlag, "0"));
 
@@ -1359,7 +1371,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		packages.forEach(p -> {
 			List<WmScorePackage> scorePackages = relMap.get(p.getId());
 			int sum = 0;
-			if (CollUtil.isNotEmpty(scorePackages)){
+			if (CollUtil.isNotEmpty(scorePackages)) {
 				sum = scorePackages.stream().mapToInt(WmScorePackage::getScore).sum();
 			}
 			if (Objects.nonNull(p.getScore())) {
@@ -1373,7 +1385,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	@Override
 	public R getScorePackagePageById(WmScorePackage wmScorePackage) {
 
-		wmScorePackage = getRemainScore( wmScorePackage.getId());
+		wmScorePackage = getRemainScore(wmScorePackage.getId());
 
 		// wmScorePackage = wmScorePackageMapper.getScorePackagePageById(wmScorePackage.getId());
 		//
@@ -1784,7 +1796,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		} else {
 			settleListPage = wmScorePackageMapper.listPackageSettleList(page, input);
 		}
-		
+
 		List<WmScorePackageSettleOutput> settleList = settleListPage.getRecords();
 		for (WmScorePackageSettleOutput ouPut : settleList) {
 			WmScorePackageStatus statusQuery = new WmScorePackageStatus();
@@ -1797,7 +1809,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			ouPut.setUserNames(userNames);
 
 			Set<String> userIds = statusList.stream().map(WmScorePackageStatus::getTaskUserId).collect(Collectors.toSet());
-			if (CollUtil.isNotEmpty(userIds)){
+			if (CollUtil.isNotEmpty(userIds)) {
 				List<SysUser> users = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery().in(SysUser::getUserId, userIds));
 				String userPhones = users.stream().map(SysUser::getUsername).collect(Collectors.joining(","));
 				ouPut.setUserPhones(userPhones);
@@ -2248,7 +2260,6 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		}
 
 
-
 		return R.ok(wmScorePackagePage);
 	}
 
@@ -3170,7 +3181,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	/**
 	 * 更新积分余额信息
 	 *
-	 * @param packageId 积分包id
+	 * @param packageId     积分包id
 	 * @param recoveryScore 回收积分值
 	 */
 	private void updateDeptRecharge(String packageId, int recoveryScore) {