fix: 补全日志

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

@@ -2436,7 +2436,7 @@ public class WmScorePackageController {
 		if (StringUtil.isEmpty(typeId)) {
 			queryWrapper.in(WmScorePackage::getTypeid, "3", "4");
 		} else {
-			List<String> split = StrUtil.split(typeId, StrUtil.C_COMMA);
+			List<String> split = StrUtil.split(typeId, StrUtil.COMMA);
 			queryWrapper.in(WmScorePackage::getTypeid, split);
 		}
 

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

@@ -1626,7 +1626,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		if (StringUtil.isEmpty(typeId)) {
 			queryWrapper.in(WmScorePackage::getTypeid, "3", "4");
 		} else {
-			List<String> split = StrUtil.split(typeId, StrUtil.C_COMMA);
+			List<String> split = StrUtil.split(typeId, StrUtil.COMMA);
 			queryWrapper.in(WmScorePackage::getTypeid, split);
 		}
 

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

@@ -16,6 +16,7 @@
  */
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -241,7 +242,12 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 	@Override
 	@Transactional
 	public  void updateScorePackageStatus(String ScorePackageId){
+
+		log.info(">>>>>>>>>>>>>>>>>>更新积分包状态开始:[{}]<<<<<<<<<<<<<<<<<<<<<", ScorePackageId);
+
 		WmScorePackage wmScorePackage=wmScorePackageMapper.selectById(ScorePackageId);
+
+		log.info("积分包内容:{}",wmScorePackage);
 		WmTask wmTask1=new WmTask();
 		wmTask1.setDelFlag("0");
 		wmTask1.setEnableFlag("0");
@@ -250,64 +256,65 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 		wmTask1.setTaskStatus("2");//未审核
 		wmTask1.setScorePackageId(ScorePackageId);
 		List<Map<String,String>> resMap=wmTaskMapper.PackageIsFinishByTask(wmTask1);
-		if(null==resMap){
+
+		log.info("PackageIsFinishByTask结果:{}",resMap);
+		// 无结果
+		if(CollUtil.isEmpty(resMap)){
 			//没有接单成功的人，判断是否有接单未审核的数据
 			LambdaQueryWrapper<WmScorePackageStatus> queryWrapper=new LambdaQueryWrapper<>();
 			queryWrapper.eq(WmScorePackageStatus::getPackageId,ScorePackageId);
 			queryWrapper.eq(WmScorePackageStatus::getStatus,"1");
 			List<WmScorePackageStatus> statusList=this.list(queryWrapper);
-			if(null==statusList||statusList.size()==0){
+
+			if(CollUtil.isEmpty(statusList)){
 				wmScorePackage.setScorePackageStatus("1");//已分派待申领
 			}else {
 				wmScorePackage.setScorePackageStatus("2");//已申领待审批
 			}
 
-		}else if(resMap.size()>=wmScorePackage.getUserNum()){//接单成功人满了
-			boolean result=true;
-			for (Map<String,String> map: resMap) {
-				if(!StringUtil.isEmpty(map.get("isFinish"))){
-					Integer res=Integer.valueOf(map.get("isFinish"));
-					if(res>0){
-						result=false;
-						//return R.ok();
-					}
-				}else {
-					result=false;
-					//return R.ok();
+		}
+		// 有结果
+		else{
+			log.info("resMap size :{}, userNum:{}", resMap.size(),wmScorePackage.getUserNum());
+			if(resMap.size()>=wmScorePackage.getUserNum()){//接单成功人满了
+				boolean result = true;
+				for (Map<String,String> map: resMap) {
+					result = StrUtil.isNotEmpty(map.get("isFinish")) ? (Integer.parseInt(map.get("isFinish")) > 0? Boolean.FALSE : Boolean.TRUE) : Boolean.FALSE;
 				}
 
-			}
+				if(result){
+					//更新所有的任务
+					LambdaUpdateWrapper<WmTask> updateWrapper=new LambdaUpdateWrapper<>();
+					updateWrapper.eq(WmTask::getScorePackageId,ScorePackageId);
+					updateWrapper.eq(WmTask::getRealFlag,"9");
+					updateWrapper.set(WmTask::getRealFlag,"1");
+					wmTaskMapper.update(new WmTask(),updateWrapper);
+					LambdaUpdateWrapper<WmTask> updateWrapper1=new LambdaUpdateWrapper<>();
+					updateWrapper1.eq(WmTask::getScorePackageId,ScorePackageId);
+					updateWrapper1.eq(WmTask::getTaskStatus,"2");
+					updateWrapper1.set(WmTask::getTaskStatus,"4");
+					wmTaskMapper.update(new WmTask(),updateWrapper1);
+
+					wmScorePackage.setPackageFinishStatus("1");//已完成
+					// 有关联积分包，则设置为‘已完成待审批’；没有关联积分包，则直接设置为‘已完成待结算’
+					wmScorePackage.setScorePackageStatus(StringUtils.isNotBlank(wmScorePackage.getRelationScoreId()) ? ScorePackageStatusEnum.TO_BE_APPROVAL.val() : ScorePackageStatusEnum.TO_BE_SETTLED.val());
+					//已完成不可以做任务
+					wmScorePackage.setTaskAddFlag(CommonConstants.STATUS_NORMAL);
+					wmScorePackage.setPackageFinishTime(LocalDateTime.now());
 
-			if(result){
-				//更新所有的任务
-				LambdaUpdateWrapper<WmTask> updateWrapper=new LambdaUpdateWrapper<>();
-				updateWrapper.eq(WmTask::getScorePackageId,ScorePackageId);
-				updateWrapper.eq(WmTask::getRealFlag,"9");
-				updateWrapper.set(WmTask::getRealFlag,"1");
-				wmTaskMapper.update(new WmTask(),updateWrapper);
-				LambdaUpdateWrapper<WmTask> updateWrapper1=new LambdaUpdateWrapper<>();
-				updateWrapper1.eq(WmTask::getScorePackageId,ScorePackageId);
-				updateWrapper1.eq(WmTask::getTaskStatus,"2");
-				updateWrapper1.set(WmTask::getTaskStatus,"4");
-				wmTaskMapper.update(new WmTask(),updateWrapper1);
-
-				wmScorePackage.setPackageFinishStatus("1");//已完成
-				// 有关联积分包，则设置为‘已完成待审批’；没有关联积分包，则直接设置为‘已完成待结算’
-				if (StringUtils.isNotBlank(wmScorePackage.getRelationScoreId())) {
-					wmScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_APPROVAL.val()); // 已完成待审批
-				} else {
-					wmScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val()); // 已完成待结算
 				}
-				wmScorePackage.setTaskAddFlag("0");//已完成不可以做任务
-				wmScorePackage.setPackageFinishTime(LocalDateTime.now());
+			}else {
+				//接单人没有满，但是有人接单，状态是进行中
+				wmScorePackage.setScorePackageStatus("3");//进行中
 
 			}
-		}else {
-			//接单人没有满，但是有人接单，状态是进行中
-			wmScorePackage.setScorePackageStatus("3");//进行中
-
 		}
+
+		wmScorePackage.setUpdateTime(LocalDateTime.now());
+		log.info("更新的积分包内容:{}",wmScorePackage);
 		wmScorePackageMapper.updateById(wmScorePackage);
+
+		log.info(">>>>>>>>>>>>>>>>>>更新积分包状态结束:[{}]<<<<<<<<<<<<<<<<<<<<<", ScorePackageId);
 	}
 
 	@Override