fix: 手动回调调整

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

@@ -734,14 +734,15 @@ public class WmPayOffController {
 		// 校验数据有效性
 		// 查询结算中的数据
 		List<WmScorePackageSettleNote> settleNoteByidList = wmScorePackageSettleNoteService.getSettleNoteById(input.getId(), Integer.parseInt(SettleStatusEnum.SETTLE_STATUS_SUBMIT.getVal()));
-		log.info("结算信息查询：{}", settleNoteByidList.toString());
-		int checkSettleNoteById = settleNoteByidList.size();
-		if (0 == checkSettleNoteById) {
-			R.failed("修改的目标数据状态异常，不能修改");
+		log.info("结算信息查询：{}", settleNoteByidList);
+		if (CollUtil.isEmpty(settleNoteByidList)) {
+			return R.failed("修改的目标数据状态异常，不能修改");
 		}
 
+		String packageId = settleNoteByidList.get(0).getPackageId();
+
 		// 更新结算数据
-		boolean updateSettleResult = wmScorePackageSettleNoteService.updateSettleNoteById(settleNoteId, settleNoteStatus, remark);
+		boolean updateSettleResult = wmScorePackageSettleNoteService.updateSettleNoteById(packageId, settleNoteId, settleNoteStatus, remark);
 
 		// 结束输出
 		log.info("===== 手工回调开始 =====");

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

@@ -126,10 +126,11 @@ public interface WmScorePackageSettleNoteService extends IService<WmScorePackage
 	/**
 	 * 根据settleNoteId修改结算状态
 	 *
+	 * @param packageId		   积分包id
 	 * @param id               结算id
 	 * @param settleNoteStatus 结算状态
 	 * @param remark           备注
 	 * @return 操作状态
 	 */
-	boolean updateSettleNoteById(Integer id, Integer settleNoteStatus, String remark);
+	boolean updateSettleNoteById(String packageId, Integer id, Integer settleNoteStatus, String remark);
 }

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

@@ -4229,13 +4229,20 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 	/**
 	 * 根据settleNoteId修改结算状态
 	 *
-	 * @param id 结算id
+	 * @param packageId		   积分包id
+	 * @param id               结算id
 	 * @param settleNoteStatus 结算状态
-	 * @param remark 备注
+	 * @param remark           备注
 	 * @return 操作状态
 	 */
 	@Override
-	public boolean updateSettleNoteById(Integer id, Integer settleNoteStatus, String remark) {
+	public boolean updateSettleNoteById(String packageId, Integer id, Integer settleNoteStatus, String remark) {
+		// 修改积分包表状态
+		WmScorePackage scorePackage = new WmScorePackage();
+		scorePackage.setId(packageId);
+		scorePackage.setSettleStatus(settleNoteStatus);
+		wmScorePackageMapper.updateById(scorePackage);
+		// 修改settlenote表状态
 		WmScorePackageSettleNote query = new WmScorePackageSettleNote();
 		query.setId(id);
 		query.setSettleNoteStatus(settleNoteStatus);